test: refactor to new test-util API

eslint.config.js

@@ -11,8 +11,10 @@ export default antfu(
       '**/bench.json',
       '**/fixtures',
       'test/core/src/self',
+      'test/cache/cache/.vitest-base/results.json',
       'test/wasm-modules/src/wasm-bindgen-no-cyclic',
       'test/workspaces/results.json',
+      'test/workspaces-browser/results.json',
       'test/reporters/fixtures/with-syntax-error.test.js',
       'test/network-imports/public/slash@3.0.0.js',
       'test/coverage-test/src/transpiled.js',

test/config/test/cache.test.ts

@@ -6,21 +6,21 @@ const root = resolve(__dirname, '../fixtures/cache')
 const project = resolve(__dirname, '../')
 
 test('default', async () => {
-  const { vitest, stdout, stderr } = await runVitest({
+  const { ctx, stdout, stderr } = await runVitest({
     root,
     include: ['*.test.ts'],
   })
 
   expect(stdout).toContain('✓ basic.test.ts >')
   expect(stderr).toBe('')
 
-  const cachePath = vitest!.cache.results.getCachePath()
+  const cachePath = ctx!.cache.results.getCachePath()
   const path = resolve(project, 'node_modules/.vite/vitest/results.json')
   expect(cachePath).toMatch(path)
 })
 
 test('use cache.dir', async () => {
-  const { vitest, stdout, stderr } = await runVitest(
+  const { ctx, stdout, stderr } = await runVitest(
     {
       root,
       include: ['*.test.ts'],
@@ -33,13 +33,13 @@ test('use cache.dir', async () => {
   expect(stdout).toContain('✓ basic.test.ts >')
   expect(stderr).toContain('"cache.dir" is deprecated')
 
-  const cachePath = vitest!.cache.results.getCachePath()
+  const cachePath = ctx!.cache.results.getCachePath()
   const path = resolve(root, 'node_modules/.vitest-custom/results.json')
   expect(cachePath).toMatch(path)
 })
 
 test('use cacheDir', async () => {
-  const { vitest, stdout, stderr } = await runVitest(
+  const { ctx, stdout, stderr } = await runVitest(
     {
       root,
       include: ['*.test.ts'],
@@ -52,7 +52,7 @@ test('use cacheDir', async () => {
   expect(stdout).toContain('✓ basic.test.ts >')
   expect(stderr).toBe('')
 
-  const cachePath = vitest!.cache.results.getCachePath()
+  const cachePath = ctx!.cache.results.getCachePath()
   const path = resolve(root, 'node_modules/.vite-custom/vitest/results.json')
   expect(cachePath).toMatch(path)
 })
@@ -67,7 +67,7 @@ describe('with optimizer enabled', () => {
   }
 
   test('default', async () => {
-    const { vitest, stdout, stderr } = await runVitest({
+    const { ctx, stdout, stderr } = await runVitest({
       root,
       include: ['*.test.ts'],
       deps,
@@ -76,13 +76,13 @@ describe('with optimizer enabled', () => {
     expect(stdout).toContain('✓ basic.test.ts >')
     expect(stderr).toBe('')
 
-    const cachePath = vitest!.cache.results.getCachePath()
+    const cachePath = ctx!.cache.results.getCachePath()
     const path = resolve(project, 'node_modules/.vite/vitest/results.json')
     expect(cachePath).toBe(path)
   })
 
   test('use cache.dir', async () => {
-    const { vitest, stdout, stderr } = await runVitest(
+    const { ctx, stdout, stderr } = await runVitest(
       {
         root,
         include: ['*.test.ts'],
@@ -96,13 +96,13 @@ describe('with optimizer enabled', () => {
     expect(stdout).toContain('✓ basic.test.ts >')
     expect(stderr).toContain('"cache.dir" is deprecated')
 
-    const cachePath = vitest!.cache.results.getCachePath()
+    const cachePath = ctx!.cache.results.getCachePath()
     const path = resolve(root, 'node_modules/.vitest-custom/results.json')
     expect(cachePath).toBe(path)
   })
 
   test('use cacheDir', async () => {
-    const { vitest, stdout, stderr } = await runVitest(
+    const { ctx, stdout, stderr } = await runVitest(
       {
         root,
         include: ['*.test.ts'],
@@ -116,7 +116,7 @@ describe('with optimizer enabled', () => {
     expect(stdout).toContain('✓ basic.test.ts >')
     expect(stderr).toBe('')
 
-    const cachePath = vitest!.cache.results.getCachePath()
+    const cachePath = ctx!.cache.results.getCachePath()
     const path = resolve(root, 'node_modules/.vite-custom/vitest/results.json')
     expect(cachePath).toBe(path)
   })

test/config/test/console.test.ts

@@ -1,4 +1,4 @@
-import { expect, test } from 'vitest'
+import { expect, test, vi } from 'vitest'
 import { runVitest } from '../../test-utils'
 
 test('default intercept', async () => {
@@ -9,10 +9,15 @@ test('default intercept', async () => {
 })
 
 test.each(['threads', 'vmThreads'] as const)(`disable intercept pool=%s`, async (pool) => {
-  const { stderr } = await runVitest({
+  // `disableConsoleIntercept: true` forwards workers console.error to main thread's stderr
+  const spy = vi.spyOn(process.stderr, 'write').mockImplementation(() => true)
+
+  await runVitest({
     root: './fixtures/console',
     disableConsoleIntercept: true,
     pool,
   })
-  expect(stderr).toBe('__test_console__\n')
+
+  const call = spy.mock.lastCall![0]
+  expect(call.toString()).toBe('__test_console__\n')
 })

test/config/test/flags.test.ts

@@ -2,7 +2,7 @@ import { expect, it } from 'vitest'
 import { runVitest } from '../../test-utils'
 
 it('correctly inherit from the cli', async () => {
-  const { vitest } = await runVitest({
+  const { ctx } = await runVitest({
     root: 'fixtures/workspace-flags',
     logHeapUsage: true,
     allowOnly: true,
@@ -18,7 +18,7 @@ it('correctly inherit from the cli', async () => {
     passWithNoTests: true,
     bail: 100,
   })
-  const project = vitest!.projects[0]
+  const project = ctx!.projects[0]
   const config = project.getSerializableConfig()
   expect(config).toMatchObject({
     logHeapUsage: true,

test/config/test/shuffle-options.test.ts

@@ -25,17 +25,17 @@ test.each([
   { files: false, tests: true },
 ],
 )('should use BaseSequencer if shuffle is %o', async (shuffle) => {
-  const { vitest } = await run({ shuffle })
-  expect(vitest?.config.sequence.sequencer.name).toBe('BaseSequencer')
+  const { ctx } = await run({ shuffle })
+  expect(ctx?.config.sequence.sequencer.name).toBe('BaseSequencer')
 })
 
 test.each([
   true,
   { files: true, tests: false },
   { files: true, tests: true },
 ])('should use RandomSequencer if shuffle is %o', async (shuffle) => {
-  const { vitest } = await run({ shuffle })
-  expect(vitest?.config.sequence.sequencer.name).toBe('RandomSequencer')
+  const { ctx } = await run({ shuffle })
+  expect(ctx?.config.sequence.sequencer.name).toBe('RandomSequencer')
 })
 
 test.each([
@@ -44,6 +44,6 @@ test.each([
   { files: true, tests: false },
   { files: true, tests: true },
 ])('should always use CustomSequencer if passed', async (shuffle) => {
-  const { vitest } = await run({ shuffle, sequencer: CustomSequencer })
-  expect(vitest?.config.sequence.sequencer.name).toBe('CustomSequencer')
+  const { ctx } = await run({ shuffle, sequencer: CustomSequencer })
+  expect(ctx?.config.sequence.sequencer.name).toBe('CustomSequencer')
 })

test/core/test/cli-test.test.ts

@@ -274,7 +274,7 @@ test('clearScreen', async () => {
       clearScreen: viteClearScreen,
     }
     const vitestConfig = getCLIOptions(vitestClearScreen)
-    const config = resolveConfig('test', vitestConfig, viteConfig)
+    const config = resolveConfig('test', vitestConfig, viteConfig, undefined as any)
     return config.clearScreen
   })
   expect(results).toMatchInlineSnapshot(`

test/inspect/test/inspect.test.ts

@@ -8,7 +8,7 @@ import { runVitestCli } from '../../test-utils'
 type Message = Partial<InspectorNotification<any>>
 
 test.skipIf(isWindows)('--inspect-brk stops at test file', async () => {
-  const vitest = await runVitestCli('--root', 'fixtures', '--inspect-brk', '--no-file-parallelism')
+  const { vitest, waitForClose } = await runVitestCli('--root', 'fixtures', '--inspect-brk', '--no-file-parallelism')
 
   await vitest.waitForStderr('Debugger listening on ')
   const url = vitest.stderr.split('\n')[0].replace('Debugger listening on ', '')
@@ -36,7 +36,7 @@ test.skipIf(isWindows)('--inspect-brk stops at test file', async () => {
   send({ method: 'Debugger.resume' })
 
   await vitest.waitForStdout('Test Files  1 passed (1)')
-  await vitest.isDone
+  await waitForClose()
 })
 
 async function createChannel(url: string) {

test/public-api/tests/runner.spec.ts

@@ -19,7 +19,7 @@ it.each([
   const taskUpdate: TaskResultPack[] = []
   const finishedFiles: File[] = []
   const collectedFiles: File[] = []
-  const { vitest, stdout, stderr } = await runVitest({
+  const { ctx, stdout, stderr } = await runVitest({
     root: resolve(__dirname, '..', 'fixtures'),
     include: ['**/*.spec.ts'],
     reporters: [
@@ -50,7 +50,7 @@ it.each([
   expect(taskUpdate).toHaveLength(4)
   expect(finishedFiles).toHaveLength(1)
 
-  const files = vitest?.state.getFiles() || []
+  const files = ctx?.state.getFiles() || []
   expect(files).toHaveLength(1)
 
   expect(taskUpdate).toContainEqual(

test/reporters/tests/default.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest'
-import { runVitest, runVitestCli } from '../../test-utils'
+import { runVitest } from '../../test-utils'
 
 describe('default reporter', async () => {
   test('normal', async () => {
@@ -28,14 +28,12 @@ describe('default reporter', async () => {
   })
 
   test('rerun should undo', async () => {
-    const vitest = await runVitestCli(
-      '--root',
-      'fixtures/default',
-      '--watch',
-      '-t',
-      'passed',
-    )
-    vitest.resetOutput()
+    const { vitest } = await runVitest({
+      root: 'fixtures/default',
+      watch: true,
+      testNamePattern: 'passed',
+      reporters: 'none',
+    })
 
     // one file
     vitest.write('p')

test/run/pool-custom-fixtures/pool/custom-pool.ts

@@ -9,12 +9,12 @@ export default (ctx: Vitest): ProcessPool => {
   return {
     name: 'custom',
     async runTests(specs) {
-      console.warn('[pool] printing:', options.print)
-      console.warn('[pool] array option', options.array)
+      ctx.logger.console.warn('[pool] printing:', options.print)
+      ctx.logger.console.warn('[pool] array option', options.array)
       for await (const [project, file] of specs) {
         ctx.state.clearFiles(project)
         const methods = createMethodsRPC(project)
-        console.warn('[pool] running tests for', project.getName(), 'in', normalize(file).toLowerCase().replace(normalize(process.cwd()).toLowerCase(), ''))
+        ctx.logger.console.warn('[pool] running tests for', project.getName(), 'in', normalize(file).toLowerCase().replace(normalize(process.cwd()).toLowerCase(), ''))
         const path = relative(project.config.root, file)
         const taskFile: File = {
           id: `${path}${project.getName()}`,
@@ -47,7 +47,7 @@ export default (ctx: Vitest): ProcessPool => {
       }
     },
     close() {
-      console.warn('[pool] custom pool is closed!')
+      ctx.logger.console.warn('[pool] custom pool is closed!')
     },
   }
 }

test/run/test/tty.test.ts

@@ -2,12 +2,11 @@ import { expect, test } from 'vitest'
 import { runVitestCli } from '../../test-utils'
 
 test('run mode does not get stuck when TTY', async () => {
-  const vitest = await runVitestCli('--root', 'fixtures')
-  await vitest.isDone
+  const { vitest } = await runVitestCli('--root', 'fixtures')
 
-  expect(vitest.stdout).toContain('✓ example.test.ts')
-  expect(vitest.stdout).toContain('✓ math.test.ts')
-  expect(vitest.stdout).toContain('2 passed')
+  await vitest.waitForStdout('✓ example.test.ts')
+  await vitest.waitForStdout('✓ math.test.ts')
+  await vitest.waitForStdout('2 passed')
 
   // Regression #3642
   expect(vitest.stderr).not.toContain('close timed out')

test/test-utils/index.ts

@@ -48,6 +48,7 @@ export async function runVitest(config: UserConfig, cliFilters: string[] = [], m
 
     afterEach(async () => {
       await ctx?.close()
+      await ctx?.closingPromise
       process.exit = exit
     })
   }