fix(cli): vitest run --watch should be watch-mode (#8128)

AriPerkkio · web-flow · commit 657e83f9faf8 · 2025-06-10T17:33:14.000+02:00
diff --git a/packages/vitest/src/node/cli/cac.ts b/packages/vitest/src/node/cli/cac.ts
@@ -239,7 +239,7 @@ export function parseCLI(argv: string | string[], config: CliParseOptions = {}):
   if (arrayArgs[2] === 'watch' || arrayArgs[2] === 'dev') {
     options.watch = true
   }
-  if (arrayArgs[2] === 'run') {
+  if (arrayArgs[2] === 'run' && !options.watch) {
     options.run = true
   }
   if (arrayArgs[2] === 'related') {
@@ -265,7 +265,9 @@ async function watch(cliFilters: string[], options: CliOptions): Promise<void> {
 }
 
 async function run(cliFilters: string[], options: CliOptions): Promise<void> {
-  options.run = true
+  // "vitest run --watch" should still be watch mode
+  options.run = !options.watch
+
   await start('test', cliFilters, options)
 }
 
diff --git a/test/config/fixtures/run-mode/example.test.ts b/test/config/fixtures/run-mode/example.test.ts
@@ -0,0 +1,3 @@
+import { test } from "vitest";
+
+test("example", () => {})
diff --git a/test/config/fixtures/run-mode/vitest.config.ts b/test/config/fixtures/run-mode/vitest.config.ts
@@ -0,0 +1 @@
+export default {}
diff --git a/test/config/test/mode.test.ts b/test/config/test/mode.test.ts
@@ -21,3 +21,25 @@ test.each([
   expect(stderr).toContain(`Error: env.mode should be equal to "${expectedMode}"`)
   expect(stdout).toBe('')
 })
+
+test.each([
+  { options: ['run'], expected: 'run' },
+  { options: ['run', '--watch'], expected: 'watch' },
+  { options: ['watch'], expected: 'watch' },
+] as const)(`vitest $options.0 $options.1 resolves to $expected-mode`, async ({ options, expected }) => {
+  const { vitest } = await testUtils.runVitestCli(...options, '--root', 'fixtures/run-mode')
+
+  if (expected === 'watch') {
+    await vitest.waitForStdout('Test Files  1 passed (1)')
+
+    expect(vitest.stdout).not.toContain('RUN')
+    expect(vitest.stdout).toContain('DEV')
+    expect(vitest.stdout).toContain('Waiting for file changes')
+  }
+
+  if (expected === 'run') {
+    expect(vitest.stdout).toContain('RUN')
+    expect(vitest.stdout).not.toContain('DEV')
+    expect(vitest.stdout).not.toContain('Waiting for file changes')
+  }
+})
diff --git a/test/core/test/cli-test.test.ts b/test/core/test/cli-test.test.ts
@@ -381,6 +381,15 @@ test('public parseCLI works correctly', () => {
       'color': true,
     },
   })
+  expect(parseCLI('vitest run --watch')).toEqual({
+    filter: [],
+    options: {
+      'watch': true,
+      'w': true,
+      '--': [],
+      'color': true,
+    },
+  })
   expect(parseCLI('vitest related ./some-files.js')).toEqual({
     filter: [],
     options: {
diff --git a/test/test-utils/index.ts b/test/test-utils/index.ts
@@ -190,7 +190,7 @@ async function runCli(command: 'vitest' | 'vite-node', _options?: CliOptions | s
   }
 
   // Manually stop the processes so that each test don't have to do this themselves
-  afterEach(async () => {
+  onTestFinished(async () => {
     if (subprocess.exitCode === null) {
       subprocess.kill()
     }
@@ -206,7 +206,7 @@ async function runCli(command: 'vitest' | 'vite-node', _options?: CliOptions | s
     return output()
   }
 
-  if (args[0] !== 'list' && args.includes('--watch')) {
+  if (args[0] !== 'list' && (args.includes('--watch') || args[0] === 'watch')) {
     if (command === 'vitest') {
       // Wait for initial test run to complete
       await cli.waitForStdout('Waiting for file changes')

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ export function parseCLI(argv: string \| string[], config: CliParseOptions = {}):`
`239`	`239`	`if (arrayArgs[2] === 'watch' \|\| arrayArgs[2] === 'dev') {`
`240`	`240`	`options.watch = true`
`241`	`241`	`}`
`242`		`- if (arrayArgs[2] === 'run') {`
	`242`	`+ if (arrayArgs[2] === 'run' && !options.watch) {`
`243`	`243`	`options.run = true`
`244`	`244`	`}`
`245`	`245`	`if (arrayArgs[2] === 'related') {`
`@@ -265,7 +265,9 @@ async function watch(cliFilters: string[], options: CliOptions): Promise<void> {`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`async function run(cliFilters: string[], options: CliOptions): Promise<void> {`
`268`		`- options.run = true`
	`268`	`+ // "vitest run --watch" should still be watch mode`
	`269`	`+ options.run = !options.watch`
	`270`	`+`
`269`	`271`	`await start('test', cliFilters, options)`
`270`	`272`	`}`
`271`	`273`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { test } from "vitest";`
	`2`	`+`
	`3`	`+test("example", () => {})`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ async function runCli(command: 'vitest' \| 'vite-node', _options?: CliOptions \| s`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`// Manually stop the processes so that each test don't have to do this themselves`
`193`		`- afterEach(async () => {`
	`193`	`+ onTestFinished(async () => {`
`194`	`194`	`if (subprocess.exitCode === null) {`
`195`	`195`	`subprocess.kill()`
`196`	`196`	`}`
`@@ -206,7 +206,7 @@ async function runCli(command: 'vitest' \| 'vite-node', _options?: CliOptions \| s`
`206`	`206`	`return output()`
`207`	`207`	`}`
`208`	`208`
`209`		`- if (args[0] !== 'list' && args.includes('--watch')) {`
	`209`	`+ if (args[0] !== 'list' && (args.includes('--watch') \|\| args[0] === 'watch')) {`
`210`	`210`	`if (command === 'vitest') {`
`211`	`211`	`// Wait for initial test run to complete`
`212`	`212`	`await cli.waitForStdout('Waiting for file changes')`