From d8f1a5d30ff88794b9250825493a653c2646c915 Mon Sep 17 00:00:00 2001
From: Zack Tanner <1939140+ztanner@users.noreply.github.com>
Date: Thu, 13 Jun 2024 15:48:47 -0700
Subject: [PATCH] enable parallel-routes-and-interception deploy tests (#66848)

Only 1 test suite in this suite is failing and it's related to file
tracing, which should be fixed in a follow-up. For now this enables
deploy tests for everything else to make sure we don't regress.

This also simplifies the original test to not require stopping the
server & patching a file.
---
 test/deploy-tests-manifest.json               |  1 -
 .../parallel-routes-and-interception.test.ts  | 40 ++++++++-----------
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/test/deploy-tests-manifest.json b/test/deploy-tests-manifest.json
index 99484cc7a1376..1a9621c2cf940 100644
--- a/test/deploy-tests-manifest.json
+++ b/test/deploy-tests-manifest.json
@@ -37,7 +37,6 @@
       "test/e2e/app-dir/app-routes/app-custom-route-base-path.test.ts",
       "test/e2e/app-dir/mdx/mdx.test.ts",
       "test/e2e/app-dir/modularizeimports/modularizeimports.test.ts",
-      "test/e2e/app-dir/parallel-routes-and-interception/parallel-routes-and-interception.test.ts",
       "test/e2e/app-dir/third-parties/basic.test.ts",
       "test/e2e/esm-externals/esm-externals.test.ts",
       "test/e2e/app-dir/actions-navigation/index.test.ts",
diff --git a/test/e2e/app-dir/parallel-routes-and-interception/parallel-routes-and-interception.test.ts b/test/e2e/app-dir/parallel-routes-and-interception/parallel-routes-and-interception.test.ts
index 9c23e098bb426..692347f73d038 100644
--- a/test/e2e/app-dir/parallel-routes-and-interception/parallel-routes-and-interception.test.ts
+++ b/test/e2e/app-dir/parallel-routes-and-interception/parallel-routes-and-interception.test.ts
@@ -1,6 +1,6 @@
-import { nextTestSetup } from 'e2e-utils'
+import { nextTestSetup, FileRef } from 'e2e-utils'
 import { check, retry } from 'next-test-utils'
-import { outdent } from 'outdent'
+import path from 'path'
 
 describe('parallel-routes-and-interception', () => {
   const { next, isNextDev, isNextStart } = nextTestSetup({
@@ -879,32 +879,24 @@ describe('parallel-routes-and-interception', () => {
   })
 })
 
-describe('parallel-routes-and-interception with patching', () => {
-  const { next } = nextTestSetup({
-    files: __dirname,
-    skipStart: true,
+describe('parallel-routes-and-interception-conflicting-pages', () => {
+  const { next, skipped } = nextTestSetup({
+    // This is skipped when deployed as it appears to cause an issue when tracing Next.js files
+    // TODO: Investigate why this causes an issue when deployed
+    skipDeployment: true,
+    files: {
+      app: new FileRef(path.join(__dirname, 'app')),
+      'app/parallel/nested-2/page.js': `
+       export default function Page() {
+          return 'hello world'
+       }
+      `,
+    },
   })
 
-  afterEach(async () => {
-    try {
-      await next.stop()
-    } finally {
-      await next.deleteFile('app/parallel/nested-2/page.js')
-    }
-  })
+  if (skipped) return
 
   it('should gracefully handle when two page segments match the `children` parallel slot', async () => {
-    await next.patchFile(
-      'app/parallel/nested-2/page.js',
-      outdent`
-          export default function Page() {
-            return 'hello world'
-          }
-        `
-    )
-
-    await next.start()
-
     const html = await next.render('/parallel/nested-2')
 
     // before adding this file, the page would have matched `/app/parallel/(new)/@baz/nested-2/page`