From 7dc71ed9a84985f0b4664b083c797b78a25d6ca2 Mon Sep 17 00:00:00 2001 From: Jan Kaifer Date: Tue, 20 Dec 2022 11:07:43 +0100 Subject: [PATCH 1/4] moved test files --- test/e2e/app-dir/{ => app-alias}/app-alias.test.ts | 2 +- .../e2e/app-dir/{ => app-edge-global}/app-edge-global.test.ts | 3 +-- test/e2e/app-dir/{ => app-edge}/app-edge.test.ts | 3 +-- test/e2e/app-dir/{ => app-external}/app-external.test.ts | 3 +-- test/e2e/app-dir/{ => app-middleware}/app-middleware.test.ts | 2 +- test/e2e/app-dir/{ => app-prefetch}/prefetching.test.ts | 0 test/e2e/app-dir/{ => app-rendering}/rendering.test.ts | 0 test/e2e/app-dir/{ => app-static}/app-static.test.ts | 4 ++-- test/e2e/app-dir/{ => app}/index.test.ts | 0 test/e2e/app-dir/{ => app}/standalone.test.ts | 0 test/e2e/app-dir/{ => app}/vercel-analytics.test.ts | 0 test/e2e/app-dir/{ => asset-prefix}/asset-prefix.test.ts | 3 +-- .../async-component-preload.test.ts | 0 .../back-button-download-bug.test.ts | 0 .../{ => create-root-layout}/create-root-layout.test.ts | 0 test/e2e/app-dir/{ => dynamic-href}/dynamic-href.test.ts | 0 test/e2e/app-dir/{ => global-error}/global-error.test.ts | 0 test/e2e/app-dir/{ => head}/head.test.ts | 0 test/e2e/app-dir/{ => import}/import.test.ts | 0 test/e2e/app-dir/{ => layout-params}/layout-params.test.ts | 0 test/e2e/app-dir/{ => next-font}/next-font.test.ts | 0 test/e2e/app-dir/{ => next-image}/next-image.test.ts | 0 test/e2e/app-dir/{ => root-layout}/root-layout.test.ts | 0 test/e2e/app-dir/{ => rsc-basic}/rsc-basic.test.ts | 0 test/e2e/app-dir/{ => rsc-errors}/rsc-errors.test.ts | 0 test/e2e/app-dir/{ => trailingslash}/trailingslash.test.ts | 0 test/e2e/app-dir/{ => with-babel}/with-babel.test.ts | 0 27 files changed, 8 insertions(+), 12 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 (98%) rename test/e2e/app-dir/{ => app-prefetch}/prefetching.test.ts (100%) rename test/e2e/app-dir/{ => app-rendering}/rendering.test.ts (100%) rename test/e2e/app-dir/{ => app-static}/app-static.test.ts (99%) rename test/e2e/app-dir/{ => app}/index.test.ts (100%) rename test/e2e/app-dir/{ => app}/standalone.test.ts (100%) rename test/e2e/app-dir/{ => app}/vercel-analytics.test.ts (100%) 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 (100%) rename test/e2e/app-dir/{ => back-button-download-bug}/back-button-download-bug.test.ts (100%) rename test/e2e/app-dir/{ => create-root-layout}/create-root-layout.test.ts (100%) rename test/e2e/app-dir/{ => dynamic-href}/dynamic-href.test.ts (100%) rename test/e2e/app-dir/{ => global-error}/global-error.test.ts (100%) rename test/e2e/app-dir/{ => head}/head.test.ts (100%) rename test/e2e/app-dir/{ => import}/import.test.ts (100%) rename test/e2e/app-dir/{ => layout-params}/layout-params.test.ts (100%) rename test/e2e/app-dir/{ => next-font}/next-font.test.ts (100%) rename test/e2e/app-dir/{ => next-image}/next-image.test.ts (100%) rename test/e2e/app-dir/{ => root-layout}/root-layout.test.ts (100%) rename test/e2e/app-dir/{ => rsc-basic}/rsc-basic.test.ts (100%) rename test/e2e/app-dir/{ => rsc-errors}/rsc-errors.test.ts (100%) rename test/e2e/app-dir/{ => trailingslash}/trailingslash.test.ts (100%) rename test/e2e/app-dir/{ => with-babel}/with-babel.test.ts (100%) 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 98% rename from test/e2e/app-dir/app-middleware.test.ts rename to test/e2e/app-dir/app-middleware/app-middleware.test.ts index 06426f56e0b680e..25c4b3633b95daf 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 }) => { diff --git a/test/e2e/app-dir/prefetching.test.ts b/test/e2e/app-dir/app-prefetch/prefetching.test.ts similarity index 100% rename from test/e2e/app-dir/prefetching.test.ts rename to test/e2e/app-dir/app-prefetch/prefetching.test.ts diff --git a/test/e2e/app-dir/rendering.test.ts b/test/e2e/app-dir/app-rendering/rendering.test.ts similarity index 100% rename from test/e2e/app-dir/rendering.test.ts rename to test/e2e/app-dir/app-rendering/rendering.test.ts 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 100% rename from test/e2e/app-dir/index.test.ts rename to test/e2e/app-dir/app/index.test.ts diff --git a/test/e2e/app-dir/standalone.test.ts b/test/e2e/app-dir/app/standalone.test.ts similarity index 100% rename from test/e2e/app-dir/standalone.test.ts rename to test/e2e/app-dir/app/standalone.test.ts diff --git a/test/e2e/app-dir/vercel-analytics.test.ts b/test/e2e/app-dir/app/vercel-analytics.test.ts similarity index 100% rename from test/e2e/app-dir/vercel-analytics.test.ts rename to test/e2e/app-dir/app/vercel-analytics.test.ts 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 100% 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 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 100% 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 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 100% 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 diff --git a/test/e2e/app-dir/dynamic-href.test.ts b/test/e2e/app-dir/dynamic-href/dynamic-href.test.ts similarity index 100% rename from test/e2e/app-dir/dynamic-href.test.ts rename to test/e2e/app-dir/dynamic-href/dynamic-href.test.ts diff --git a/test/e2e/app-dir/global-error.test.ts b/test/e2e/app-dir/global-error/global-error.test.ts similarity index 100% rename from test/e2e/app-dir/global-error.test.ts rename to test/e2e/app-dir/global-error/global-error.test.ts diff --git a/test/e2e/app-dir/head.test.ts b/test/e2e/app-dir/head/head.test.ts similarity index 100% rename from test/e2e/app-dir/head.test.ts rename to test/e2e/app-dir/head/head.test.ts diff --git a/test/e2e/app-dir/import.test.ts b/test/e2e/app-dir/import/import.test.ts similarity index 100% rename from test/e2e/app-dir/import.test.ts rename to test/e2e/app-dir/import/import.test.ts diff --git a/test/e2e/app-dir/layout-params.test.ts b/test/e2e/app-dir/layout-params/layout-params.test.ts similarity index 100% rename from test/e2e/app-dir/layout-params.test.ts rename to test/e2e/app-dir/layout-params/layout-params.test.ts diff --git a/test/e2e/app-dir/next-font.test.ts b/test/e2e/app-dir/next-font/next-font.test.ts similarity index 100% rename from test/e2e/app-dir/next-font.test.ts rename to test/e2e/app-dir/next-font/next-font.test.ts diff --git a/test/e2e/app-dir/next-image.test.ts b/test/e2e/app-dir/next-image/next-image.test.ts similarity index 100% rename from test/e2e/app-dir/next-image.test.ts rename to test/e2e/app-dir/next-image/next-image.test.ts diff --git a/test/e2e/app-dir/root-layout.test.ts b/test/e2e/app-dir/root-layout/root-layout.test.ts similarity index 100% rename from test/e2e/app-dir/root-layout.test.ts rename to test/e2e/app-dir/root-layout/root-layout.test.ts diff --git a/test/e2e/app-dir/rsc-basic.test.ts b/test/e2e/app-dir/rsc-basic/rsc-basic.test.ts similarity index 100% rename from test/e2e/app-dir/rsc-basic.test.ts rename to test/e2e/app-dir/rsc-basic/rsc-basic.test.ts diff --git a/test/e2e/app-dir/rsc-errors.test.ts b/test/e2e/app-dir/rsc-errors/rsc-errors.test.ts similarity index 100% rename from test/e2e/app-dir/rsc-errors.test.ts rename to test/e2e/app-dir/rsc-errors/rsc-errors.test.ts diff --git a/test/e2e/app-dir/trailingslash.test.ts b/test/e2e/app-dir/trailingslash/trailingslash.test.ts similarity index 100% rename from test/e2e/app-dir/trailingslash.test.ts rename to test/e2e/app-dir/trailingslash/trailingslash.test.ts diff --git a/test/e2e/app-dir/with-babel.test.ts b/test/e2e/app-dir/with-babel/with-babel.test.ts similarity index 100% rename from test/e2e/app-dir/with-babel.test.ts rename to test/e2e/app-dir/with-babel/with-babel.test.ts From f47bfed8e2cdb5052af9bc96f69d101d016ec450 Mon Sep 17 00:00:00 2001 From: Jan Kaifer Date: Tue, 20 Dec 2022 11:16:09 +0100 Subject: [PATCH 2/4] update test configs --- .../app-middleware/app-middleware.test.ts | 8 ++-- .../app-dir/app-prefetch/prefetching.test.ts | 3 +- .../app-dir/app-rendering/rendering.test.ts | 3 +- test/e2e/app-dir/app/index.test.ts | 3 +- test/e2e/app-dir/app/standalone.test.ts | 4 +- test/e2e/app-dir/app/vercel-analytics.test.ts | 5 +-- .../async-component-preload.test.ts | 3 +- .../back-button-download-bug.test.ts | 3 +- .../create-root-layout.test.ts | 41 +++++-------------- .../app-dir/dynamic-href/dynamic-href.test.ts | 3 +- .../app-dir/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 +- test/e2e/app-dir/next-font/next-font.test.ts | 3 +- .../e2e/app-dir/next-image/next-image.test.ts | 3 +- .../app-dir/root-layout/root-layout.test.ts | 3 +- test/e2e/app-dir/rsc-basic/rsc-basic.test.ts | 4 +- .../e2e/app-dir/rsc-errors/rsc-errors.test.ts | 3 +- .../trailingslash/trailingslash.test.ts | 3 +- .../e2e/app-dir/with-babel/with-babel.test.ts | 3 +- 21 files changed, 35 insertions(+), 74 deletions(-) diff --git a/test/e2e/app-dir/app-middleware/app-middleware.test.ts b/test/e2e/app-dir/app-middleware/app-middleware.test.ts index 25c4b3633b95daf..318d2c16a7167b6 100644 --- a/test/e2e/app-dir/app-middleware/app-middleware.test.ts +++ b/test/e2e/app-dir/app-middleware/app-middleware.test.ts @@ -1,5 +1,5 @@ /* eslint-env jest */ -import { createNextDescribe, FileRef } from 'e2e-utils' +import { createNextDescribe } from 'e2e-utils' import cheerio from 'cheerio' import path from 'path' @@ -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: path.join(__dirname, 'app'), + 'next.config.js': path.join(__dirname, 'next.config.js'), 'middleware.js': ` import { NextResponse } from 'next/server' diff --git a/test/e2e/app-dir/app-prefetch/prefetching.test.ts b/test/e2e/app-dir/app-prefetch/prefetching.test.ts index eb9cc2412fff17d..105b835ec77d0f6 100644 --- a/test/e2e/app-dir/app-prefetch/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/app-rendering/rendering.test.ts b/test/e2e/app-dir/app-rendering/rendering.test.ts index 8906eecd4a1b70d..ed5e55e34fb2b4a 100644 --- a/test/e2e/app-dir/app-rendering/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/index.test.ts b/test/e2e/app-dir/app/index.test.ts index bc5174abe0903f7..3b7c822b4432e88 100644 --- a/test/e2e/app-dir/app/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/app/standalone.test.ts b/test/e2e/app-dir/app/standalone.test.ts index 06a3d05904b8588..5f2052a43552165 100644 --- a/test/e2e/app-dir/app/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/app/vercel-analytics.test.ts b/test/e2e/app-dir/app/vercel-analytics.test.ts index 4ebf93e7bbaa1f1..a92d077e1696e78 100644 --- a/test/e2e/app-dir/app/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/async-component-preload/async-component-preload.test.ts b/test/e2e/app-dir/async-component-preload/async-component-preload.test.ts index 5531acc67d32f0d..8209c460d8fb86c 100644 --- a/test/e2e/app-dir/async-component-preload/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/back-button-download-bug.test.ts b/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/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/create-root-layout.test.ts b/test/e2e/app-dir/create-root-layout/create-root-layout.test.ts index fc52582fe81efd0..59d5458fa3980e9 100644 --- a/test/e2e/app-dir/create-root-layout/create-root-layout.test.ts +++ b/test/e2e/app-dir/create-root-layout/create-root-layout.test.ts @@ -19,10 +19,8 @@ describe('app-dir create root layout', () => { beforeAll(async () => { next = await createNext({ files: { - app: new FileRef(path.join(__dirname, 'create-root-layout/app')), - 'next.config.js': new FileRef( - path.join(__dirname, 'create-root-layout/next.config.js') - ), + app: path.join(__dirname, 'app'), + 'next.config.js': path.join(__dirname, 'next.config.js'), }, dependencies: { react: 'latest', @@ -79,12 +77,8 @@ describe('app-dir create root layout', () => { beforeAll(async () => { next = await createNext({ files: { - app: new FileRef( - path.join(__dirname, 'create-root-layout/app-group-layout') - ), - 'next.config.js': new FileRef( - path.join(__dirname, 'create-root-layout/next.config.js') - ), + app: path.join(__dirname, 'app-group-layout'), + 'next.config.js': path.join(__dirname, 'next.config.js'), }, dependencies: { react: 'latest', @@ -143,15 +137,8 @@ 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' - ) - ), - 'next.config.js': new FileRef( - path.join(__dirname, 'create-root-layout/next.config.js') - ), + app: path.join(__dirname, 'app-find-available-dir'), + 'next.config.js': path.join(__dirname, 'next.config.js'), }, dependencies: { react: 'latest', @@ -211,12 +198,8 @@ describe('app-dir create root layout', () => { beforeAll(async () => { next = await createNext({ files: { - 'app/page.tsx': new FileRef( - path.join(__dirname, 'create-root-layout/app/route/page.js') - ), - 'next.config.js': new FileRef( - path.join(__dirname, 'create-root-layout/next.config.js') - ), + 'app/page.tsx': path.join(__dirname, 'app/route/page.js'), + 'next.config.js': path.join(__dirname, 'next.config.js'), }, }) }) @@ -274,12 +257,8 @@ describe('app-dir create root layout', () => { const next = await createNext({ skipStart: true, files: { - 'app/page.js': new FileRef( - path.join(__dirname, 'create-root-layout/app/route/page.js') - ), - 'next.config.js': new FileRef( - path.join(__dirname, 'create-root-layout/next.config.js') - ), + 'app/page.js': path.join(__dirname, 'app/route/page.js'), + 'next.config.js': path.join(__dirname, 'next.config.js'), }, dependencies: { react: 'latest', diff --git a/test/e2e/app-dir/dynamic-href/dynamic-href.test.ts b/test/e2e/app-dir/dynamic-href/dynamic-href.test.ts index 5f4ee257bfe166a..21d295758f7f555 100644 --- a/test/e2e/app-dir/dynamic-href/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/global-error.test.ts b/test/e2e/app-dir/global-error/global-error.test.ts index f6bb42219d3d8c1..588b67ffa74240f 100644 --- a/test/e2e/app-dir/global-error/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/head.test.ts b/test/e2e/app-dir/head/head.test.ts index 98790a49d73ea07..0dc7af80755ae83 100644 --- a/test/e2e/app-dir/head/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/import.test.ts b/test/e2e/app-dir/import/import.test.ts index 93ca23ce6fc21ef..24743f773f626c4 100644 --- a/test/e2e/app-dir/import/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/layout-params.test.ts b/test/e2e/app-dir/layout-params/layout-params.test.ts index 9fc9f2f6b68be85..84361283db5f49b 100644 --- a/test/e2e/app-dir/layout-params/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/next-font.test.ts b/test/e2e/app-dir/next-font/next-font.test.ts index c4b0905762be919..173787d98ef32fb 100644 --- a/test/e2e/app-dir/next-font/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/next-image.test.ts b/test/e2e/app-dir/next-image/next-image.test.ts index b3ebd437229eeef..9ae18305379bb6f 100644 --- a/test/e2e/app-dir/next-image/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/root-layout.test.ts b/test/e2e/app-dir/root-layout/root-layout.test.ts index b284e9dad5d16a0..a18dd53bec3c63c 100644 --- a/test/e2e/app-dir/root-layout/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/rsc-basic.test.ts b/test/e2e/app-dir/rsc-basic/rsc-basic.test.ts index f0b1087769de5be..fe1e7197b3e5185 100644 --- a/test/e2e/app-dir/rsc-basic/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/rsc-errors.test.ts b/test/e2e/app-dir/rsc-errors/rsc-errors.test.ts index 3c049babb795f9e..a12eae8af62d122 100644 --- a/test/e2e/app-dir/rsc-errors/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/trailingslash.test.ts b/test/e2e/app-dir/trailingslash/trailingslash.test.ts index c614928e7a10035..d618e3e65d7309a 100644 --- a/test/e2e/app-dir/trailingslash/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/with-babel.test.ts b/test/e2e/app-dir/with-babel/with-babel.test.ts index 7b8fad5a704f24f..84dd663fe5514c9 100644 --- a/test/e2e/app-dir/with-babel/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 }) => { From b5999bb4decdbcf4ad78cbe1da01cf7c25a15b74 Mon Sep 17 00:00:00 2001 From: Jan Kaifer Date: Tue, 20 Dec 2022 11:41:30 +0100 Subject: [PATCH 3/4] Fix linter issues --- test/e2e/app-dir/create-root-layout/create-root-layout.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/app-dir/create-root-layout/create-root-layout.test.ts b/test/e2e/app-dir/create-root-layout/create-root-layout.test.ts index 59d5458fa3980e9..bc774fa7e618c78 100644 --- a/test/e2e/app-dir/create-root-layout/create-root-layout.test.ts +++ b/test/e2e/app-dir/create-root-layout/create-root-layout.test.ts @@ -1,5 +1,5 @@ import path from 'path' -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' From b5ad77d8a5e7be9b4393da11d20a66fc275078c6 Mon Sep 17 00:00:00 2001 From: Jan Kaifer Date: Tue, 20 Dec 2022 11:54:22 +0100 Subject: [PATCH 4/4] Readded FileRef where needed --- .../app-middleware/app-middleware.test.ts | 6 ++-- .../create-root-layout.test.ts | 36 +++++++++++++------ 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/test/e2e/app-dir/app-middleware/app-middleware.test.ts b/test/e2e/app-dir/app-middleware/app-middleware.test.ts index 318d2c16a7167b6..d976cabed00326f 100644 --- a/test/e2e/app-dir/app-middleware/app-middleware.test.ts +++ b/test/e2e/app-dir/app-middleware/app-middleware.test.ts @@ -1,5 +1,5 @@ /* eslint-env jest */ -import { createNextDescribe } from 'e2e-utils' +import { createNextDescribe, FileRef } from 'e2e-utils' import cheerio from 'cheerio' import path from 'path' @@ -121,8 +121,8 @@ createNextDescribe( 'app dir middleware without pages dir', { files: { - app: path.join(__dirname, 'app'), - 'next.config.js': path.join(__dirname, '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/create-root-layout/create-root-layout.test.ts b/test/e2e/app-dir/create-root-layout/create-root-layout.test.ts index bc774fa7e618c78..fb8766c5379ac48 100644 --- a/test/e2e/app-dir/create-root-layout/create-root-layout.test.ts +++ b/test/e2e/app-dir/create-root-layout/create-root-layout.test.ts @@ -1,5 +1,5 @@ import path from 'path' -import { createNext } from 'e2e-utils' +import { createNext, FileRef } from 'e2e-utils' import { NextInstance } from 'test/lib/next-modes/base' import { check } from 'next-test-utils' @@ -19,8 +19,10 @@ describe('app-dir create root layout', () => { beforeAll(async () => { next = await createNext({ files: { - app: path.join(__dirname, 'app'), - 'next.config.js': path.join(__dirname, 'next.config.js'), + app: new FileRef(path.join(__dirname, 'app')), + 'next.config.js': new FileRef( + path.join(__dirname, 'next.config.js') + ), }, dependencies: { react: 'latest', @@ -77,8 +79,10 @@ describe('app-dir create root layout', () => { beforeAll(async () => { next = await createNext({ files: { - app: path.join(__dirname, 'app-group-layout'), - 'next.config.js': path.join(__dirname, 'next.config.js'), + app: new FileRef(path.join(__dirname, 'app-group-layout')), + 'next.config.js': new FileRef( + path.join(__dirname, 'next.config.js') + ), }, dependencies: { react: 'latest', @@ -137,8 +141,10 @@ describe('app-dir create root layout', () => { beforeAll(async () => { next = await createNext({ files: { - app: path.join(__dirname, 'app-find-available-dir'), - 'next.config.js': path.join(__dirname, 'next.config.js'), + app: new FileRef(path.join(__dirname, 'app-find-available-dir')), + 'next.config.js': new FileRef( + path.join(__dirname, 'next.config.js') + ), }, dependencies: { react: 'latest', @@ -198,8 +204,12 @@ describe('app-dir create root layout', () => { beforeAll(async () => { next = await createNext({ files: { - 'app/page.tsx': path.join(__dirname, 'app/route/page.js'), - 'next.config.js': path.join(__dirname, 'next.config.js'), + 'app/page.tsx': new FileRef( + path.join(__dirname, 'app/route/page.js') + ), + 'next.config.js': new FileRef( + path.join(__dirname, 'next.config.js') + ), }, }) }) @@ -257,8 +267,12 @@ describe('app-dir create root layout', () => { const next = await createNext({ skipStart: true, files: { - 'app/page.js': path.join(__dirname, 'app/route/page.js'), - 'next.config.js': path.join(__dirname, 'next.config.js'), + 'app/page.js': new FileRef( + path.join(__dirname, 'app/route/page.js') + ), + 'next.config.js': new FileRef( + path.join(__dirname, 'next.config.js') + ), }, dependencies: { react: 'latest',