Run CNA tests with Next.js from branch

vercel · May 16, 2024 · fdde722 · fdde722
1 parent aafa682
commit fdde722
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/test/integration/create-next-app/package-manager/npm.test.ts b/test/integration/create-next-app/package-manager/npm.test.ts
@@ -1,14 +1,24 @@
+import { trace } from 'next/dist/trace'
 import {
   DEFAULT_FILES,
   FULL_EXAMPLE_PATH,
   projectFilesShouldExist,
   run,
   useTempDir,
 } from '../utils'
+import { createNextInstall } from '../../../lib/create-next-install'
 
 const lockFile = 'package-lock.json'
 const files = [...DEFAULT_FILES, lockFile]
 
+let nextInstall: Awaited<ReturnType<typeof createNextInstall>>
+beforeAll(async () => {
+  nextInstall = await createNextInstall({
+    parentSpan: trace('test'),
+    keepRepoDir: Boolean(process.env.NEXT_TEST_SKIP_CLEANUP),
+  })
+})
+
 describe('create-next-app with package manager npm', () => {
   it('should use npm for --use-npm flag', async () => {
     await useTempDir(async (cwd) => {
@@ -24,6 +34,7 @@ describe('create-next-app with package manager npm', () => {
           '--no-tailwind',
           '--no-import-alias',
         ],
+        nextInstall.installDir,
         {
           cwd,
         }
@@ -52,6 +63,7 @@ it('should use npm when user-agent is npm', async () => {
         '--no-tailwind',
         '--no-import-alias',
       ],
+      nextInstall.installDir,
       {
         cwd,
         env: { npm_config_user_agent: 'npm' },
@@ -72,6 +84,7 @@ it('should use npm for --use-npm flag with example', async () => {
     const projectName = 'use-npm-with-example'
     const res = await run(
       [projectName, '--use-npm', '--example', FULL_EXAMPLE_PATH],
+      nextInstall.installDir,
       { cwd }
     )
 
@@ -87,10 +100,14 @@ it('should use npm for --use-npm flag with example', async () => {
 it('should use npm when user-agent is npm with example', async () => {
   await useTempDir(async (cwd) => {
     const projectName = 'user-agent-npm-with-example'
-    const res = await run([projectName, '--example', FULL_EXAMPLE_PATH], {
-      cwd,
-      env: { npm_config_user_agent: 'npm' },
-    })
+    const res = await run(
+      [projectName, '--example', FULL_EXAMPLE_PATH],
+      nextInstall.installDir,
+      {
+        cwd,
+        env: { npm_config_user_agent: 'npm' },
+      }
+    )
 
     expect(res.exitCode).toBe(0)
     projectFilesShouldExist({

diff --git a/test/integration/create-next-app/utils.ts b/test/integration/create-next-app/utils.ts
@@ -14,25 +14,27 @@ export const DEFAULT_FILES = [
   'node_modules/next',
 ]
 
-export const run = (
+export const run = async (
   args: string[],
+  nextJSVersion: string,
   options:
     | execa.Options
     | {
         reject?: boolean
         env?: Record<string, string>
       }
-) =>
-  execa('node', [CNA_PATH].concat(args), {
+) => {
+  return execa('node', [CNA_PATH].concat(args), {
     // tests with options.reject false are expected to exit(1) so don't inherit
     stdio: options.reject === false ? 'pipe' : 'inherit',
     ...options,
     env: {
       ...process.env,
       ...options.env,
-      NEXT_PRIVATE_TEST_VERSION: 'canary',
+      NEXT_PRIVATE_TEST_VERSION: nextJSVersion,
     },
   })
+}
 
 export const command = (cmd: string, args: string[]) =>
   execa(cmd, args, {