test: replace tinyexec with node:child_process

vitest-dev · Dec 25, 2024 · 9c9e69b · 9c9e69b
1 parent 1ef0491
commit 9c9e69b
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 43 deletions.
diff --git a/test/config/test/console-color.test.ts b/test/config/test/console-color.test.ts
@@ -1,32 +1,31 @@
-import { x } from 'tinyexec'
 import { expect, test } from 'vitest'
-
-// use "tinyexec" directly since "runVitestCli" strips color
+import { runVitest } from '../../test-utils'
 
 test('with color', async () => {
-  const proc = await x('vitest', ['run', '--root=./fixtures/console-color'], {
-    nodeOptions: {
-      env: {
-        CI: '1',
-        FORCE_COLOR: '1',
-        NO_COLOR: undefined,
-        GITHUB_ACTIONS: undefined,
-      },
+  const { stdout } = await runVitest({
+    root: 'fixtures/console-color',
+    env: {
+      CI: '1',
+      FORCE_COLOR: '1',
+      NO_COLOR: undefined,
+      GITHUB_ACTIONS: undefined,
     },
-  })
-  expect(proc.stdout).toContain('\x1B[33mtrue\x1B[39m\n')
+  }, undefined, undefined, undefined, { preserveAnsi: true })
+
+  expect(stdout).toContain('\x1B[33mtrue\x1B[39m\n')
 })
 
 test('without color', async () => {
-  const proc = await x('vitest', ['run', '--root=./fixtures/console-color'], {
-    nodeOptions: {
-      env: {
-        CI: '1',
-        FORCE_COLOR: undefined,
-        NO_COLOR: '1',
-        GITHUB_ACTIONS: undefined,
-      },
+  const { stdout } = await runVitest({
+    root: 'fixtures/console-color',
+    env: {
+      CI: '1',
+      FORCE_COLOR: undefined,
+      NO_COLOR: '1',
+      GITHUB_ACTIONS: undefined,
     },
-  })
-  expect(proc.stdout).toContain('true\n')
+  }, undefined, undefined, undefined, { preserveAnsi: true })
+
+  expect(stdout).toContain('true\n')
+  expect(stdout).not.toContain('\x1B[33mtrue\x1B[39m\n')
 })
diff --git a/test/config/test/exec-args.test.ts b/test/config/test/exec-args.test.ts
@@ -1,4 +1,4 @@
-import { x } from 'tinyexec'
+import { spawnSync } from 'node:child_process'
 import { expect, test } from 'vitest'
 import { runVitest } from '../../test-utils'
 
@@ -35,20 +35,19 @@ test.each([
 })
 
 test('should not pass execArgv to workers when not specified in the config', async () => {
-  const { stdout, stderr } = await x('node', [
+  const { stdout, stderr } = spawnSync('node', [
     '--title',
     'this-works-only-on-main-thread',
     '../../../../node_modules/vitest/vitest.mjs',
     '--run',
   ], {
-    nodeOptions: {
-      cwd: `${process.cwd()}/fixtures/no-exec-args-fixtures`,
-      env: {
-        VITE_NODE_DEPS_MODULE_DIRECTORIES: '/node_modules/,/packages/',
-        NO_COLOR: '1',
-      },
+    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',
     },
-    throwOnError: false,
   })
 
   expect(stderr).not.toContain('Error: Initiated Worker with invalid execArgv flags: --title')
@@ -57,21 +56,20 @@ 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 } = await x('node', [
+  const { stdout, stderr } = spawnSync('node', [
     '--heap-prof',
     '--diagnostic-dir=/tmp/vitest-diagnostics',
     '--heap-prof-name=heap.prof',
     '../../../../node_modules/vitest/vitest.mjs',
     '--run',
   ], {
-    nodeOptions: {
-      cwd: `${process.cwd()}/fixtures/allowed-exec-args-fixtures`,
-      env: {
-        VITE_NODE_DEPS_MODULE_DIRECTORIES: '/node_modules/,/packages/',
-        NO_COLOR: '1',
-      },
+    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',
     },
-    throwOnError: false,
   })
 
   expect(stderr).toBe('')

diff --git a/test/test-utils/cli.ts b/test/test-utils/cli.ts
@@ -12,9 +12,12 @@ export class Cli {
   private stdoutListeners: Listener[] = []
   private stderrListeners: Listener[] = []
   private stdin: ReadableOrWritable
+  private preserveAnsi?: boolean
 
-  constructor(options: { stdin: ReadableOrWritable; stdout: ReadableOrWritable; stderr: ReadableOrWritable }) {
+  constructor(options: { stdin: ReadableOrWritable; stdout: ReadableOrWritable; stderr: ReadableOrWritable; preserveAnsi?: boolean }) {
     this.stdin = options.stdin
+    this.stdin = options.stdin
+    this.preserveAnsi = options.preserveAnsi
 
     for (const source of (['stdout', 'stderr'] as const)) {
       const stream = options[source]
@@ -37,7 +40,7 @@ export class Cli {
   }
 
   private capture(source: Source, data: any) {
-    const msg = stripVTControlCharacters(data.toString())
+    const msg = this.preserveAnsi ? data.toString() : stripVTControlCharacters(data.toString())
     this[source] += msg
     this[`${source}Listeners`].forEach(fn => fn())
   }

diff --git a/test/test-utils/index.ts b/test/test-utils/index.ts
@@ -20,6 +20,7 @@ Object.assign(tinyrainbow.default, tinyrainbow.getDefaultColors())
 interface VitestRunnerCLIOptions {
   std?: 'inherit'
   fails?: boolean
+  preserveAnsi?: boolean
 }
 
 export async function runVitest(
@@ -58,7 +59,7 @@ export async function runVitest(
   const stdin = new Readable({ read: () => '' }) as NodeJS.ReadStream
   stdin.isTTY = true
   stdin.setRawMode = () => stdin
-  const cli = new Cli({ stdin, stdout, stderr })
+  const cli = new Cli({ stdin, stdout, stderr, preserveAnsi: runnerOptions.preserveAnsi })
 
   let ctx: Vitest | undefined
   let thrown = false