Unverified Commit ad4977a7 authored by Will Binns-Smith's avatar Will Binns-Smith Committed by GitHub

Update error-recovery test snapshots for alternative bundler (#76299)

Passes an additional 4 tests for Rspack. Rspack error messages included
trailing whitespace when written to the DOM, so these are stripped out.
parent 23ecc88a
...@@ -382,6 +382,7 @@ jobs: ...@@ -382,6 +382,7 @@ jobs:
with: with:
afterBuild: node scripts/test-new-tests.mjs --flake-detection --mode dev --group ${{ matrix.group }} afterBuild: node scripts/test-new-tests.mjs --flake-detection --mode dev --group ${{ matrix.group }}
stepName: 'test-new-tests-dev-${{matrix.group}}' stepName: 'test-new-tests-dev-${{matrix.group}}'
timeout_minutes: 60 # Increase the default timeout as tests are intentionally run multiple times to detect flakes
secrets: inherit secrets: inherit
...@@ -399,6 +400,7 @@ jobs: ...@@ -399,6 +400,7 @@ jobs:
with: with:
afterBuild: node scripts/test-new-tests.mjs --flake-detection --mode start --group ${{ matrix.group }} afterBuild: node scripts/test-new-tests.mjs --flake-detection --mode start --group ${{ matrix.group }}
stepName: 'test-new-tests-start-${{matrix.group}}' stepName: 'test-new-tests-start-${{matrix.group}}'
timeout_minutes: 60 # Increase the default timeout as tests are intentionally run multiple times to detect flakes
secrets: inherit secrets: inherit
......
...@@ -10,6 +10,7 @@ import { ...@@ -10,6 +10,7 @@ import {
renderViaHTTP, renderViaHTTP,
retry, retry,
waitFor, waitFor,
trimEndMultiline,
} from 'next-test-utils' } from 'next-test-utils'
import { nextTestSetup } from 'e2e-utils' import { nextTestSetup } from 'e2e-utils'
import { outdent } from 'outdent' import { outdent } from 'outdent'
...@@ -169,7 +170,47 @@ describe.each([ ...@@ -169,7 +170,47 @@ describe.each([
const source = next.normalizeTestDirContent( const source = next.normalizeTestDirContent(
await getRedboxSource(browser) await getRedboxSource(browser)
) )
if (basePath === '' && !process.env.TURBOPACK) {
if (basePath === '' && process.env.TURBOPACK) {
expect(source).toMatchInlineSnapshot(`
"./pages/hmr/about2.js (7:1)
Parsing ecmascript source code failed
5 | div
6 | )
> 7 | }
| ^
8 |
Unexpected token. Did you mean \`{'}'}\` or \`}\`?"
`)
} else if (basePath === '' && process.env.NEXT_RSPACK) {
expect(trimEndMultiline(source)).toMatchInlineSnapshot(`
"./pages/hmr/about2.js
× Module build failed:
├─▶ ×
│ │ x Unexpected token. Did you mean \`{'}'}\` or \`}\`?
│ │ ,-[TEST_DIR/pages/hmr/about2.js:7:1]
│ │ 4 | <p>This is the about page.</p>
│ │ 5 | div
│ │ 6 | )
│ │ 7 | }
│ │ : ^
│ │ \`----
│ │
│ │ x Unexpected eof
│ │ ,-[TEST_DIR/pages/hmr/about2.js:7:3]
│ │ 5 | div
│ │ 6 | )
│ │ 7 | }
│ │ \`----
│ │
│
╰─▶ Syntax Error
Import trace for requested module:
./pages/hmr/about2.js"
`)
} else if (basePath === '') {
expect(source).toMatchInlineSnapshot(` expect(source).toMatchInlineSnapshot(`
"./pages/hmr/about2.js "./pages/hmr/about2.js
Error: x Unexpected token. Did you mean \`{'}'}\` or \`&rbrace;\`? Error: x Unexpected token. Did you mean \`{'}'}\` or \`&rbrace;\`?
...@@ -193,19 +234,46 @@ describe.each([ ...@@ -193,19 +234,46 @@ describe.each([
Import trace for requested module: Import trace for requested module:
./pages/hmr/about2.js" ./pages/hmr/about2.js"
`) `)
} else if (basePath === '' && process.env.TURBOPACK) { } else if (basePath === '/docs' && process.env.TURBOPACK) {
expect(source).toMatchInlineSnapshot(` expect(source).toMatchInlineSnapshot(`
"./pages/hmr/about2.js (7:1) "./pages/hmr/about2.js (7:1)
Parsing ecmascript source code failed Parsing ecmascript source code failed
5 | div 5 | div
6 | ) 6 | )
> 7 | } > 7 | }
| ^ | ^
8 | 8 |
Unexpected token. Did you mean \`{'}'}\` or \`&rbrace;\`?" Unexpected token. Did you mean \`{'}'}\` or \`&rbrace;\`?"
`)
} else if (basePath === '/docs' && process.env.NEXT_RSPACK) {
expect(trimEndMultiline(source)).toMatchInlineSnapshot(`
"./pages/hmr/about2.js
× Module build failed:
├─▶ ×
│ │ x Unexpected token. Did you mean \`{'}'}\` or \`&rbrace;\`?
│ │ ,-[TEST_DIR/pages/hmr/about2.js:7:1]
│ │ 4 | <p>This is the about page.</p>
│ │ 5 | div
│ │ 6 | )
│ │ 7 | }
│ │ : ^
│ │ \`----
│ │
│ │ x Unexpected eof
│ │ ,-[TEST_DIR/pages/hmr/about2.js:7:3]
│ │ 5 | div
│ │ 6 | )
│ │ 7 | }
│ │ \`----
│ │
│
╰─▶ Syntax Error
Import trace for requested module:
./pages/hmr/about2.js"
`) `)
} else if (basePath === '/docs' && !process.env.TURBOPACK) { } else if (basePath === '/docs') {
expect(source).toMatchInlineSnapshot(` expect(source).toMatchInlineSnapshot(`
"./pages/hmr/about2.js "./pages/hmr/about2.js
Error: x Unexpected token. Did you mean \`{'}'}\` or \`&rbrace;\`? Error: x Unexpected token. Did you mean \`{'}'}\` or \`&rbrace;\`?
...@@ -229,18 +297,6 @@ describe.each([ ...@@ -229,18 +297,6 @@ describe.each([
Import trace for requested module: Import trace for requested module:
./pages/hmr/about2.js" ./pages/hmr/about2.js"
`) `)
} else if (basePath === '/docs' && process.env.TURBOPACK) {
expect(source).toMatchInlineSnapshot(`
"./pages/hmr/about2.js (7:1)
Parsing ecmascript source code failed
5 | div
6 | )
> 7 | }
| ^
8 |
Unexpected token. Did you mean \`{'}'}\` or \`&rbrace;\`?"
`)
} }
await next.patchFile(aboutPage, aboutContent) await next.patchFile(aboutPage, aboutContent)
...@@ -529,6 +585,28 @@ describe.each([ ...@@ -529,6 +585,28 @@ describe.each([
Read more: https://nextjs.org/docs/app/api-reference/next-config-js/turbo#webpack-loaders" Read more: https://nextjs.org/docs/app/api-reference/next-config-js/turbo#webpack-loaders"
`) `)
} else if (process.env.NEXT_RSPACK) {
expect(trimEndMultiline(await getRedboxSource(browser)))
.toMatchInlineSnapshot(`
"./components/parse-error.xyz
× Module parse failed:
╰─▶ × JavaScript parsing error: Expression expected
╭─[3:0]
1 │ This
2 │ is
3 │ }}}
· ─
4 │ invalid
5 │ js
╰────
help:
You may need an appropriate loader to handle this file type.
Import trace for requested module:
./components/parse-error.xyz
./pages/hmr/about8.js"
`)
} else { } else {
expect(await getRedboxSource(browser)).toMatchInlineSnapshot(` expect(await getRedboxSource(browser)).toMatchInlineSnapshot(`
"./components/parse-error.xyz "./components/parse-error.xyz
...@@ -545,6 +623,7 @@ describe.each([ ...@@ -545,6 +623,7 @@ describe.each([
./pages/hmr/about8.js" ./pages/hmr/about8.js"
`) `)
} }
await next.patchFile(aboutPage, aboutContent) await next.patchFile(aboutPage, aboutContent)
await retry(async () => { await retry(async () => {
...@@ -605,6 +684,29 @@ describe.each([ ...@@ -605,6 +684,29 @@ describe.each([
Expression expected" Expression expected"
`) `)
} else if (process.env.NEXT_RSPACK) {
expect(trimEndMultiline(next.normalizeTestDirContent(redboxSource)))
.toMatchInlineSnapshot(`
"./components/parse-error.js
× Module build failed:
├─▶ ×
│ │ x Expression expected
│ │ ,-[./components/parse-error.js:3:1]
│ │ 1 | This
│ │ 2 | is
│ │ 3 | }}}
│ │ : ^
│ │ 4 | invalid
│ │ 5 | js
│ │ \`----
│ │
│
╰─▶ Syntax Error
Import trace for requested module:
./components/parse-error.js
./pages/hmr/about9.js"
`)
} else { } else {
redboxSource = redboxSource.substring( redboxSource = redboxSource.substring(
0, 0,
......
...@@ -1740,3 +1740,10 @@ export async function getHighlightedDiffLines( ...@@ -1740,3 +1740,10 @@ export async function getHighlightedDiffLines(
]) ])
) )
} }
export function trimEndMultiline(str: string) {
return str
.split('\n')
.map((line) => line.trimEnd())
.join('\n')
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment