test: use tinyexec for execArgv tests (#7151)

vitest-dev · Dec 30, 2024 · d243c78 · d243c78
1 parent caede68
commit d243c78
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 35 deletions.
diff --git a/packages/vitest/package.json b/packages/vitest/package.json
@@ -164,7 +164,7 @@
     "pathe": "^1.1.2",
     "std-env": "^3.8.0",
     "tinybench": "^2.9.0",
-    "tinyexec": "^0.3.1",
+    "tinyexec": "^0.3.2",
     "tinypool": "^1.0.2",
     "tinyrainbow": "^1.2.0",
     "vite": "^5.0.0 || ^6.0.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/config/package.json b/test/config/package.json
@@ -6,7 +6,7 @@
     "test": "vitest --typecheck.enabled"
   },
   "devDependencies": {
-    "tinyexec": "^0.3.0",
+    "tinyexec": "^0.3.2",
     "vite": "latest",
     "vitest": "workspace:*"
   }

diff --git a/test/config/test/exec-args.test.ts b/test/config/test/exec-args.test.ts
@@ -1,4 +1,4 @@
-import { spawnSync } from 'node:child_process'
+import { x } from 'tinyexec'
 import { expect, test } from 'vitest'
 import { runVitest } from '../../test-utils'
 
@@ -35,19 +35,20 @@ test.each([
 })
 
 test('should not pass execArgv to workers when not specified in the config', async () => {
-  const { stdout, stderr } = spawnSync('node', [
+  const { stdout, stderr } = await x('node', [
     '--title',
     'this-works-only-on-main-thread',
     '../../../../node_modules/vitest/vitest.mjs',
     '--run',
   ], {
-    encoding: 'utf-8',
-    cwd: `${process.cwd()}/fixtures/no-exec-args-fixtures`,
-    env: {
-      ...process.env,
-      VITE_NODE_DEPS_MODULE_DIRECTORIES: '/node_modules/,/packages/',
-      NO_COLOR: '1',
+    nodeOptions: {
+      cwd: `${process.cwd()}/fixtures/no-exec-args-fixtures`,
+      env: {
+        VITE_NODE_DEPS_MODULE_DIRECTORIES: '/node_modules/,/packages/',
+        NO_COLOR: '1',
+      },
     },
+    throwOnError: false,
   })
 
   expect(stderr).not.toContain('Error: Initiated Worker with invalid execArgv flags: --title')
@@ -56,20 +57,21 @@ test('should not pass execArgv to workers when not specified in the config', asy
 })
 
 test('should let allowed args pass to workers', async () => {
-  const { stdout, stderr } = spawnSync('node', [
+  const { stdout, stderr } = await x('node', [
     '--heap-prof',
     '--diagnostic-dir=/tmp/vitest-diagnostics',
     '--heap-prof-name=heap.prof',
     '../../../../node_modules/vitest/vitest.mjs',
     '--run',
   ], {
-    encoding: 'utf-8',
-    cwd: `${process.cwd()}/fixtures/allowed-exec-args-fixtures`,
-    env: {
-      ...process.env,
-      VITE_NODE_DEPS_MODULE_DIRECTORIES: '/node_modules/,/packages/',
-      NO_COLOR: '1',
+    nodeOptions: {
+      cwd: `${process.cwd()}/fixtures/allowed-exec-args-fixtures`,
+      env: {
+        VITE_NODE_DEPS_MODULE_DIRECTORIES: '/node_modules/,/packages/',
+        NO_COLOR: '1',
+      },
     },
+    throwOnError: false,
   })
 
   expect(stderr).toBe('')

diff --git a/test/test-utils/package.json b/test/test-utils/package.json
@@ -7,7 +7,7 @@
     "test": "echo \"No tests\""
   },
   "devDependencies": {
-    "tinyexec": "^0.3.0",
+    "tinyexec": "^0.3.2",
     "tinyrainbow": "^1.2.0",
     "vite": "latest",
     "vite-node": "workspace:*",