From 6713ce4cabb639a9bec3ce08a387bdd53de85bc1 Mon Sep 17 00:00:00 2001 From: Jan Kaifer Date: Wed, 21 Dec 2022 14:16:52 +0100 Subject: [PATCH] Move tests into their test folder (#44183) --- .../app-dir/{ => app-alias}/app-alias.test.ts | 2 +- .../app-edge-global.test.ts | 3 +-- .../app-dir/{ => app-edge}/app-edge.test.ts | 3 +-- .../{ => app-external}/app-external.test.ts | 3 +-- .../app-middleware.test.ts | 8 +++--- .../{ => app-prefetch}/prefetching.test.ts | 3 +-- .../{ => app-rendering}/rendering.test.ts | 3 +-- .../{ => app-static}/app-static.test.ts | 4 +-- test/e2e/app-dir/{ => app}/index.test.ts | 3 +-- test/e2e/app-dir/{ => app}/standalone.test.ts | 4 +-- .../{ => app}/vercel-analytics.test.ts | 5 ++-- .../{ => asset-prefix}/asset-prefix.test.ts | 3 +-- .../async-component-preload.test.ts | 3 +-- .../back-button-download-bug.test.ts | 3 +-- .../create-root-layout.test.ts | 27 +++++++------------ .../{ => dynamic-href}/dynamic-href.test.ts | 3 +-- .../{ => global-error}/global-error.test.ts | 3 +-- test/e2e/app-dir/{ => head}/head.test.ts | 2 +- test/e2e/app-dir/{ => import}/import.test.ts | 3 +-- .../{ => layout-params}/layout-params.test.ts | 3 +-- .../app-dir/{ => next-font}/next-font.test.ts | 3 +-- .../{ => next-image}/next-image.test.ts | 3 +-- .../{ => root-layout}/root-layout.test.ts | 3 +-- .../app-dir/{ => rsc-basic}/rsc-basic.test.ts | 4 +-- .../{ => rsc-errors}/rsc-errors.test.ts | 3 +-- .../{ => trailingslash}/trailingslash.test.ts | 3 +-- .../{ => with-babel}/with-babel.test.ts | 3 +-- 27 files changed, 42 insertions(+), 71 deletions(-) rename test/e2e/app-dir/{ => app-alias}/app-alias.test.ts (95%) rename test/e2e/app-dir/{ => app-edge-global}/app-edge-global.test.ts (80%) rename test/e2e/app-dir/{ => app-edge}/app-edge.test.ts (96%) rename test/e2e/app-dir/{ => app-external}/app-external.test.ts (98%) rename test/e2e/app-dir/{ => app-middleware}/app-middleware.test.ts (94%) rename test/e2e/app-dir/{ => app-prefetch}/prefetching.test.ts (95%) rename test/e2e/app-dir/{ => app-rendering}/rendering.test.ts (98%) rename test/e2e/app-dir/{ => app-static}/app-static.test.ts (99%) rename test/e2e/app-dir/{ => app}/index.test.ts (99%) rename test/e2e/app-dir/{ => app}/standalone.test.ts (96%) rename test/e2e/app-dir/{ => app}/vercel-analytics.test.ts (94%) rename test/e2e/app-dir/{ => asset-prefix}/asset-prefix.test.ts (94%) rename test/e2e/app-dir/{ => async-component-preload}/async-component-preload.test.ts (81%) rename test/e2e/app-dir/{ => back-button-download-bug}/back-button-download-bug.test.ts (89%) rename test/e2e/app-dir/{ => create-root-layout}/create-root-layout.test.ts (90%) rename test/e2e/app-dir/{ => dynamic-href}/dynamic-href.test.ts (96%) rename test/e2e/app-dir/{ => global-error}/global-error.test.ts (91%) rename test/e2e/app-dir/{ => head}/head.test.ts (99%) rename test/e2e/app-dir/{ => import}/import.test.ts (84%) rename test/e2e/app-dir/{ => layout-params}/layout-params.test.ts (96%) rename test/e2e/app-dir/{ => next-font}/next-font.test.ts (99%) rename test/e2e/app-dir/{ => next-image}/next-image.test.ts (99%) rename test/e2e/app-dir/{ => root-layout}/root-layout.test.ts (99%) rename test/e2e/app-dir/{ => rsc-basic}/rsc-basic.test.ts (99%) rename test/e2e/app-dir/{ => rsc-errors}/rsc-errors.test.ts (97%) rename test/e2e/app-dir/{ => trailingslash}/trailingslash.test.ts (94%) rename test/e2e/app-dir/{ => with-babel}/with-babel.test.ts (80%) diff --git a/test/e2e/app-dir/app-alias.test.ts b/test/e2e/app-dir/app-alias/app-alias.test.ts similarity index 95% rename from test/e2e/app-dir/app-alias.test.ts rename to test/e2e/app-dir/app-alias/app-alias.test.ts index 284d4d34eadd304..ed8135a5245bc54 100644 --- a/test/e2e/app-dir/app-alias.test.ts +++ b/test/e2e/app-dir/app-alias/app-alias.test.ts @@ -4,7 +4,7 @@ import path from 'path' createNextDescribe( 'app-dir alias handling', { - files: path.join(__dirname, 'app-alias'), + files: __dirname, packageJson: { type: 'module', }, diff --git a/test/e2e/app-dir/app-edge-global.test.ts b/test/e2e/app-dir/app-edge-global/app-edge-global.test.ts similarity index 80% rename from test/e2e/app-dir/app-edge-global.test.ts rename to test/e2e/app-dir/app-edge-global/app-edge-global.test.ts index 50afb6dac254314..52a5601fc685c74 100644 --- a/test/e2e/app-dir/app-edge-global.test.ts +++ b/test/e2e/app-dir/app-edge-global/app-edge-global.test.ts @@ -1,10 +1,9 @@ import { createNextDescribe } from 'e2e-utils' -import path from 'path' createNextDescribe( 'app-dir global edge configuration', { - files: path.join(__dirname, 'app-edge-global'), + files: __dirname, skipDeployment: true, }, ({ next }) => { diff --git a/test/e2e/app-dir/app-edge.test.ts b/test/e2e/app-dir/app-edge/app-edge.test.ts similarity index 96% rename from test/e2e/app-dir/app-edge.test.ts rename to test/e2e/app-dir/app-edge/app-edge.test.ts index 5c91edffbada1b5..972dc90ebe36679 100644 --- a/test/e2e/app-dir/app-edge.test.ts +++ b/test/e2e/app-dir/app-edge/app-edge.test.ts @@ -1,11 +1,10 @@ import { createNextDescribe } from 'e2e-utils' import { check } from 'next-test-utils' -import path from 'path' createNextDescribe( 'app-dir edge SSR', { - files: path.join(__dirname, 'app-edge'), + files: __dirname, skipDeployment: true, }, ({ next }) => { diff --git a/test/e2e/app-dir/app-external.test.ts b/test/e2e/app-dir/app-external/app-external.test.ts similarity index 98% rename from test/e2e/app-dir/app-external.test.ts rename to test/e2e/app-dir/app-external/app-external.test.ts index f2b1300fbfb8ec5..748d09721237f82 100644 --- a/test/e2e/app-dir/app-external.test.ts +++ b/test/e2e/app-dir/app-external/app-external.test.ts @@ -1,4 +1,3 @@ -import path from 'path' import { createNextDescribe } from 'e2e-utils' async function resolveStreamResponse(response: any, onData?: any) { @@ -18,7 +17,7 @@ async function resolveStreamResponse(response: any, onData?: any) { createNextDescribe( 'app dir - external dependency', { - files: path.join(__dirname, './app-external'), + files: __dirname, dependencies: { '@next/font': 'canary', react: 'latest', diff --git a/test/e2e/app-dir/app-middleware.test.ts b/test/e2e/app-dir/app-middleware/app-middleware.test.ts similarity index 94% rename from test/e2e/app-dir/app-middleware.test.ts rename to test/e2e/app-dir/app-middleware/app-middleware.test.ts index 06426f56e0b680e..d976cabed00326f 100644 --- a/test/e2e/app-dir/app-middleware.test.ts +++ b/test/e2e/app-dir/app-middleware/app-middleware.test.ts @@ -6,7 +6,7 @@ import path from 'path' createNextDescribe( 'app-dir with middleware', { - files: path.join(__dirname, 'app-middleware'), + files: __dirname, skipDeployment: true, }, ({ next }) => { @@ -121,10 +121,8 @@ createNextDescribe( 'app dir middleware without pages dir', { files: { - app: new FileRef(path.join(__dirname, 'app-middleware/app')), - 'next.config.js': new FileRef( - path.join(__dirname, 'app-middleware/next.config.js') - ), + app: new FileRef(path.join(__dirname, 'app')), + 'next.config.js': new FileRef(path.join(__dirname, 'next.config.js')), 'middleware.js': ` import { NextResponse } from 'next/server' diff --git a/test/e2e/app-dir/prefetching.test.ts b/test/e2e/app-dir/app-prefetch/prefetching.test.ts similarity index 95% rename from test/e2e/app-dir/prefetching.test.ts rename to test/e2e/app-dir/app-prefetch/prefetching.test.ts index eb9cc2412fff17d..105b835ec77d0f6 100644 --- a/test/e2e/app-dir/prefetching.test.ts +++ b/test/e2e/app-dir/app-prefetch/prefetching.test.ts @@ -1,11 +1,10 @@ import { createNextDescribe } from 'e2e-utils' import { waitFor } from 'next-test-utils' -import path from 'path' createNextDescribe( 'app dir prefetching', { - files: path.join(__dirname, 'app-prefetch'), + files: __dirname, skipDeployment: true, }, ({ next, isNextDev }) => { diff --git a/test/e2e/app-dir/rendering.test.ts b/test/e2e/app-dir/app-rendering/rendering.test.ts similarity index 98% rename from test/e2e/app-dir/rendering.test.ts rename to test/e2e/app-dir/app-rendering/rendering.test.ts index 8906eecd4a1b70d..ed5e55e34fb2b4a 100644 --- a/test/e2e/app-dir/rendering.test.ts +++ b/test/e2e/app-dir/app-rendering/rendering.test.ts @@ -1,12 +1,11 @@ import { createNextDescribe } from 'e2e-utils' import { waitFor } from 'next-test-utils' -import path from 'path' import cheerio from 'cheerio' createNextDescribe( 'app dir rendering', { - files: path.join(__dirname, 'app-rendering'), + files: __dirname, skipDeployment: true, }, ({ next, isNextDev: isDev }) => { diff --git a/test/e2e/app-dir/app-static.test.ts b/test/e2e/app-dir/app-static/app-static.test.ts similarity index 99% rename from test/e2e/app-dir/app-static.test.ts rename to test/e2e/app-dir/app-static/app-static.test.ts index b036c28ea7bb01f..6b4c60806e38f90 100644 --- a/test/e2e/app-dir/app-static.test.ts +++ b/test/e2e/app-dir/app-static/app-static.test.ts @@ -1,7 +1,7 @@ import globOrig from 'glob' import cheerio from 'cheerio' import { promisify } from 'util' -import path, { join } from 'path' +import { join } from 'path' import { createNextDescribe } from 'e2e-utils' import { check, normalizeRegEx, waitFor } from 'next-test-utils' @@ -10,7 +10,7 @@ const glob = promisify(globOrig) createNextDescribe( 'app-dir static/dynamic handling', { - files: path.join(__dirname, 'app-static'), + files: __dirname, }, ({ next, isNextDev: isDev, isNextStart }) => { if (isNextStart) { diff --git a/test/e2e/app-dir/index.test.ts b/test/e2e/app-dir/app/index.test.ts similarity index 99% rename from test/e2e/app-dir/index.test.ts rename to test/e2e/app-dir/app/index.test.ts index 114951982e043bb..3810684dd788b64 100644 --- a/test/e2e/app-dir/index.test.ts +++ b/test/e2e/app-dir/app/index.test.ts @@ -1,13 +1,12 @@ import { createNextDescribe } from 'e2e-utils' import crypto from 'crypto' import { check, getRedboxHeader, hasRedbox, waitFor } from 'next-test-utils' -import path from 'path' import cheerio from 'cheerio' createNextDescribe( 'app dir', { - files: path.join(__dirname, 'app'), + files: __dirname, dependencies: { swr: '2.0.0-rc.0', react: 'latest', diff --git a/test/e2e/app-dir/standalone.test.ts b/test/e2e/app-dir/app/standalone.test.ts similarity index 96% rename from test/e2e/app-dir/standalone.test.ts rename to test/e2e/app-dir/app/standalone.test.ts index 06a3d05904b8588..5f2052a43552165 100644 --- a/test/e2e/app-dir/standalone.test.ts +++ b/test/e2e/app-dir/app/standalone.test.ts @@ -1,4 +1,4 @@ -import { createNextDescribe, FileRef } from 'e2e-utils' +import { createNextDescribe } from 'e2e-utils' import fs from 'fs-extra' import os from 'os' import path from 'path' @@ -15,7 +15,7 @@ if (!(globalThis as any).isNextStart) { createNextDescribe( 'output: standalone with app dir', { - files: new FileRef(path.join(__dirname, 'app')), + files: __dirname, dependencies: { swr: '2.0.0-rc.0', react: 'latest', diff --git a/test/e2e/app-dir/vercel-analytics.test.ts b/test/e2e/app-dir/app/vercel-analytics.test.ts similarity index 94% rename from test/e2e/app-dir/vercel-analytics.test.ts rename to test/e2e/app-dir/app/vercel-analytics.test.ts index 4ebf93e7bbaa1f1..a92d077e1696e78 100644 --- a/test/e2e/app-dir/vercel-analytics.test.ts +++ b/test/e2e/app-dir/app/vercel-analytics.test.ts @@ -1,7 +1,6 @@ -import { createNext, FileRef } from 'e2e-utils' +import { createNext } from 'e2e-utils' import { NextInstance } from 'test/lib/next-modes/base' import { check } from 'next-test-utils' -import path from 'path' describe('vercel analytics', () => { const isDev = (global as any).isNextDev @@ -16,7 +15,7 @@ describe('vercel analytics', () => { function runTests({ assetPrefix }: { assetPrefix?: boolean }) { beforeAll(async () => { next = await createNext({ - files: new FileRef(path.join(__dirname, 'app')), + files: __dirname, dependencies: { swr: '2.0.0-rc.0', react: 'latest', diff --git a/test/e2e/app-dir/asset-prefix.test.ts b/test/e2e/app-dir/asset-prefix/asset-prefix.test.ts similarity index 94% rename from test/e2e/app-dir/asset-prefix.test.ts rename to test/e2e/app-dir/asset-prefix/asset-prefix.test.ts index 04c742c34fab657..76341d3c564a595 100644 --- a/test/e2e/app-dir/asset-prefix.test.ts +++ b/test/e2e/app-dir/asset-prefix/asset-prefix.test.ts @@ -1,10 +1,9 @@ import { createNextDescribe } from 'e2e-utils' -import path from 'path' createNextDescribe( 'app-dir assetPrefix handling', { - files: path.join(__dirname, 'asset-prefix'), + files: __dirname, skipDeployment: true, }, ({ next }) => { diff --git a/test/e2e/app-dir/async-component-preload.test.ts b/test/e2e/app-dir/async-component-preload/async-component-preload.test.ts similarity index 81% rename from test/e2e/app-dir/async-component-preload.test.ts rename to test/e2e/app-dir/async-component-preload/async-component-preload.test.ts index 5531acc67d32f0d..8209c460d8fb86c 100644 --- a/test/e2e/app-dir/async-component-preload.test.ts +++ b/test/e2e/app-dir/async-component-preload/async-component-preload.test.ts @@ -1,10 +1,9 @@ import { createNextDescribe } from 'e2e-utils' -import path from 'path' createNextDescribe( 'async-component-preload', { - files: path.join(__dirname, 'async-component-preload'), + files: __dirname, skipDeployment: true, }, ({ next }) => { diff --git a/test/e2e/app-dir/back-button-download-bug.test.ts b/test/e2e/app-dir/back-button-download-bug/back-button-download-bug.test.ts similarity index 89% rename from test/e2e/app-dir/back-button-download-bug.test.ts rename to test/e2e/app-dir/back-button-download-bug/back-button-download-bug.test.ts index 231dd04653fe214..3c1f5ae20c32aea 100644 --- a/test/e2e/app-dir/back-button-download-bug.test.ts +++ b/test/e2e/app-dir/back-button-download-bug/back-button-download-bug.test.ts @@ -1,12 +1,11 @@ import { createNextDescribe } from 'e2e-utils' -import path from 'path' // TODO-APP: fix test as it's failing randomly describe.skip('app-dir back button download bug', () => { createNextDescribe( 'app-dir back button download bug', { - files: path.join(__dirname, 'back-button-download-bug'), + files: __dirname, skipDeployment: true, }, ({ next }) => { diff --git a/test/e2e/app-dir/create-root-layout.test.ts b/test/e2e/app-dir/create-root-layout/create-root-layout.test.ts similarity index 90% rename from test/e2e/app-dir/create-root-layout.test.ts rename to test/e2e/app-dir/create-root-layout/create-root-layout.test.ts index fc52582fe81efd0..fb8766c5379ac48 100644 --- a/test/e2e/app-dir/create-root-layout.test.ts +++ b/test/e2e/app-dir/create-root-layout/create-root-layout.test.ts @@ -19,9 +19,9 @@ describe('app-dir create root layout', () => { beforeAll(async () => { next = await createNext({ files: { - app: new FileRef(path.join(__dirname, 'create-root-layout/app')), + app: new FileRef(path.join(__dirname, 'app')), 'next.config.js': new FileRef( - path.join(__dirname, 'create-root-layout/next.config.js') + path.join(__dirname, 'next.config.js') ), }, dependencies: { @@ -79,11 +79,9 @@ describe('app-dir create root layout', () => { beforeAll(async () => { next = await createNext({ files: { - app: new FileRef( - path.join(__dirname, 'create-root-layout/app-group-layout') - ), + app: new FileRef(path.join(__dirname, 'app-group-layout')), 'next.config.js': new FileRef( - path.join(__dirname, 'create-root-layout/next.config.js') + path.join(__dirname, 'next.config.js') ), }, dependencies: { @@ -143,14 +141,9 @@ describe('app-dir create root layout', () => { beforeAll(async () => { next = await createNext({ files: { - app: new FileRef( - path.join( - __dirname, - 'create-root-layout/app-find-available-dir' - ) - ), + app: new FileRef(path.join(__dirname, 'app-find-available-dir')), 'next.config.js': new FileRef( - path.join(__dirname, 'create-root-layout/next.config.js') + path.join(__dirname, 'next.config.js') ), }, dependencies: { @@ -212,10 +205,10 @@ describe('app-dir create root layout', () => { next = await createNext({ files: { 'app/page.tsx': new FileRef( - path.join(__dirname, 'create-root-layout/app/route/page.js') + path.join(__dirname, 'app/route/page.js') ), 'next.config.js': new FileRef( - path.join(__dirname, 'create-root-layout/next.config.js') + path.join(__dirname, 'next.config.js') ), }, }) @@ -275,10 +268,10 @@ describe('app-dir create root layout', () => { skipStart: true, files: { 'app/page.js': new FileRef( - path.join(__dirname, 'create-root-layout/app/route/page.js') + path.join(__dirname, 'app/route/page.js') ), 'next.config.js': new FileRef( - path.join(__dirname, 'create-root-layout/next.config.js') + path.join(__dirname, 'next.config.js') ), }, dependencies: { diff --git a/test/e2e/app-dir/dynamic-href.test.ts b/test/e2e/app-dir/dynamic-href/dynamic-href.test.ts similarity index 96% rename from test/e2e/app-dir/dynamic-href.test.ts rename to test/e2e/app-dir/dynamic-href/dynamic-href.test.ts index 5f4ee257bfe166a..21d295758f7f555 100644 --- a/test/e2e/app-dir/dynamic-href.test.ts +++ b/test/e2e/app-dir/dynamic-href/dynamic-href.test.ts @@ -1,11 +1,10 @@ import { createNextDescribe } from 'e2e-utils' import { getRedboxDescription, hasRedbox } from 'next-test-utils' -import path from 'path' createNextDescribe( 'dynamic-href', { - files: path.join(__dirname, 'dynamic-href'), + files: __dirname, skipDeployment: true, }, ({ isNextDev: isDev, next }) => { diff --git a/test/e2e/app-dir/global-error.test.ts b/test/e2e/app-dir/global-error/global-error.test.ts similarity index 91% rename from test/e2e/app-dir/global-error.test.ts rename to test/e2e/app-dir/global-error/global-error.test.ts index f6bb42219d3d8c1..588b67ffa74240f 100644 --- a/test/e2e/app-dir/global-error.test.ts +++ b/test/e2e/app-dir/global-error/global-error.test.ts @@ -1,11 +1,10 @@ -import path from 'path' import { getRedboxHeader, hasRedbox } from 'next-test-utils' import { createNextDescribe } from 'e2e-utils' createNextDescribe( 'app dir - global error', { - files: path.join(__dirname, './global-error'), + files: __dirname, }, ({ next, isNextDev }) => { it('should trigger error component when an error happens during rendering', async () => { diff --git a/test/e2e/app-dir/head.test.ts b/test/e2e/app-dir/head/head.test.ts similarity index 99% rename from test/e2e/app-dir/head.test.ts rename to test/e2e/app-dir/head/head.test.ts index 98790a49d73ea07..0dc7af80755ae83 100644 --- a/test/e2e/app-dir/head.test.ts +++ b/test/e2e/app-dir/head/head.test.ts @@ -6,7 +6,7 @@ import escapeStringRegexp from 'escape-string-regexp' createNextDescribe( 'app dir head', { - files: path.join(__dirname, 'head'), + files: __dirname, skipDeployment: true, }, ({ next }) => { diff --git a/test/e2e/app-dir/import.test.ts b/test/e2e/app-dir/import/import.test.ts similarity index 84% rename from test/e2e/app-dir/import.test.ts rename to test/e2e/app-dir/import/import.test.ts index 93ca23ce6fc21ef..24743f773f626c4 100644 --- a/test/e2e/app-dir/import.test.ts +++ b/test/e2e/app-dir/import/import.test.ts @@ -1,10 +1,9 @@ -import path from 'path' import { createNextDescribe } from 'e2e-utils' createNextDescribe( 'app dir imports', { - files: path.join(__dirname, 'import'), + files: __dirname, }, ({ next }) => { ;['js', 'jsx', 'ts', 'tsx'].forEach((ext) => { diff --git a/test/e2e/app-dir/layout-params.test.ts b/test/e2e/app-dir/layout-params/layout-params.test.ts similarity index 96% rename from test/e2e/app-dir/layout-params.test.ts rename to test/e2e/app-dir/layout-params/layout-params.test.ts index 9fc9f2f6b68be85..84361283db5f49b 100644 --- a/test/e2e/app-dir/layout-params.test.ts +++ b/test/e2e/app-dir/layout-params/layout-params.test.ts @@ -1,10 +1,9 @@ -import path from 'path' import { createNextDescribe } from 'e2e-utils' createNextDescribe( 'app dir - layout params', { - files: path.join(__dirname, './layout-params'), + files: __dirname, }, ({ next }) => { describe('basic params', () => { diff --git a/test/e2e/app-dir/next-font.test.ts b/test/e2e/app-dir/next-font/next-font.test.ts similarity index 99% rename from test/e2e/app-dir/next-font.test.ts rename to test/e2e/app-dir/next-font/next-font.test.ts index c4b0905762be919..173787d98ef32fb 100644 --- a/test/e2e/app-dir/next-font.test.ts +++ b/test/e2e/app-dir/next-font/next-font.test.ts @@ -1,11 +1,10 @@ import { createNextDescribe } from 'e2e-utils' import { getRedboxSource, hasRedbox } from 'next-test-utils' -import path from 'path' createNextDescribe( 'app dir next-font', { - files: path.join(__dirname, 'next-font'), + files: __dirname, dependencies: { '@next/font': 'canary', react: 'latest', diff --git a/test/e2e/app-dir/next-image.test.ts b/test/e2e/app-dir/next-image/next-image.test.ts similarity index 99% rename from test/e2e/app-dir/next-image.test.ts rename to test/e2e/app-dir/next-image/next-image.test.ts index b3ebd437229eeef..9ae18305379bb6f 100644 --- a/test/e2e/app-dir/next-image.test.ts +++ b/test/e2e/app-dir/next-image/next-image.test.ts @@ -1,10 +1,9 @@ import { createNextDescribe } from 'e2e-utils' -import path from 'path' createNextDescribe( 'app dir next-image', { - files: path.join(__dirname, 'next-image'), + files: __dirname, skipDeployment: true, }, ({ next }) => { diff --git a/test/e2e/app-dir/root-layout.test.ts b/test/e2e/app-dir/root-layout/root-layout.test.ts similarity index 99% rename from test/e2e/app-dir/root-layout.test.ts rename to test/e2e/app-dir/root-layout/root-layout.test.ts index b284e9dad5d16a0..a18dd53bec3c63c 100644 --- a/test/e2e/app-dir/root-layout.test.ts +++ b/test/e2e/app-dir/root-layout/root-layout.test.ts @@ -1,11 +1,10 @@ -import path from 'path' import { createNextDescribe } from 'e2e-utils' import { getRedboxSource, hasRedbox } from 'next-test-utils' createNextDescribe( 'app-dir root layout', { - files: path.join(__dirname, 'root-layout'), + files: __dirname, skipDeployment: true, }, ({ next, isNextDev: isDev }) => { diff --git a/test/e2e/app-dir/rsc-basic.test.ts b/test/e2e/app-dir/rsc-basic/rsc-basic.test.ts similarity index 99% rename from test/e2e/app-dir/rsc-basic.test.ts rename to test/e2e/app-dir/rsc-basic/rsc-basic.test.ts index f0b1087769de5be..fe1e7197b3e5185 100644 --- a/test/e2e/app-dir/rsc-basic.test.ts +++ b/test/e2e/app-dir/rsc-basic/rsc-basic.test.ts @@ -1,7 +1,7 @@ import path from 'path' import fs from 'fs-extra' import { check } from 'next-test-utils' -import { createNext, FileRef } from 'e2e-utils' +import { createNext } from 'e2e-utils' import { NextInstance } from 'test/lib/next-modes/base' import cheerio from 'cheerio' @@ -30,7 +30,7 @@ describe('app dir - rsc basics', () => { beforeAll(async () => { next = await createNext({ - files: new FileRef(path.join(__dirname, './rsc-basic')), + files: __dirname, dependencies: { 'styled-components': '6.0.0-beta.5', react: 'latest', diff --git a/test/e2e/app-dir/rsc-errors.test.ts b/test/e2e/app-dir/rsc-errors/rsc-errors.test.ts similarity index 97% rename from test/e2e/app-dir/rsc-errors.test.ts rename to test/e2e/app-dir/rsc-errors/rsc-errors.test.ts index 3c049babb795f9e..a12eae8af62d122 100644 --- a/test/e2e/app-dir/rsc-errors.test.ts +++ b/test/e2e/app-dir/rsc-errors/rsc-errors.test.ts @@ -1,4 +1,3 @@ -import path from 'path' import { check } from 'next-test-utils' import { createNextDescribe } from 'e2e-utils' @@ -8,7 +7,7 @@ if (!(globalThis as any).isNextDev) { createNextDescribe( 'app dir - rsc errors', { - files: path.join(__dirname, './rsc-errors'), + files: __dirname, skipDeployment: true, }, ({ next }) => { diff --git a/test/e2e/app-dir/trailingslash.test.ts b/test/e2e/app-dir/trailingslash/trailingslash.test.ts similarity index 94% rename from test/e2e/app-dir/trailingslash.test.ts rename to test/e2e/app-dir/trailingslash/trailingslash.test.ts index c614928e7a10035..d618e3e65d7309a 100644 --- a/test/e2e/app-dir/trailingslash.test.ts +++ b/test/e2e/app-dir/trailingslash/trailingslash.test.ts @@ -1,10 +1,9 @@ import { createNextDescribe } from 'e2e-utils' -import path from 'path' createNextDescribe( 'app-dir trailingSlash handling', { - files: path.join(__dirname, 'trailingslash'), + files: __dirname, skipDeployment: true, }, ({ next }) => { diff --git a/test/e2e/app-dir/with-babel.test.ts b/test/e2e/app-dir/with-babel/with-babel.test.ts similarity index 80% rename from test/e2e/app-dir/with-babel.test.ts rename to test/e2e/app-dir/with-babel/with-babel.test.ts index 7b8fad5a704f24f..84dd663fe5514c9 100644 --- a/test/e2e/app-dir/with-babel.test.ts +++ b/test/e2e/app-dir/with-babel/with-babel.test.ts @@ -1,10 +1,9 @@ import { createNextDescribe } from 'e2e-utils' -import path from 'path' createNextDescribe( 'with babel', { - files: path.join(__dirname, 'with-babel'), + files: __dirname, skipDeployment: true, }, ({ next }) => {