Add name from createNextDescribe to test directory

vercel · May 28, 2023 · 84839cf · 84839cf
1 parent eabffc1
commit 84839cf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/test/lib/create-next-install.js b/test/lib/create-next-install.js
@@ -8,6 +8,7 @@ const { linkPackages } =
   require('../../.github/actions/next-stats-action/src/prepare/repo-setup')()
 
 async function createNextInstall({
+  name = '',
   parentSpan = null,
   dependencies = null,
   installCommand = null,
@@ -23,7 +24,9 @@ async function createNextInstall({
       const origRepoDir = path.join(__dirname, '../../')
       const installDir = path.join(
         tmpDir,
-        `next-install-${randomBytes(32).toString('hex')}${dirSuffix}`
+        `next-install${
+          name !== '' ? `-${name.toLowerCase().replace(/ /g, '-')}` : ''
+        }-${randomBytes(32).toString('hex')}${dirSuffix}`
       )
       let tmpRepoDir
       require('console').log('Creating next instance in:')
@@ -37,7 +40,9 @@ async function createNextInstall({
       } else {
         tmpRepoDir = path.join(
           tmpDir,
-          `next-repo-${randomBytes(32).toString('hex')}${dirSuffix}`
+          `next-repo${
+            name !== '' ? `-${name.toLowerCase().replace(/ /g, '-')}` : ''
+          }-${randomBytes(32).toString('hex')}${dirSuffix}`
         )
         require('console').log('Creating temp repo dir', tmpRepoDir)
 

diff --git a/test/lib/e2e-utils.ts b/test/lib/e2e-utils.ts
@@ -215,6 +215,7 @@ export function createNextDescribe(
     next: NextInstance
   }) => void
 ): void {
+  options.name = name
   describe(name, () => {
     if (options.skipDeployment) {
       // When the environment is running for deployment tests.

diff --git a/test/lib/next-modes/base.ts b/test/lib/next-modes/base.ts
@@ -23,6 +23,7 @@ export type PackageJson = {
   [key: string]: unknown
 }
 export interface NextInstanceOpts {
+  name?: string
   files: FileRef | string | { [filename: string]: string | FileRef }
   dependencies?: { [name: string]: string }
   packageJson?: PackageJson
@@ -47,6 +48,7 @@ type OmitFirstArgument<F> = F extends (
   : never
 
 export class NextInstance {
+  protected name?: string
   protected files: FileRef | { [filename: string]: string | FileRef }
   protected nextConfig?: NextConfig
   protected installCommand?: InstallCommand
@@ -120,6 +122,7 @@ export class NextInstance {
     skipInstall?: boolean
     parentSpan: Span
   }) {
+    const name = this.name
     if (this.isDestroyed) {
       throw new Error('next instance already destroyed')
     }
@@ -134,9 +137,9 @@ export class NextInstance {
           : process.env.NEXT_TEST_DIR || (await fs.realpath(os.tmpdir()))
         this.testDir = path.join(
           tmpDir,
-          `next-test-${Date.now()}-${(Math.random() * 1000) | 0}${
-            this.dirSuffix
-          }`
+          `next-test${
+            name !== '' ? `-${name.toLowerCase().replace(/ /g, '-')}` : ''
+          }-${Date.now()}-${(Math.random() * 1000) | 0}${this.dirSuffix}`
         )
 
         const reactVersion = process.env.NEXT_TEST_REACT_VERSION || 'latest'
@@ -190,6 +193,7 @@ export class NextInstance {
             await fs.copy(process.env.NEXT_TEST_STARTER, this.testDir)
           } else if (!skipIsolatedNext) {
             this.testDir = await createNextInstall({
+              name: this.name,
               parentSpan: rootSpan,
               dependencies: finalDependencies,
               installCommand: this.installCommand,