Properly isolate setting env vars

Author: mischnic

test/integration/config-output-export/test/index.test.ts

@@ -8,6 +8,7 @@ import {
   getRedboxHeader,
   killApp,
   launchApp,
+  type NextDevOptions,
 } from 'next-test-utils'
 import webdriver from 'next-webdriver'
 import { join } from 'path'
@@ -17,7 +18,7 @@ import type { Response } from 'node-fetch'
 const appDir = join(__dirname, '../')
 const nextConfig = new File(join(appDir, 'next.config.js'))
 let app
-const runDev = async (config: any) => {
+const runDev = async (config: any, opts?: NextDevOptions) => {
   await nextConfig.write(`module.exports = ${JSON.stringify(config)}`)
   const port = await findPort()
   const obj = { port, stdout: '', stderr: '' }
@@ -30,6 +31,7 @@ const runDev = async (config: any) => {
     onStderr(msg: string) {
       obj.stderr += msg || ''
     },
+    ...opts,
   })
   return obj
 }
@@ -103,44 +105,45 @@ describe('config-output-export', () => {
   })
 
   describe('when hasNextSupport = true', () => {
-    beforeAll(() => {
-      process.env.NOW_BUILDER = '1'
-    })
-
-    afterAll(() => {
-      delete process.env.NOW_BUILDER
-    })
-
     it('should error with "rewrites" config', async () => {
-      const { stderr } = await runDev({
-        output: 'export',
-        rewrites: [{ source: '/from', destination: '/to' }],
-      })
+      const { stderr } = await runDev(
+        {
+          output: 'export',
+          rewrites: [{ source: '/from', destination: '/to' }],
+        },
+        { env: { NOW_BUILDER: '1' } }
+      )
       expect(stderr).not.toContain(
         'Specified "rewrites" will not automatically work with "output: export".'
       )
     })
 
     it('should error with "redirects" config', async () => {
-      const { stderr } = await runDev({
-        output: 'export',
-        redirects: [{ source: '/from', destination: '/to', permanent: true }],
-      })
+      const { stderr } = await runDev(
+        {
+          output: 'export',
+          redirects: [{ source: '/from', destination: '/to', permanent: true }],
+        },
+        { env: { NOW_BUILDER: '1' } }
+      )
       expect(stderr).not.toContain(
         'Specified "redirects" will not automatically work with "output: export".'
       )
     })
 
     it('should error with "headers" config', async () => {
-      const { stderr } = await runDev({
-        output: 'export',
-        headers: [
-          {
-            source: '/foo',
-            headers: [{ key: 'x-foo', value: 'val' }],
-          },
-        ],
-      })
+      const { stderr } = await runDev(
+        {
+          output: 'export',
+          headers: [
+            {
+              source: '/foo',
+              headers: [{ key: 'x-foo', value: 'val' }],
+            },
+          ],
+        },
+        { env: { NOW_BUILDER: '1' } }
+      )
       expect(stderr).not.toContain(
         'Specified "headers" will not automatically work with "output: export".'
       )

test/production/standalone-mode/required-server-files/required-server-files-app.test.ts

@@ -25,10 +25,6 @@ describe('required server files app router', () => {
     nextEnv?: boolean
     minimalMode?: boolean
   }) => {
-    // test build against environment with next support
-    process.env.NOW_BUILDER = nextEnv ? '1' : ''
-    process.env.NEXT_PRIVATE_TEST_HEADERS = '1'
-
     next = await createNext({
       files: {
         app: new FileRef(join(__dirname, 'app')),
@@ -48,6 +44,11 @@ describe('required server files app router', () => {
         },
         output: 'standalone',
       },
+      env: {
+        // test build against environment with next support
+        NOW_BUILDER: nextEnv ? '1' : '',
+        NEXT_PRIVATE_TEST_HEADERS: '1',
+      },
     })
     await next.stop()
 

test/production/standalone-mode/required-server-files/required-server-files-ppr.test.ts

@@ -24,9 +24,6 @@ describe('required server files app router', () => {
   let cliOutput = ''
 
   beforeAll(async () => {
-    process.env.NOW_BUILDER = '1'
-    process.env.NEXT_PRIVATE_TEST_HEADERS = '1'
-
     // Setup the Next.js app and build it.
     next = await createNext({
       files: {
@@ -50,6 +47,11 @@ describe('required server files app router', () => {
         },
         output: 'standalone',
       },
+      env: {
+        // test build against environment with next support
+        NOW_BUILDER: '1',
+        NEXT_PRIVATE_TEST_HEADERS: '1',
+      },
     })
 
     // Stop the server, we're going to restart it using the standalone server

test/production/standalone-mode/required-server-files/required-server-files.test.ts

@@ -28,10 +28,6 @@ describe('required server files', () => {
   let minimalMode = true
 
   const setupNext = async ({ nextEnv }: { nextEnv?: boolean }) => {
-    // test build against environment with next support
-    process.env.NOW_BUILDER = nextEnv ? '1' : ''
-    process.env.NEXT_PRIVATE_TEST_HEADERS = '1'
-
     next = await createNext({
       files: {
         pages: new FileRef(join(__dirname, 'pages')),
@@ -87,6 +83,11 @@ describe('required server files', () => {
           }
         },
       },
+      env: {
+        // test build against environment with next support
+        NOW_BUILDER: nextEnv ? '1' : '',
+        NEXT_PRIVATE_TEST_HEADERS: '1',
+      },
     })
     await next.stop()
 

test/production/standalone-mode/response-cache/index.test.ts

@@ -20,12 +20,13 @@ describe('minimal-mode-response-cache', () => {
   let output = ''
 
   beforeAll(async () => {
-    // test build against environment with next support
-    process.env.NOW_BUILDER = '1'
-    process.env.NEXT_PRIVATE_TEST_HEADERS = '1'
-
     next = await createNext({
       files: new FileRef(join(__dirname, 'app')),
+      env: {
+        // test build against environment with next support
+        NOW_BUILDER: '1',
+        NEXT_PRIVATE_TEST_HEADERS: '1',
+      },
     })
     await next.stop()