Fix deploy tests

vercel · May 8, 2023 · 953c1ad · 953c1ad
1 parent cc85686
commit 953c1ad
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/packages/next/src/build/index.ts b/packages/next/src/build/index.ts
@@ -289,7 +289,11 @@ export default async function build(
       hasAppDir = Boolean(appDir)
 
       if (isAppDirEnabled && hasAppDir) {
-        if (!process.env.__NEXT_TEST_MODE && ciEnvironment.hasNextSupport) {
+        if (
+          (!process.env.__NEXT_TEST_MODE ||
+            process.env.__NEXT_TEST_MODE === 'e2e') &&
+          ciEnvironment.hasNextSupport
+        ) {
           const requireHook = require.resolve('../server/require-hook')
           const contents = await promises.readFile(requireHook, 'utf8')
           await promises.writeFile(

diff --git a/test/e2e/app-dir/app-static/app-static.test.ts b/test/e2e/app-dir/app-static/app-static.test.ts
@@ -191,9 +191,11 @@ createNextDescribe(
           await waitFor(500)
         }
 
-        expect(next.cliOutput.substring(buildCliOutputIndex)).not.toContain(
-          'rendering index'
-        )
+        if (isNextStart) {
+          expect(next.cliOutput.substring(buildCliOutputIndex)).not.toContain(
+            'rendering index'
+          )
+        }
       })
 
       it.each([

diff --git a/test/lib/next-modes/next-deploy.ts b/test/lib/next-modes/next-deploy.ts
@@ -85,7 +85,7 @@ export class NextDeployInstance extends NextInstance {
       [
         'deploy',
         '--build-env',
-        'NEXT_PRIVATE_TEST_MODE=1',
+        'NEXT_PRIVATE_TEST_MODE=e2e',
         '--build-env',
         'NEXT_TELEMETRY_DISABLED=1',
         ...additionalEnv,

diff --git a/test/lib/next-modes/next-dev.ts b/test/lib/next-modes/next-dev.ts
@@ -47,7 +47,7 @@ export class NextDevInstance extends NextInstance {
             ...this.env,
             NODE_ENV: '' as any,
             PORT: this.forcedPort || '0',
-            __NEXT_TEST_MODE: '1',
+            __NEXT_TEST_MODE: 'e2e',
             __NEXT_TEST_WITH_DEVTOOL: '1',
           },
         })

diff --git a/test/lib/next-modes/next-start.ts b/test/lib/next-modes/next-start.ts
@@ -50,7 +50,7 @@ export class NextStartInstance extends NextInstance {
         ...this.env,
         NODE_ENV: '' as any,
         PORT: this.forcedPort || '0',
-        __NEXT_TEST_MODE: '1',
+        __NEXT_TEST_MODE: 'e2e',
       },
     }
     let buildArgs = ['yarn', 'next', 'build']