Use env var to switch logging config in test app

Author: unstubbable

test/e2e/app-dir/server-action-logging/next.config.js

@@ -1,5 +1,6 @@
 module.exports = {
-  logging: {
-    serverFunctions: true,
-  },
+  logging:
+    process.env.NEXT_TEST_SERVER_FUNCTION_LOGGING === 'true'
+      ? { serverFunctions: true }
+      : undefined,
 }

test/e2e/app-dir/server-action-logging/server-action-logging.test.ts

@@ -6,6 +6,9 @@ describe('server-action-logging', () => {
   const { next, isNextStart, skipped } = nextTestSetup({
     skipDeployment: true,
     files: __dirname,
+    env: {
+      NEXT_TEST_SERVER_FUNCTION_LOGGING: 'true',
+    },
   })
 
   if (skipped) return
@@ -186,32 +189,27 @@ describe('server-action-logging', () => {
       expect(logs).not.toContain('test/e2e/app-dir/server-action-logging/')
     })
   })
+})
 
-  describe('when logging.serverFunctions is not enabled', () => {
-    beforeAll(async () => {
-      await next.patchFile('next.config.js', (content) =>
-        content.replace('serverFunctions: true', '// serverFunctions: true')
-      )
-    })
+describe('server-action-logging when logging.serverFunctions is not enabled', () => {
+  const { next, skipped } = nextTestSetup({
+    skipDeployment: true,
+    files: __dirname,
+  })
 
-    afterAll(async () => {
-      await next.patchFile('next.config.js', (content) =>
-        content.replace('// serverFunctions: true', 'serverFunctions: true')
-      )
-    })
+  if (skipped) return
 
-    it('should not log server actions', async () => {
-      const browser = await next.browser('/')
-      const outputIndex = next.cliOutput.length
+  it('should not log server actions', async () => {
+    const browser = await next.browser('/')
+    const outputIndex = next.cliOutput.length
 
-      await browser.elementByCss('#success-action').click()
-      await browser.waitForElementByCss('#result')
+    await browser.elementByCss('#success-action').click()
+    await browser.waitForElementByCss('#result')
 
-      await retry(() => {
-        const logs = stripAnsi(next.cliOutput.slice(outputIndex))
-        expect(logs).toContain('POST /')
-        expect(logs).not.toContain('└─ ƒ successAction')
-      })
+    await retry(() => {
+      const logs = stripAnsi(next.cliOutput.slice(outputIndex))
+      expect(logs).toContain('POST /')
+      expect(logs).not.toContain('└─ ƒ successAction')
     })
   })
 })