test: refactor watch cwd tests

nodejs · Oct 1, 2024 · c6d0cec · c6d0cec
1 parent e995bec
commit c6d0cec
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 51 deletions.
diff --git a/test/parallel/test-runner-run-watch.mjs b/test/parallel/test-runner-run-watch.mjs
@@ -1,6 +1,6 @@
 // Flags: --expose-internals
 import * as common from '../common/index.mjs';
-import { describe, it, beforeEach } from 'node:test';
+import { describe, it, beforeEach, run } from 'node:test';
 import assert from 'node:assert';
 import { spawn } from 'node:child_process';
 import { once } from 'node:events';
@@ -269,4 +269,60 @@ describe('test runner watch mode', () => {
         }
       );
     });
+
+  it('should run with different cwd while in watch mode', async () => {
+    const controller = new AbortController();
+    const stream = run({
+      cwd: tmpdir.path,
+      watch: true,
+      signal: controller.signal,
+    }).on('data', function({ type }) {
+      if (type === 'test:watch:drained') {
+        controller.abort();
+      }
+    });
+
+    stream.on('test:fail', common.mustNotCall());
+    stream.on('test:pass', common.mustCall(1));
+    // eslint-disable-next-line no-unused-vars
+    for await (const _ of stream);
+  });
+
+  it('should run with different cwd while in watch mode and isolation "none"', async () => {
+    const controller = new AbortController();
+    const stream = run({
+      cwd: tmpdir.path,
+      watch: true,
+      signal: controller.signal,
+      isolation: 'none',
+    }).on('data', function({ type }) {
+      if (type === 'test:watch:drained') {
+        controller.abort();
+      }
+    });
+
+    stream.on('test:fail', common.mustNotCall());
+    stream.on('test:pass', common.mustCall(1));
+    // eslint-disable-next-line no-unused-vars
+    for await (const _ of stream);
+  });
+
+  it('should run with different cwd while in watch mode and isolation "process"', async () => {
+    const controller = new AbortController();
+    const stream = run({
+      cwd: tmpdir.path,
+      watch: true,
+      signal: controller.signal,
+      isolation: 'process',
+    }).on('data', function({ type }) {
+      if (type === 'test:watch:drained') {
+        controller.abort();
+      }
+    });
+
+    stream.on('test:fail', common.mustNotCall());
+    stream.on('test:pass', common.mustCall(1));
+    // eslint-disable-next-line no-unused-vars
+    for await (const _ of stream);
+  });
 });
diff --git a/test/parallel/test-runner-run.mjs b/test/parallel/test-runner-run.mjs
@@ -602,56 +602,6 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
       assert.strictEqual(diagnostics.includes(entry), true);
     }
   });
-
-  it('should run with different cwd while in watch mode', async () => {
-    const controller = new AbortController();
-    const stream = run({
-      cwd: fixtures.path('test-runner', 'cwd'),
-      watch: true,
-      signal: controller.signal,
-    }).on('data', function({ type }) {
-      if (type === 'test:watch:drained') {
-        controller.abort();
-      }
-    });
-
-    stream.on('test:fail', common.mustNotCall());
-    stream.on('test:pass', common.mustCall(1));
-  });
-
-  it('should run with different cwd while in watch mode and isolation "none"', async () => {
-    const controller = new AbortController();
-    const stream = run({
-      cwd: fixtures.path('test-runner', 'cwd'),
-      watch: true,
-      signal: controller.signal,
-      isolation: 'none',
-    }).on('data', function({ type }) {
-      if (type === 'test:watch:drained') {
-        controller.abort();
-      }
-    });
-
-    stream.on('test:fail', common.mustNotCall());
-    stream.on('test:pass', common.mustCall(1));
-  });
-
-  it('should run with different cwd while in watch mode and isolation "process"', async () => {
-    const controller = new AbortController();
-    const stream = run({
-      cwd: fixtures.path('test-runner', 'cwd'),
-      watch: true,
-      signal: controller.signal,
-      isolation: 'process',
-    }).on('data', function({ type }) {
-      if (type === 'test:watch:drained') {
-        controller.abort();
-      }
-    });
-
-    stream.on('test:fail', common.mustNotCall());
-    stream.on('test:pass', common.mustCall(1));
-  });
 });
 
 describe('forceExit', () => {