test: add isolation test cases to test runner run watch

nodejs · nodejs-github-bot · Oct 3, 2024 · Oct 1, 2024 · Oct 1, 2024 · Oct 1, 2024
commit 18138e974f9f5108d357a693cd07003bed31368a
diff --git a/test/fixtures/test-runner-watch.mjs b/test/fixtures/test-runner-watch.mjs
@@ -6,19 +6,37 @@ const options = {
   file: {
     type: 'string',
   },
+  cwd: {
+    type: 'string',
+  },
+  isolation: {
+    type: 'string',
+  },
 };
 const {
   values,
   positionals,
 } = parseArgs({ args: process.argv.slice(2), options });
 
 let files;
+let cwd;
+let isolation;
 
 if (values.file) {
   files = [values.file];
 }
 
+if (values.cwd) {
+  cwd = values.cwd;
+}
+
+if (values.isolation) {
+  isolation = values.isolation;
+}
+
 run({
   files,
-  watch: true
+  watch: true,
+  ...(cwd ? { cwd } : {}),
+  ...(isolation ? { isolation } : {}),
-  ...(cwd ? { cwd } : {}),
-  ...(isolation ? { isolation } : {}),
+  cwd,
+  isolation,
-  ...(cwd ? { cwd } : {}),
-  ...(isolation ? { isolation } : {}),
+  cwd,
+  isolation,
 }).compose(tap).pipe(process.stdout);
diff --git a/test/parallel/test-runner-run-watch.mjs b/test/parallel/test-runner-run-watch.mjs
@@ -41,11 +41,23 @@ function refresh() {
 
 const runner = join(import.meta.dirname, '..', 'fixtures', 'test-runner-watch.mjs');
 
-async function testWatch({ fileToUpdate, file, action = 'update', cwd = tmpdir.path, fileToCreate }) {
+async function testWatch(
+  {
+    fileToUpdate,
+    file,
+    action = 'update',
+    cwd = tmpdir.path,
+    fileToCreate,
+    runnerCwd,
+    isolation
+  }
+) {
   const ran1 = util.createDeferredPromise();
   const ran2 = util.createDeferredPromise();
   const args = [runner];
   if (file) args.push('--file', file);
+  if (runnerCwd) args.push('--cwd', runnerCwd);
+  if (isolation) args.push('--isolation', isolation);
   const child = spawn(process.execPath,
                       args,
                       { encoding: 'utf8', stdio: 'pipe', cwd });
@@ -221,7 +233,52 @@ describe('test runner watch mode', () => {
     });
   });
 
-  it('should run new tests when a new file is created in the watched directory', async () => {
-    await testWatch({ action: 'create', fileToCreate: 'new-test-file.test.js' });
-  });
+  it(
+    'should run new tests when a new file is created in the watched directory',
+    async () => {
+      await testWatch({ action: 'create', fileToCreate: 'new-test-file.test.js' });
+    });
+
+  it(
+    'should execute run using a different cwd for the runner than the process cwd',
+    async () => {
+      await testWatch(
+        {
+          fileToUpdate: 'test.js',
+          action: 'rename',
+          cwd: import.meta.dirname,
+          runnerCwd: tmpdir.path
+        }
+      );
+    });
+
+  it(
+    'should execute run using a different cwd for the runner than the process cwd with isolation process',
+    async () => {
+      await testWatch(
+        {
+          fileToUpdate: 'test.js',
+          action: 'rename',
+          cwd: import.meta.dirname,
+          runnerCwd: tmpdir.path,
+          isolation: 'process'
+        }
+      );
+    });
+
+  // TODO: fix this case
+  // it(
+  //   'should execute run using a different cwd for the runner than the process cwd with isolation none',
+  //   async () => {
+  //     await testWatch(
+  //       {
+  //         fileToUpdate: 'test.js',
+  //         action: 'rename',
+  //         cwd: import.meta.dirname,
+  //         runnerCwd: tmpdir.path,
+  //         isolation: 'none'
+  //       }
+  //     );
+  //   }
+  // );
 });