From 81450de6afabd540d4019c30f91b14b9191593e3 Mon Sep 17 00:00:00 2001
From: Jiwon Choi <devjiwonchoi@gmail.com>
Date: Tue, 16 Apr 2024 04:46:42 +0900
Subject: [PATCH] hotfix: hardcoded skip turbopack tests to manifest (#64515)

cc @shuding

CI run failed after #63053 on turbo production, which had not yet been
targeted for turbo.

x-ref: #63103

---------

Co-authored-by: JJ Kasper <22380829+ijjk@users.noreply.github.com>
Co-authored-by: Leah <8845940+ForsakenHarmony@users.noreply.github.com>
Co-authored-by: Jiachi Liu <inbox@huozhi.im>
---
 .../index.test.ts                               | 17 ++++++-----------
 test/turbopack-build-tests-manifest.json        | 12 ++++++++++++
 test/turbopack-dev-tests-manifest.json          |  9 +++++++++
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/test/development/app-dir/root-not-found-missing-root-layout/index.test.ts b/test/development/app-dir/root-not-found-missing-root-layout/index.test.ts
index 88d92f21a6..d81b12ae7b 100644
--- a/test/development/app-dir/root-not-found-missing-root-layout/index.test.ts
+++ b/test/development/app-dir/root-not-found-missing-root-layout/index.test.ts
@@ -1,18 +1,13 @@
 import { nextTestSetup } from 'e2e-utils'
 
 describe('root-not-found-missing-root-layout', () => {
-  const { next, isTurbopack } = nextTestSetup({
+  const { next } = nextTestSetup({
     files: __dirname,
   })
 
-  // Skip test for turbo dev for now since generating a missing root layout is not supported yet.
-  // See https://github.com/vercel/next.js/pull/63053#issuecomment-1987101666
-  ;(isTurbopack ? it.skip : it)(
-    'should not conflict with generated layout on dev server',
-    async () => {
-      const browser = await next.browser('/')
-      // eslint-disable-next-line jest/no-standalone-expect
-      expect(await browser.elementByCss('p').text()).toBe('not found')
-    }
-  )
+  it('should not conflict with generated layout on dev server', async () => {
+    const browser = await next.browser('/')
+    // eslint-disable-next-line jest/no-standalone-expect
+    expect(await browser.elementByCss('p').text()).toBe('not found')
+  })
 })
diff --git a/test/turbopack-build-tests-manifest.json b/test/turbopack-build-tests-manifest.json
index e3a8ec5c9b..c486b66780 100644
--- a/test/turbopack-build-tests-manifest.json
+++ b/test/turbopack-build-tests-manifest.json
@@ -2164,6 +2164,18 @@
       "flakey": [],
       "runtimeError": false
     },
+    "test/e2e/app-dir/not-found/multi-root-layout/index.test.ts": {
+      "passed": [
+        "not-found-multi-root-layout should render main not-found",
+        "not-found-multi-root-layout should render sub not-found"
+      ],
+      "failed": [
+        "not-found-multi-root-layout should render root not-found for uncaught routes"
+      ],
+      "pending": [],
+      "flakey": [],
+      "runtimeError": false
+    },
     "test/e2e/app-dir/pages-to-app-routing/pages-to-app-routing.test.ts": {
       "passed": ["pages-to-app-routing should work using browser"],
       "failed": [],
diff --git a/test/turbopack-dev-tests-manifest.json b/test/turbopack-dev-tests-manifest.json
index 52f5be81cc..efc8e7bd37 100644
--- a/test/turbopack-dev-tests-manifest.json
+++ b/test/turbopack-dev-tests-manifest.json
@@ -1479,6 +1479,15 @@
     "flakey": [],
     "runtimeError": false
   },
+  "test/development/app-dir/root-not-found-missing-root-layout/index.test.ts": {
+    "passed": [],
+    "failed": [
+      "root-not-found-missing-root-layout should not conflict with generated layout on dev server"
+    ],
+    "pending": [],
+    "flakey": [],
+    "runtimeError": false
+  },
   "test/development/app-dir/strict-mode-enabled-by-default/strict-mode-enabled-by-default.test.ts": {
     "passed": ["Strict Mode enabled by default should work using browser"],
     "failed": [],