test(turbo): allow to run test with --experimental-turbo

vercel · Jul 31, 2023 · 9693beb · 9693beb
1 parent de873d0
commit 9693beb
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -39,9 +39,10 @@ if (shouldEnableTestTrace) {
     customJestConfig.reporters = ['default']
   }
 
-  const outputDirectory = process.env.TURBOPACK
+  const outputDirectory = (process.env.TURBOPACK || process.env.EXPERIMENTAL_TURBOPACK)
     ? '<rootDir>/turbopack-test-junit-report'
     : '<rootDir>/test-junit-report'
+
   customJestConfig.reporters.push([
     'jest-junit',
     {

diff --git a/test/lib/next-modes/next-dev.ts b/test/lib/next-modes/next-dev.ts
@@ -1,6 +1,7 @@
 import spawn from 'cross-spawn'
 import { Span } from 'next/src/trace'
 import { NextInstance } from './base'
+import { getTurbopackFlag } from '../turbo'
 
 export class NextDevInstance extends NextInstance {
   private _cliOutput: string = ''
@@ -27,7 +28,7 @@ export class NextDevInstance extends NextInstance {
     let startArgs = [
       'yarn',
       'next',
-      useTurbo ? '--turbo' : undefined,
+      useTurbo ? getTurbopackFlag() : undefined,
       useDirArg && this.testDir,
     ].filter(Boolean) as string[]
 

diff --git a/test/lib/next-test-utils.ts b/test/lib/next-test-utils.ts
@@ -26,7 +26,7 @@ import type { RequestInit, Response } from 'node-fetch'
 import type { NextServer } from 'next/dist/server/next'
 import type { BrowserInterface } from './browsers/base'
 
-import { shouldRunTurboDevTest } from './turbo'
+import { getTurbopackFlag, shouldRunTurboDevTest } from './turbo'
 
 export { shouldRunTurboDevTest }
 
@@ -436,9 +436,12 @@ export function launchApp(
   const useTurbo = shouldRunTurboDevTest()
 
   return runNextCommandDev(
-    [useTurbo ? '--turbo' : undefined, dir, '-p', port as string].filter(
-      Boolean
-    ),
+    [
+      useTurbo ? getTurbopackFlag() : undefined,
+      dir,
+      '-p',
+      port as string,
+    ].filter(Boolean),
     undefined,
     {
       ...options,

diff --git a/test/lib/turbo.ts b/test/lib/turbo.ts
@@ -14,13 +14,26 @@ export function shouldRunTurboDevTest(): boolean {
     return false
   }
 
-  const shouldRunTurboDev = !!process.env.TURBOPACK
+  const shouldRunTurboDev =
+    !!process.env.TURBOPACK || !!process.env.EXPERIMENTAL_TURBOPACK
   if (shouldRunTurboDev && !loggedTurbopack) {
     require('console').log(
-      `Running tests with turbopack because environment variable TURBOPACK is set`
+      `Running tests with turbopack because environment variable ${
+        process.env.TURBOPACK ? 'TURBOPACK' : 'EXPERIMENTAL_TURBOPACK'
+      } is set`
     )
     loggedTurbopack = true
   }
 
   return shouldRunTurboDev
 }
+
+export function getTurbopackFlag(): string {
+  if (!!process.env.TURBOPACK) {
+    return '--turbo'
+  } else if (!!process.env.EXPERIMENTAL_TURBOPACK) {
+    return '--experimental-turbo'
+  } else {
+    throw Error(`Cannot get the flag for running turbopack`)
+  }
+}