mirror of
https://github.com/vercel/next.js.git
synced 2026-09-20 02:25:18 +08:00
8141dcf12e
### What?
Converts every test under `test/integration/` to an isolated test
running through `nextTestSetup` (under `test/e2e/`, `test/production/`,
`test/development/`, or `test/unit/`), then deletes `test/integration/`
along with the legacy CI orchestration that was specific to it.
- `test/integration/` removed entirely (~327 test suites)
- New isolated suites added across the existing folders:
- `test/e2e/` — 175
- `test/production/` — 130
- `test/development/` — 43
- `test/unit/` — 1
- `.github/workflows/build_and_test.yml` and `run-tests.js` no longer
have any `integration` branches
- `nextTestSetup` gained a `baseUrl` option on `next.browser()` so a
small number of tests that drive their own proxy/static-export server
can keep using `next.browser(...)` instead of importing `next-webdriver`
directly
### Why?
`test/integration/` predated `nextTestSetup` and ran tests directly
against the source checkout via custom helpers (`launchApp`,
`nextBuild`, `nextStart`, `runNextCommand`, `webdriver`, `fetchViaHTTP`,
…). Each suite hand-rolled its own dev/start/build orchestration,
fixture mutation, and process management.
The isolated test model used by the rest of the repo gives each suite an
isolated working directory containing a packed `next.tgz` install, a
uniform `next.start()` / `next.build()` / `next.fetch()` /
`next.browser()` API, and the same lifecycle for dev, start, and deploy
modes — so a single set of assertions covers all three. Deploy-mode
skips and per-feature gates are expressed declaratively
(`skipDeployment`, `disableAutoSkewProtection`, `if (skipped) return`)
instead of branching on `process.env`.
Removing `test/integration/` lets us:
- Delete the bespoke orchestration code in the CI workflow and
`run-tests.js`
- Run every converted suite consistently in dev, start, and deploy modes
(where applicable)
- Reproduce every test locally with the same `pnpm
test-{dev,start}-{turbo,webpack}` commands; no separate `integration`
path
- Open the door to running `test/production` against deployments in the
future (the converted suites already declare `skipDeployment` so they
can be flipped on)
### How?
Mechanical conversion per suite, with targeted clean-ups:
1. **Per-suite conversion.** Each
`test/integration/<name>/test/index.test.{js,ts}` was rewritten into a
single `<name>.test.ts` under the right folder based on what the
original exercised:
- `launchApp` / dev-only assertions → `test/development/`
- `nextBuild` + `nextStart` / start-only assertions → `test/production/`
- Both → `test/e2e/`
- The one pure jsdom render check (`link-without-router`) → `test/unit/`
2. **API mapping.** Custom helpers were replaced by `nextTestSetup`
equivalents: `launchApp` → `next.start()`, `nextBuild` → `next.build()`,
`runNextCommand` → `next.runCommand`, `fetchViaHTTP` → `next.fetch`,
`webdriver(...)` → `next.browser(...)`. Fixture mutations switched from
raw `fs.writeFile`/`fs.rename` to `next.patchFile` (with the 3-arg
`runWithTempContent` callback when the change has a defined scope) and
`next.deleteFile`.
3. **Deploy-mode handling.** Suites that can't run in deploy mode (use
`patchFile` / `next.build()` / depend on local CLI output) declare
`skipDeployment: true` and early-return on the `skipped` boolean. Suites
where Vercel's edge mutates URLs (`&dpl=`, immutable assets) declare
`disableAutoSkewProtection: true`.
4. **`next.browser({ baseUrl })`.** A handful of tests
(`prerender-export`, `cdn-cache-busting`, `preload-viewport`, both
`react-virtualized` suites) need to drive a separate server (a
static-export server or an `http-proxy` instance) rather than the
Next.js process. Instead of importing `next-webdriver` directly, those
tests now pass `{ baseUrl: <port|url> }` to `next.browser()`. For the
proxy cases, the proxy was moved into `server.js` inside the fixture and
`http-proxy` declared via the `dependencies` option of `nextTestSetup`,
so the test runs with a fully isolated dependency graph.
5. **CI clean-up.** With `test/integration` gone, the `test
integration*` jobs and `integration-tests-manifest`-related logic in
`.github/workflows/build_and_test.yml` were removed, and `run-tests.js`
no longer has the `integration` test-folder branch.
6. **Validation.** The PR was iterated against multiple full CI runs;
the remaining failures on the latest run are pre-existing flakes
(segment-cache 60s `act` timeouts in turbopack-prod) or transient
infrastructure issues unrelated to the conversion.
224 lines
5.7 KiB
JavaScript
224 lines
5.7 KiB
JavaScript
// @ts-check
|
|
import fs from 'fs/promises'
|
|
import execa from 'execa'
|
|
import { createRequire } from 'module'
|
|
import path from 'path'
|
|
import { getDiffRevision, getGitInfo } from './git-info.mjs'
|
|
|
|
const require = createRequire(import.meta.url)
|
|
const glob = require('glob')
|
|
const {
|
|
getTestFilterFromManifest,
|
|
mergeManifests,
|
|
} = require('../test/get-test-filter')
|
|
|
|
const DEFAULT_DEPLOY_TESTS_MANIFEST_PATH = 'test/deploy-tests-manifest.json'
|
|
const TEST_FILE_REGEX = /^test\/.*?\.test\.(js|ts|tsx)$/
|
|
|
|
function normalizePath(file) {
|
|
return file.replace(/\\/g, '/')
|
|
}
|
|
|
|
function getExcludedCases(suite = {}) {
|
|
return new Set([...(suite.failed ?? []), ...(suite.flakey ?? [])])
|
|
}
|
|
|
|
function getExternalTestsFilterPaths() {
|
|
const externalTestsFilters =
|
|
process.env.NEXT_EXTERNAL_TESTS_FILTERS ??
|
|
DEFAULT_DEPLOY_TESTS_MANIFEST_PATH
|
|
|
|
const manifestPaths = new Map()
|
|
|
|
for (const manifestPath of externalTestsFilters.split(',')) {
|
|
if (!manifestPath.trim()) {
|
|
continue
|
|
}
|
|
|
|
const absolutePath = path.resolve(process.cwd(), manifestPath)
|
|
const repoRelativePath = normalizePath(
|
|
path.relative(process.cwd(), absolutePath)
|
|
)
|
|
|
|
manifestPaths.set(repoRelativePath, {
|
|
absolutePath,
|
|
repoRelativePath,
|
|
})
|
|
}
|
|
|
|
return [...manifestPaths.values()]
|
|
}
|
|
|
|
function getDeployTestsFromManifest(manifest) {
|
|
const testFilter = getTestFilterFromManifest(manifest)
|
|
if (!testFilter) {
|
|
return []
|
|
}
|
|
|
|
const tests = glob
|
|
.sync('test/e2e/**/*.test.{js,ts,tsx}', {
|
|
cwd: process.cwd(),
|
|
ignore: '**/node_modules/**',
|
|
nodir: true,
|
|
})
|
|
.map((file) => ({ file: normalizePath(file), excludedCases: [] }))
|
|
|
|
return testFilter(tests).map((test) => test.file)
|
|
}
|
|
|
|
export function getDeployManifestChangedTests(
|
|
currentManifest,
|
|
previousManifest
|
|
) {
|
|
if (!currentManifest) {
|
|
return []
|
|
}
|
|
|
|
const previousVersion2Manifest = previousManifest ?? {
|
|
version: 2,
|
|
suites: {},
|
|
rules: { include: [], exclude: [] },
|
|
}
|
|
const previousIncludedTests = new Set(
|
|
getDeployTestsFromManifest(previousVersion2Manifest)
|
|
)
|
|
|
|
const changedTests = new Set()
|
|
|
|
for (const file of getDeployTestsFromManifest(currentManifest)) {
|
|
const currentExcludedCases = getExcludedCases(
|
|
currentManifest.suites?.[file]
|
|
)
|
|
const previousExcludedCases = getExcludedCases(
|
|
previousVersion2Manifest.suites?.[file]
|
|
)
|
|
|
|
if (!previousIncludedTests.has(file)) {
|
|
changedTests.add(file)
|
|
continue
|
|
}
|
|
|
|
for (const testCase of previousExcludedCases) {
|
|
if (!currentExcludedCases.has(testCase)) {
|
|
changedTests.add(file)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
return [...changedTests]
|
|
}
|
|
|
|
/**
|
|
* Detects changed tests files by comparing the current branch with `origin/canary`
|
|
* Returns tests separated by test mode (dev/prod), as well as the corresponding commit hash
|
|
* that the current branch is pointing to
|
|
*/
|
|
export default async function getChangedTests() {
|
|
/** @type import('execa').Options */
|
|
const EXECA_OPTS = { shell: true }
|
|
|
|
const { branchName, remoteUrl, commitSha, isCanary } = await getGitInfo()
|
|
|
|
if (isCanary) {
|
|
console.log(`Skipping flake detection for canary`)
|
|
return { devTests: [], prodTests: [], deployTests: [], commitSha }
|
|
}
|
|
|
|
const diffRevision = await getDiffRevision()
|
|
|
|
const changesResult = await execa(
|
|
`git diff ${diffRevision} --name-only`,
|
|
EXECA_OPTS
|
|
).catch((err) => {
|
|
console.error(err)
|
|
return { stdout: '', stderr: '' }
|
|
})
|
|
console.log(
|
|
{
|
|
branchName,
|
|
remoteUrl,
|
|
isCanary,
|
|
commitSha,
|
|
},
|
|
`\ngit diff:\n${changesResult.stderr}\n${changesResult.stdout}`
|
|
)
|
|
const changedFiles = changesResult.stdout.split('\n')
|
|
|
|
// run each test 3 times in each test mode (if E2E) with no-retrying
|
|
// and if any fail it's flakey
|
|
const devTests = new Set()
|
|
const prodTests = new Set()
|
|
const deployTests = new Set()
|
|
|
|
for (let file of changedFiles) {
|
|
// normalize slashes
|
|
file = normalizePath(file)
|
|
const fileExists = await fs
|
|
.access(path.join(process.cwd(), file), fs.constants.F_OK)
|
|
.then(() => true)
|
|
.catch(() => false)
|
|
|
|
if (fileExists && file.match(TEST_FILE_REGEX)) {
|
|
if (file.startsWith('test/e2e/')) {
|
|
devTests.add(file)
|
|
prodTests.add(file)
|
|
deployTests.add(file)
|
|
} else if (file.startsWith('test/production')) {
|
|
prodTests.add(file)
|
|
} else if (file.startsWith('test/development')) {
|
|
devTests.add(file)
|
|
}
|
|
}
|
|
}
|
|
|
|
const externalTestsFilterPaths = getExternalTestsFilterPaths()
|
|
|
|
if (
|
|
externalTestsFilterPaths.some(({ repoRelativePath }) =>
|
|
changedFiles.includes(repoRelativePath)
|
|
)
|
|
) {
|
|
const currentManifest = mergeManifests(
|
|
await Promise.all(
|
|
externalTestsFilterPaths.map(async ({ absolutePath }) =>
|
|
JSON.parse(await fs.readFile(absolutePath, 'utf8'))
|
|
)
|
|
)
|
|
)
|
|
const previousManifest = mergeManifests(
|
|
(
|
|
await Promise.all(
|
|
externalTestsFilterPaths.map(async ({ repoRelativePath }) => {
|
|
const previousManifestOutput = await execa(
|
|
`git show ${diffRevision}:${repoRelativePath}`,
|
|
EXECA_OPTS
|
|
).catch(() => null)
|
|
|
|
return previousManifestOutput?.stdout
|
|
? JSON.parse(previousManifestOutput.stdout)
|
|
: null
|
|
})
|
|
)
|
|
).filter(Boolean)
|
|
)
|
|
|
|
for (const file of getDeployManifestChangedTests(
|
|
currentManifest,
|
|
previousManifest
|
|
)) {
|
|
deployTests.add(file)
|
|
}
|
|
}
|
|
|
|
const detectedTests = {
|
|
devTests: [...devTests],
|
|
prodTests: [...prodTests],
|
|
deployTests: [...deployTests],
|
|
}
|
|
|
|
console.log('Detected tests:', JSON.stringify(detectedTests, null, 2))
|
|
|
|
return { ...detectedTests, commitSha }
|
|
}
|