Skip to content

Commit 1105501

Browse files
authored
test(integration): fix --turbo tests fixture setup (vercel#55293)
### What? Update few test fixture setup doesn't invoke --turbo based on the conditions. Closes WEB-1543
1 parent f393f55 commit 1105501

File tree

10 files changed

+45
-18
lines changed

10 files changed

+45
-18
lines changed

test/development/basic/barrel-optimization.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { join } from 'path'
22
import { createNext, FileRef } from 'e2e-utils'
33
import { NextInstance } from 'test/lib/next-modes/base'
4+
import { shouldRunTurboDevTest } from '../../lib/next-test-utils'
45

56
describe('optimizePackageImports', () => {
67
let next: NextInstance
@@ -27,7 +28,9 @@ describe('optimizePackageImports', () => {
2728
scripts: {
2829
setup: `cp -r ./node_modules_bak/* ./node_modules`,
2930
build: `yarn setup && next build`,
30-
dev: `yarn setup && next dev`,
31+
dev: `yarn setup && next ${
32+
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
33+
}`,
3134
start: 'next start',
3235
},
3336
},

test/development/experimental-https-server/https-server.generated-key.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import { createNextDescribe } from 'e2e-utils'
22
import https from 'https'
3-
import { renderViaHTTP } from 'next-test-utils'
3+
import { renderViaHTTP, shouldRunTurboDevTest } from 'next-test-utils'
44

55
createNextDescribe(
66
'experimental-https-server (generated certificate)',
77
{
88
files: __dirname,
9-
startCommand: 'yarn next dev --experimental-https',
9+
startCommand: `yarn next ${
10+
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
11+
} --experimental-https`,
1012
skipStart: !process.env.CI,
1113
},
1214
({ next }) => {

test/development/experimental-https-server/https-server.provided-key.test.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import { createNextDescribe } from 'e2e-utils'
22
import https from 'https'
3-
import { renderViaHTTP } from 'next-test-utils'
3+
import { renderViaHTTP, shouldRunTurboDevTest } from 'next-test-utils'
44

55
createNextDescribe(
66
'experimental-https-server (provided certificate)',
77
{
88
files: __dirname,
9-
startCommand:
10-
'yarn next dev --experimental-https --experimental-https-key ./certificates/localhost-key.pem --experimental-https-cert ./certificates/localhost.pem',
9+
startCommand: `yarn next ${
10+
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
11+
} --experimental-https --experimental-https-key ./certificates/localhost-key.pem --experimental-https-cert ./certificates/localhost.pem`,
1112
},
1213
({ next }) => {
1314
const agent = new https.Agent({

test/development/typescript-auto-install/index.test.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { createNext } from 'e2e-utils'
22
import { NextInstance } from 'test/lib/next-modes/base'
3-
import { check, renderViaHTTP } from 'next-test-utils'
3+
import { check, renderViaHTTP, shouldRunTurboDevTest } from 'next-test-utils'
44
import webdriver from 'next-webdriver'
55
import stripAnsi from 'strip-ansi'
66

@@ -11,9 +11,9 @@ describe('typescript-auto-install', () => {
1111
next = await createNext({
1212
files: {
1313
'pages/index.js': `
14-
export default function Page() {
14+
export default function Page() {
1515
return <p>hello world</p>
16-
}
16+
}
1717
`,
1818
},
1919
env: {
@@ -26,7 +26,9 @@ describe('typescript-auto-install', () => {
2626
RUN_ID: '',
2727
BUILD_NUMBER: '',
2828
},
29-
startCommand: 'yarn next dev',
29+
startCommand: `yarn next ${
30+
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
31+
}`,
3032
installCommand: 'yarn',
3133
dependencies: {},
3234
})

test/e2e/app-dir/app-external/app-external.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { createNextDescribe } from 'e2e-utils'
2+
import { shouldRunTurboDevTest } from '../../../lib/next-test-utils'
23

34
async function resolveStreamResponse(response: any, onData?: any) {
45
let result = ''
@@ -27,7 +28,9 @@ createNextDescribe(
2728
scripts: {
2829
setup: `cp -r ./node_modules_bak/* ./node_modules`,
2930
build: 'yarn setup && next build',
30-
dev: 'yarn setup && next dev',
31+
dev: `yarn setup && next ${
32+
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
33+
}`,
3134
start: 'next start',
3235
},
3336
},

test/e2e/edge-compiler-module-exports-preference/index.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { createNext } from 'e2e-utils'
22
import { NextInstance } from 'test/lib/next-modes/base'
3-
import { fetchViaHTTP } from 'next-test-utils'
3+
import { fetchViaHTTP, shouldRunTurboDevTest } from 'next-test-utils'
44

55
describe('Edge compiler module exports preference', () => {
66
let next: NextInstance
@@ -38,7 +38,9 @@ describe('Edge compiler module exports preference', () => {
3838
scripts: {
3939
setup: `cp -r ./my-lib ./node_modules`,
4040
build: 'yarn setup && next build',
41-
dev: 'yarn setup && next dev',
41+
dev: `yarn setup && next ${
42+
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
43+
}`,
4244
start: 'next start',
4345
},
4446
},

test/e2e/edge-runtime-uses-edge-light-import-specifier-for-packages/edge-runtime-uses-edge-light-import-specifier-for-packages.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { createNextDescribe } from 'e2e-utils'
2+
import { shouldRunTurboDevTest } from '../../lib/next-test-utils'
23

34
createNextDescribe(
45
'edge-runtime uses edge-light import specifier for packages',
@@ -8,7 +9,9 @@ createNextDescribe(
89
scripts: {
910
setup: 'cp -r ./node_modules_bak/* ./node_modules',
1011
build: 'yarn setup && next build',
11-
dev: 'yarn setup && next dev',
12+
dev: `yarn setup && next ${
13+
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
14+
}`,
1215
start: 'next start',
1316
},
1417
},

test/e2e/middleware-general/test/index.test.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ import fs from 'fs-extra'
44
import { join } from 'path'
55
import webdriver from 'next-webdriver'
66
import { NextInstance } from 'test/lib/next-modes/base'
7-
import { check, fetchViaHTTP, waitFor } from 'next-test-utils'
7+
import {
8+
check,
9+
fetchViaHTTP,
10+
shouldRunTurboDevTest,
11+
waitFor,
12+
} from 'next-test-utils'
813
import { createNext, FileRef } from 'e2e-utils'
914

1015
const urlsError = 'Please use only absolute URLs'
@@ -46,7 +51,9 @@ describe('Middleware Runtime', () => {
4651
scripts: {
4752
setup: `cp -r ./shared-package ./node_modules`,
4853
build: 'yarn setup && next build',
49-
dev: 'yarn setup && next dev',
54+
dev: `yarn setup && next ${
55+
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
56+
}`,
5057
start: 'next start',
5158
},
5259
},

test/e2e/transpile-packages/index.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import path from 'path'
22
import { createNext, FileRef } from 'e2e-utils'
33
import { NextInstance } from 'test/lib/next-modes/base'
44
import webdriver from 'next-webdriver'
5+
import { shouldRunTurboDevTest } from '../../lib/next-test-utils'
56

67
describe('transpile packages', () => {
78
let next: NextInstance
@@ -23,7 +24,9 @@ describe('transpile packages', () => {
2324
scripts: {
2425
setup: `cp -r ./node_modules_bak/* ./node_modules`,
2526
build: 'yarn setup && next build',
26-
dev: 'yarn setup && next dev',
27+
dev: `yarn setup && next ${
28+
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
29+
}`,
2730
start: 'next start',
2831
},
2932
},

test/production/pnpm-support/index.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
initNextServerScript,
1010
killApp,
1111
renderViaHTTP,
12+
shouldRunTurboDevTest,
1213
} from 'next-test-utils'
1314

1415
describe('pnpm support', () => {
@@ -72,7 +73,7 @@ describe('pnpm support', () => {
7273
},
7374
packageJson: {
7475
scripts: {
75-
dev: 'next dev',
76+
dev: `next ${shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'}`,
7677
build: 'next build',
7778
start: 'next start',
7879
},

0 commit comments

Comments
 (0)