revert: "test(next/script): failing beforeInteractive tests for bug #…

…37741" This reverts commit 5cdc750.
vercel · Jun 18, 2022 · 7a8b4c5 · 7a8b4c5
1 parent ac3c207
commit 7a8b4c5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 57 deletions.
diff --git a/test/integration/script-loader/base/pages/_document.js b/test/integration/script-loader/base/pages/_document.js
@@ -15,26 +15,19 @@ export default function Document() {
           id="scriptBeforeInteractive"
           src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.20/lodash.min.js?a=scriptBeforeInteractive"
           strategy="beforeInteractive"
-        />
+        ></Script>
         <Script
-          id="bi-inline-in-doc-in-head"
+          id="inline-before"
           strategy="beforeInteractive"
           dangerouslySetInnerHTML={{
-            __html: `console.log('bi-inline-in-doc-in-head')`,
+            __html: `console.log('inline beforeInteractive')`,
           }}
-        />
+        ></Script>
       </Head>
       <body>
         <Main />
         <NextScript />
         <div id="text" />
-        <Script
-          id="bi-inline-in-doc-out-head"
-          strategy="beforeInteractive"
-          dangerouslySetInnerHTML={{
-            __html: `console.log('bi-inline-in-doc-out-head')`,
-          }}
-        />
       </body>
     </Html>
   )

diff --git a/test/integration/script-loader/base/pages/page7.js b/test/integration/script-loader/base/pages/page7.js
@@ -1,19 +1,12 @@
-import Head from 'next/head'
 import Script from 'next/script'
 
 const Page = () => {
   return (
     <div class="container">
-      <Head>
-        <Script
-          id="bi-inline-in-page-in-head"
-          strategy="beforeInteractive"
-        >{`console.log('bi-inline-in-page-in-head')`}</Script>
-      </Head>
       <Script
-        id="bi-inline-in-page-out-head"
+        id="beforeInteractiveInlineScript"
         strategy="beforeInteractive"
-      >{`console.log('bi-inline-in-page-out-head')`}</Script>
+      >{`console.log('beforeInteractive inline script run')`}</Script>
       <div>page7</div>
     </div>
   )

diff --git a/test/integration/script-loader/test/index.test.js b/test/integration/script-loader/test/index.test.js
@@ -190,16 +190,16 @@ describe('Next.js Script - Primary Strategies', () => {
     }
   })
 
-  it('priority beforeInteractive with inline script in <Head>', async () => {
+  it('priority beforeInteractive with inline script', async () => {
     const html = await renderViaHTTP(appPort, '/page5')
     const $ = cheerio.load(html)
 
-    const script = $('#bi-inline-in-doc-in-head')
+    const script = $('#inline-before')
     expect(script.length).toBe(1)
 
     // Script is inserted before CSS
     expect(
-      $(`#bi-inline-in-doc-in-head ~ link[href^="/_next/static/css"]`).length
+      $(`#inline-before ~ link[href^="/_next/static/css"]`).length
     ).toBeGreaterThan(0)
   })
 
@@ -211,40 +211,11 @@ describe('Next.js Script - Primary Strategies', () => {
       await waitFor(1000)
 
       const logs = await browser.log()
-
-      let inDocInHead, inDocOutHead, inPageInHead, inPageOutHead
-
-      for (const log of logs) {
-        if (
-          [inDocInHead, inDocOutHead, inPageInHead, inPageOutHead].every(
-            Boolean
-          )
-        ) {
-          break
-        }
-
-        if (log.message.includes('bi-inline-in-doc-in-head')) {
-          inDocInHead = true
-        } else if (log.message.includes('bi-inline-in-doc-out-head')) {
-          inDocOutHead = true
-        } else if (log.message.includes('bi-inline-in-page-in-head')) {
-          inPageInHead = true
-        } else if (log.message.includes('bi-inline-in-page-out-head')) {
-          inPageOutHead = true
-        }
-      }
-
-      expect({
-        inDocInHead,
-        inDocOutHead,
-        inPageInHead,
-        inPageOutHead,
-      }).toEqual({
-        inDocInHead: true,
-        inDocOutHead: true,
-        inPageInHead: true,
-        inPageOutHead: true,
-      })
+      expect(
+        logs.some((log) =>
+          log.message.includes('beforeInteractive inline script run')
+        )
+      ).toBe(true)
     } finally {
       if (browser) await browser.close()
     }