diff --git a/test/e2e/app-dir/global-error/app/client/page.js b/test/e2e/app-dir/global-error/basic/app/client/page.js
similarity index 100%
rename from test/e2e/app-dir/global-error/app/client/page.js
rename to test/e2e/app-dir/global-error/basic/app/client/page.js
diff --git a/test/e2e/app-dir/global-error/app/global-error.js b/test/e2e/app-dir/global-error/basic/app/global-error.js
similarity index 100%
rename from test/e2e/app-dir/global-error/app/global-error.js
rename to test/e2e/app-dir/global-error/basic/app/global-error.js
diff --git a/test/e2e/app-dir/global-error/app/layout.js b/test/e2e/app-dir/global-error/basic/app/layout.js
similarity index 100%
rename from test/e2e/app-dir/global-error/app/layout.js
rename to test/e2e/app-dir/global-error/basic/app/layout.js
diff --git a/test/e2e/app-dir/global-error/app/ssr/client/page.js b/test/e2e/app-dir/global-error/basic/app/ssr/client/page.js
similarity index 100%
rename from test/e2e/app-dir/global-error/app/ssr/client/page.js
rename to test/e2e/app-dir/global-error/basic/app/ssr/client/page.js
diff --git a/test/e2e/app-dir/global-error/app/ssr/server/page.js b/test/e2e/app-dir/global-error/basic/app/ssr/server/page.js
similarity index 100%
rename from test/e2e/app-dir/global-error/app/ssr/server/page.js
rename to test/e2e/app-dir/global-error/basic/app/ssr/server/page.js
diff --git a/test/e2e/app-dir/global-error/index.test.ts b/test/e2e/app-dir/global-error/basic/index.test.ts
similarity index 100%
rename from test/e2e/app-dir/global-error/index.test.ts
rename to test/e2e/app-dir/global-error/basic/index.test.ts
diff --git a/test/e2e/app-dir/global-error/layout-error/app/global-error.js b/test/e2e/app-dir/global-error/layout-error/app/global-error.js
new file mode 100644
index 0000000000000..d960556d75cd5
--- /dev/null
+++ b/test/e2e/app-dir/global-error/layout-error/app/global-error.js
@@ -0,0 +1,14 @@
+'use client'
+
+export default function GlobalError({ error }) {
+ return (
+
+
+
+ Global Error
+ {`Global error: ${error?.message}`}
+ {error?.digest && {error?.digest}
}
+
+
+ )
+}
diff --git a/test/e2e/app-dir/global-error/layout-error/app/layout.js b/test/e2e/app-dir/global-error/layout-error/app/layout.js
new file mode 100644
index 0000000000000..6fc4fecd68e10
--- /dev/null
+++ b/test/e2e/app-dir/global-error/layout-error/app/layout.js
@@ -0,0 +1,5 @@
+export default function layout() {
+ throw new Error('Global error: layout error')
+}
+
+export const revalidate = 0
diff --git a/test/e2e/app-dir/global-error/layout-error/app/page.js b/test/e2e/app-dir/global-error/layout-error/app/page.js
new file mode 100644
index 0000000000000..a5192c0ea9cfa
--- /dev/null
+++ b/test/e2e/app-dir/global-error/layout-error/app/page.js
@@ -0,0 +1,3 @@
+export default function page() {
+ return Page
+}
diff --git a/test/e2e/app-dir/global-error/layout-error.test.ts b/test/e2e/app-dir/global-error/layout-error/index.test.ts
similarity index 86%
rename from test/e2e/app-dir/global-error/layout-error.test.ts
rename to test/e2e/app-dir/global-error/layout-error/index.test.ts
index db83aa336ae1b..707094fdc3176 100644
--- a/test/e2e/app-dir/global-error/layout-error.test.ts
+++ b/test/e2e/app-dir/global-error/layout-error/index.test.ts
@@ -9,10 +9,8 @@ async function testDev(browser, errorRegex) {
createNextDescribe(
'app dir - global error - layout error',
{
- files: {
- 'app/layout.js': `throw new Error('Global error: layout error')`,
- 'app/page.js': `export default function page() { return Page
}`,
- },
+ files: __dirname,
+ skipDeployment: true,
},
({ next, isNextDev }) => {
it('should render global error for error in server components', async () => {