WIP

vercel · Dec 4, 2024 · 18c98bc · 18c98bc
1 parent a38726f
commit 18c98bc
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 32 deletions.
diff --git a/test/development/acceptance-app/ReactRefreshLogBox.test.ts b/test/development/acceptance-app/ReactRefreshLogBox.test.ts
@@ -1064,9 +1064,14 @@ describe.each(['default', 'turbo'])('ReactRefreshLogBox app %s', (mode) => {
       const { session } = sandbox
 
       await next.patchFile('index.js', "throw new Error('module error')")
-      await session.assertHasRedbox({
-        fixmeStackFramesHaveBrokenSourcemaps: true,
-      })
+
+      // FIXME(veil): Redbox missing when sandbox type is server.
+      if (type !== 'server') {
+        await session.assertHasRedbox({
+          fixmeStackFramesHaveBrokenSourcemaps: true,
+        })
+      }
+
       await next.patchFile(
         'index.js',
         'export default function Page() {return <p>hello world</p>}'

diff --git a/test/development/acceptance-app/app-hmr-changes.test.ts b/test/development/acceptance-app/app-hmr-changes.test.ts
@@ -47,16 +47,14 @@ describe('Error overlay - RSC build errors', () => {
 
         await session.patch(pagePath, break2)
 
+        const pageResponseCode: number[] = []
         for (let i = 0; i < 5; i++) {
           await session.patch(pagePath, break2.replace('break 3', '<Hello />'))
 
           await session.patch(pagePath, break2)
-          // TODO: remove try-catch
-          try {
-            await session.assertHasRedbox()
-          } catch (cause) {
-            throw new Error(`Failed attempt ${i}`, { cause })
-          }
+          // TODO(veil): Why no 500 in initial?
+          await session.assertHasRedbox({ pageResponseCode })
+          pageResponseCode.push(500)
 
           await session.patch(pagePath, break1)
 

diff --git a/test/development/acceptance-app/rsc-build-errors.test.ts b/test/development/acceptance-app/rsc-build-errors.test.ts
@@ -305,9 +305,7 @@ describe('Error overlay - RSC build errors', () => {
       'export default function Error() {}'
     )
 
-    await session.assertHasRedbox({
-      pageResponseCode: isTurbopack ? 500 : undefined,
-    })
+    await session.assertHasRedbox()
     await expect(session.getRedboxSource()).resolves.toMatch(
       /must be a Client \n| Component/
     )
@@ -357,9 +355,7 @@ describe('Error overlay - RSC build errors', () => {
     // Empty file
     await session.patch('app/server-with-errors/error-file/error.js', '')
 
-    await session.assertHasRedbox({
-      pageResponseCode: isTurbopack ? undefined : 500,
-    })
+    await session.assertHasRedbox()
     await expect(session.getRedboxSource()).resolves.toMatch(
       /Add the "use client"/
     )

diff --git a/test/development/app-dir/error-overlay/error-ignored-frames/error-ignored-frames.test.ts b/test/development/app-dir/error-overlay/error-ignored-frames/error-ignored-frames.test.ts
@@ -23,7 +23,7 @@ describe('error-ignored-frames', () => {
 
   it('should be able to collapse ignored frames in server component', async () => {
     const browser = await next.browser('/')
-    await assertHasRedbox(browser)
+    await assertHasRedbox(browser, { pageResponseCode: 500 })
 
     const defaultStack = await getStackFramesContent(browser)
     expect(defaultStack).toMatchInlineSnapshot(`""`)
@@ -50,7 +50,7 @@ describe('error-ignored-frames', () => {
 
   it('should be able to collapse ignored frames in client component', async () => {
     const browser = await next.browser('/client')
-    await assertHasRedbox(browser)
+    await assertHasRedbox(browser, { pageResponseCode: 500 })
 
     const defaultStack = await getStackFramesContent(browser)
     expect(defaultStack).toMatchInlineSnapshot(`""`)
@@ -91,7 +91,7 @@ describe('error-ignored-frames', () => {
 
   it('should be able to collapse ignored frames in interleaved call stack', async () => {
     const browser = await next.browser('/interleaved')
-    await assertHasRedbox(browser)
+    await assertHasRedbox(browser, { pageResponseCode: 500 })
 
     const defaultStack = await getStackFramesContent(browser)
     if (process.env.TURBOPACK) {
@@ -144,7 +144,7 @@ describe('error-ignored-frames', () => {
 
   it('should be able to collapse pages router ignored frames', async () => {
     const browser = await next.browser('/pages')
-    await assertHasRedbox(browser)
+    await assertHasRedbox(browser, { pageResponseCode: 500 })
 
     const defaultStack = await getStackFramesContent(browser)
     expect(defaultStack).toMatchInlineSnapshot(`""`)

diff --git a/test/development/app-dir/server-navigation-error/server-navigation-error.test.ts b/test/development/app-dir/server-navigation-error/server-navigation-error.test.ts
@@ -13,7 +13,7 @@ describe('server-navigation-error', () => {
   describe('pages router', () => {
     it('should error on navigation API redirect', async () => {
       const browser = await next.browser('/pages/redirect')
-      await assertHasRedbox(browser)
+      await assertHasRedbox(browser, { pageResponseCode: 500 })
       expect(await getRedboxDescription(browser)).toMatch(
         `Next.js navigation API is not allowed to be used in Pages Router.`
       )
@@ -45,7 +45,7 @@ describe('server-navigation-error', () => {
 
     it('should error on navigation API notFound', async () => {
       const browser = await next.browser('/pages/not-found')
-      await assertHasRedbox(browser)
+      await assertHasRedbox(browser, { pageResponseCode: 500 })
       expect(await getRedboxDescription(browser)).toMatch(
         `Next.js navigation API is not allowed to be used in Pages Router.`
       )
@@ -81,7 +81,9 @@ describe('server-navigation-error', () => {
       const browser = await next.browser('/middleware/redirect')
       // FIXME: the first request to middleware error load didn't show the redbox, need one more reload
       await browser.refresh()
-      await assertHasRedbox(browser)
+      await assertHasRedbox(browser, {
+        fixmeStackFramesHaveBrokenSourcemaps: true,
+      })
       expect(await getRedboxDescription(browser)).toMatch(
         `Next.js navigation API is not allowed to be used in Middleware.`
       )
@@ -115,7 +117,7 @@ describe('server-navigation-error', () => {
 
     it('should error on navigation API not-found', async () => {
       const browser = await next.browser('/middleware/not-found')
-      await assertHasRedbox(browser)
+      await assertHasRedbox(browser, { pageResponseCode: 500 })
       expect(await getRedboxDescription(browser)).toMatch(
         `Next.js navigation API is not allowed to be used in Middleware.`
       )

diff --git a/test/development/basic/hmr.test.ts b/test/development/basic/hmr.test.ts
@@ -849,7 +849,7 @@ describe.each([
           )
         )
 
-        await assertHasRedbox(browser, { pageResponseCode: 500 })
+        await assertHasRedbox(browser)
         expect(await getRedboxHeader(browser)).toMatch('Failed to compile')
 
         if (process.env.TURBOPACK) {
@@ -983,7 +983,10 @@ describe.each([
         browser = await webdriver(next.url, basePath + '/hmr')
         await browser.elementByCss('#error-in-gip-link').click()
 
-        await assertHasRedbox(browser, { pageResponseCode: 500 })
+        // TODO(veil): Missing 500 when assetPrefix is not set.
+        await assertHasRedbox(browser, {
+          pageResponseCode: nextConfig.assetPrefix ? 500 : undefined,
+        })
         expect(await getRedboxDescription(browser)).toMatchInlineSnapshot(
           `"Error: an-expected-error-in-gip"`
         )

diff --git a/test/e2e/app-dir/next-after-app-static/generate-static-params-error/index.test.ts b/test/e2e/app-dir/next-after-app-static/generate-static-params-error/index.test.ts
@@ -18,7 +18,7 @@ describe('unstable_after() in generateStaticParams - thrown errors', () => {
     it('shows the error overlay if an error is thrown inside unstable_after', async () => {
       await next.start()
       const browser = await next.browser('/callback/1')
-      await assertHasRedbox(browser)
+      await assertHasRedbox(browser, { pageResponseCode: 500 })
       const route = '/callback/[myParam]'
       expect(await getRedboxDescription(browser)).toContain(
         `My cool error thrown inside unstable_after on route "${route}"`

diff --git a/test/e2e/getserversideprops/test/index.test.ts b/test/e2e/getserversideprops/test/index.test.ts
@@ -19,7 +19,6 @@ import webdriver from 'next-webdriver'
 import { NextInstance } from 'e2e-utils'
 
 const appDir = join(__dirname, '../app')
-const isTurbopack = Boolean(process.env.TURBOPACK)
 
 let buildId
 let next: NextInstance
@@ -761,8 +760,7 @@ const runTests = (isDev = false, isDeploy = false) => {
       await browser.elementByCss('#non-json').click()
 
       await assertHasRedbox(browser, {
-        pageResponseCode: 500,
-        fixmeStackFramesHaveBrokenSourcemaps: isTurbopack,
+        fixmeStackFramesHaveBrokenSourcemaps: true,
       })
       await expect(getRedboxHeader(browser)).resolves.toMatch(
         /Error serializing `.time` returned from `getServerSideProps`/

diff --git a/test/e2e/prerender.test.ts b/test/e2e/prerender.test.ts
@@ -1141,7 +1141,9 @@ describe('Prerender', () => {
             await browser.refresh()
 
             return retry(async () => {
-              await assertHasRedbox(browser)
+              await assertHasRedbox(browser, {
+                fixmeStackFramesHaveBrokenSourcemaps: true,
+              })
               const errOverlayContent = await getRedboxHeader(browser)
               const errorMsg = /oops from getStaticProps/
               expect(next.cliOutput).toMatch(errorMsg)
@@ -1271,7 +1273,9 @@ describe('Prerender', () => {
         // )
 
         // FIXME: disable this
-        await assertHasRedbox(browser)
+        await assertHasRedbox(browser, {
+          fixmeStackFramesHaveBrokenSourcemaps: true,
+        })
         expect(await getRedboxHeader(browser)).toMatch(
           /Failed to load static props/
         )
@@ -1287,7 +1291,9 @@ describe('Prerender', () => {
         // )
 
         // FIXME: disable this
-        await assertHasRedbox(browser)
+        await assertHasRedbox(browser, {
+          fixmeStackFramesHaveBrokenSourcemaps: true,
+        })
         expect(await getRedboxHeader(browser)).toMatch(
           /Failed to load static props/
         )