Unverified Commit 11055012 authored by OJ Kwon's avatar OJ Kwon Committed by GitHub

test(integration): fix --turbo tests fixture setup (#55293)



### What?

Update few test fixture setup doesn't invoke --turbo based on the conditions.

Closes WEB-1543
parent f393f556
import { join } from 'path' import { join } from 'path'
import { createNext, FileRef } from 'e2e-utils' import { createNext, FileRef } from 'e2e-utils'
import { NextInstance } from 'test/lib/next-modes/base' import { NextInstance } from 'test/lib/next-modes/base'
import { shouldRunTurboDevTest } from '../../lib/next-test-utils'
describe('optimizePackageImports', () => { describe('optimizePackageImports', () => {
let next: NextInstance let next: NextInstance
...@@ -27,7 +28,9 @@ describe('optimizePackageImports', () => { ...@@ -27,7 +28,9 @@ describe('optimizePackageImports', () => {
scripts: { scripts: {
setup: `cp -r ./node_modules_bak/* ./node_modules`, setup: `cp -r ./node_modules_bak/* ./node_modules`,
build: `yarn setup && next build`, build: `yarn setup && next build`,
dev: `yarn setup && next dev`, dev: `yarn setup && next ${
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
}`,
start: 'next start', start: 'next start',
}, },
}, },
......
import { createNextDescribe } from 'e2e-utils' import { createNextDescribe } from 'e2e-utils'
import https from 'https' import https from 'https'
import { renderViaHTTP } from 'next-test-utils' import { renderViaHTTP, shouldRunTurboDevTest } from 'next-test-utils'
createNextDescribe( createNextDescribe(
'experimental-https-server (generated certificate)', 'experimental-https-server (generated certificate)',
{ {
files: __dirname, files: __dirname,
startCommand: 'yarn next dev --experimental-https', startCommand: `yarn next ${
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
} --experimental-https`,
skipStart: !process.env.CI, skipStart: !process.env.CI,
}, },
({ next }) => { ({ next }) => {
......
import { createNextDescribe } from 'e2e-utils' import { createNextDescribe } from 'e2e-utils'
import https from 'https' import https from 'https'
import { renderViaHTTP } from 'next-test-utils' import { renderViaHTTP, shouldRunTurboDevTest } from 'next-test-utils'
createNextDescribe( createNextDescribe(
'experimental-https-server (provided certificate)', 'experimental-https-server (provided certificate)',
{ {
files: __dirname, files: __dirname,
startCommand: startCommand: `yarn next ${
'yarn next dev --experimental-https --experimental-https-key ./certificates/localhost-key.pem --experimental-https-cert ./certificates/localhost.pem', shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
} --experimental-https --experimental-https-key ./certificates/localhost-key.pem --experimental-https-cert ./certificates/localhost.pem`,
}, },
({ next }) => { ({ next }) => {
const agent = new https.Agent({ const agent = new https.Agent({
......
import { createNext } from 'e2e-utils' import { createNext } from 'e2e-utils'
import { NextInstance } from 'test/lib/next-modes/base' import { NextInstance } from 'test/lib/next-modes/base'
import { check, renderViaHTTP } from 'next-test-utils' import { check, renderViaHTTP, shouldRunTurboDevTest } from 'next-test-utils'
import webdriver from 'next-webdriver' import webdriver from 'next-webdriver'
import stripAnsi from 'strip-ansi' import stripAnsi from 'strip-ansi'
...@@ -11,9 +11,9 @@ describe('typescript-auto-install', () => { ...@@ -11,9 +11,9 @@ describe('typescript-auto-install', () => {
next = await createNext({ next = await createNext({
files: { files: {
'pages/index.js': ` 'pages/index.js': `
export default function Page() { export default function Page() {
return <p>hello world</p> return <p>hello world</p>
} }
`, `,
}, },
env: { env: {
...@@ -26,7 +26,9 @@ describe('typescript-auto-install', () => { ...@@ -26,7 +26,9 @@ describe('typescript-auto-install', () => {
RUN_ID: '', RUN_ID: '',
BUILD_NUMBER: '', BUILD_NUMBER: '',
}, },
startCommand: 'yarn next dev', startCommand: `yarn next ${
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
}`,
installCommand: 'yarn', installCommand: 'yarn',
dependencies: {}, dependencies: {},
}) })
......
import { createNextDescribe } from 'e2e-utils' import { createNextDescribe } from 'e2e-utils'
import { shouldRunTurboDevTest } from '../../../lib/next-test-utils'
async function resolveStreamResponse(response: any, onData?: any) { async function resolveStreamResponse(response: any, onData?: any) {
let result = '' let result = ''
...@@ -27,7 +28,9 @@ createNextDescribe( ...@@ -27,7 +28,9 @@ createNextDescribe(
scripts: { scripts: {
setup: `cp -r ./node_modules_bak/* ./node_modules`, setup: `cp -r ./node_modules_bak/* ./node_modules`,
build: 'yarn setup && next build', build: 'yarn setup && next build',
dev: 'yarn setup && next dev', dev: `yarn setup && next ${
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
}`,
start: 'next start', start: 'next start',
}, },
}, },
......
import { createNext } from 'e2e-utils' import { createNext } from 'e2e-utils'
import { NextInstance } from 'test/lib/next-modes/base' import { NextInstance } from 'test/lib/next-modes/base'
import { fetchViaHTTP } from 'next-test-utils' import { fetchViaHTTP, shouldRunTurboDevTest } from 'next-test-utils'
describe('Edge compiler module exports preference', () => { describe('Edge compiler module exports preference', () => {
let next: NextInstance let next: NextInstance
...@@ -38,7 +38,9 @@ describe('Edge compiler module exports preference', () => { ...@@ -38,7 +38,9 @@ describe('Edge compiler module exports preference', () => {
scripts: { scripts: {
setup: `cp -r ./my-lib ./node_modules`, setup: `cp -r ./my-lib ./node_modules`,
build: 'yarn setup && next build', build: 'yarn setup && next build',
dev: 'yarn setup && next dev', dev: `yarn setup && next ${
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
}`,
start: 'next start', start: 'next start',
}, },
}, },
......
import { createNextDescribe } from 'e2e-utils' import { createNextDescribe } from 'e2e-utils'
import { shouldRunTurboDevTest } from '../../lib/next-test-utils'
createNextDescribe( createNextDescribe(
'edge-runtime uses edge-light import specifier for packages', 'edge-runtime uses edge-light import specifier for packages',
...@@ -8,7 +9,9 @@ createNextDescribe( ...@@ -8,7 +9,9 @@ createNextDescribe(
scripts: { scripts: {
setup: 'cp -r ./node_modules_bak/* ./node_modules', setup: 'cp -r ./node_modules_bak/* ./node_modules',
build: 'yarn setup && next build', build: 'yarn setup && next build',
dev: 'yarn setup && next dev', dev: `yarn setup && next ${
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
}`,
start: 'next start', start: 'next start',
}, },
}, },
......
...@@ -4,7 +4,12 @@ import fs from 'fs-extra' ...@@ -4,7 +4,12 @@ import fs from 'fs-extra'
import { join } from 'path' import { join } from 'path'
import webdriver from 'next-webdriver' import webdriver from 'next-webdriver'
import { NextInstance } from 'test/lib/next-modes/base' import { NextInstance } from 'test/lib/next-modes/base'
import { check, fetchViaHTTP, waitFor } from 'next-test-utils' import {
check,
fetchViaHTTP,
shouldRunTurboDevTest,
waitFor,
} from 'next-test-utils'
import { createNext, FileRef } from 'e2e-utils' import { createNext, FileRef } from 'e2e-utils'
const urlsError = 'Please use only absolute URLs' const urlsError = 'Please use only absolute URLs'
...@@ -46,7 +51,9 @@ describe('Middleware Runtime', () => { ...@@ -46,7 +51,9 @@ describe('Middleware Runtime', () => {
scripts: { scripts: {
setup: `cp -r ./shared-package ./node_modules`, setup: `cp -r ./shared-package ./node_modules`,
build: 'yarn setup && next build', build: 'yarn setup && next build',
dev: 'yarn setup && next dev', dev: `yarn setup && next ${
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
}`,
start: 'next start', start: 'next start',
}, },
}, },
......
...@@ -2,6 +2,7 @@ import path from 'path' ...@@ -2,6 +2,7 @@ import path from 'path'
import { createNext, FileRef } from 'e2e-utils' import { createNext, FileRef } from 'e2e-utils'
import { NextInstance } from 'test/lib/next-modes/base' import { NextInstance } from 'test/lib/next-modes/base'
import webdriver from 'next-webdriver' import webdriver from 'next-webdriver'
import { shouldRunTurboDevTest } from '../../lib/next-test-utils'
describe('transpile packages', () => { describe('transpile packages', () => {
let next: NextInstance let next: NextInstance
...@@ -23,7 +24,9 @@ describe('transpile packages', () => { ...@@ -23,7 +24,9 @@ describe('transpile packages', () => {
scripts: { scripts: {
setup: `cp -r ./node_modules_bak/* ./node_modules`, setup: `cp -r ./node_modules_bak/* ./node_modules`,
build: 'yarn setup && next build', build: 'yarn setup && next build',
dev: 'yarn setup && next dev', dev: `yarn setup && next ${
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
}`,
start: 'next start', start: 'next start',
}, },
}, },
......
...@@ -9,6 +9,7 @@ import { ...@@ -9,6 +9,7 @@ import {
initNextServerScript, initNextServerScript,
killApp, killApp,
renderViaHTTP, renderViaHTTP,
shouldRunTurboDevTest,
} from 'next-test-utils' } from 'next-test-utils'
describe('pnpm support', () => { describe('pnpm support', () => {
...@@ -72,7 +73,7 @@ describe('pnpm support', () => { ...@@ -72,7 +73,7 @@ describe('pnpm support', () => {
}, },
packageJson: { packageJson: {
scripts: { scripts: {
dev: 'next dev', dev: `next ${shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'}`,
build: 'next build', build: 'next build',
start: 'next start', start: 'next start',
}, },
......
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