Fixes

vitest-dev · Oct 31, 2024 · 7a53882 · 7a53882
1 parent 7111ad3
commit 7a53882
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/packages/runner/src/run.ts b/packages/runner/src/run.ts
@@ -495,8 +495,8 @@ export async function runFiles(files: File[], runner: VitestRunner): Promise<voi
   }
 }
 
-export async function startTests(specs: FileSpec[], runner: VitestRunner): Promise<File[]> {
-  const paths = specs.map(f => f.filepath)
+export async function startTests(specs: string[] | FileSpec[], runner: VitestRunner): Promise<File[]> {
+  const paths = specs.map(f => typeof f === 'string' ? f : f.filepath)
   await runner.onBeforeCollect?.(paths)
 
   const files = await collectTests(specs, runner)

diff --git a/packages/vitest/src/node/pools/forks.ts b/packages/vitest/src/node/pools/forks.ts
@@ -1,3 +1,4 @@
+import type { FileSpec } from '@vitest/runner/types/runner'
 import type { TinypoolChannel, Options as TinypoolOptions } from 'tinypool'
 import type { RunnerRPC, RuntimeRPC } from '../../types/rpc'
 import type { ContextRPC, ContextTestEnvironment } from '../../types/worker'

diff --git a/packages/vitest/src/node/pools/vmThreads.ts b/packages/vitest/src/node/pools/vmThreads.ts
@@ -1,3 +1,4 @@
+import type { FileSpec } from '@vitest/runner/types/runner'
 import type { Options as TinypoolOptions } from 'tinypool'
 import type { RunnerRPC, RuntimeRPC } from '../../types/rpc'
 import type { ContextTestEnvironment } from '../../types/worker'

diff --git a/packages/vitest/src/node/spec.ts b/packages/vitest/src/node/spec.ts
@@ -27,8 +27,7 @@ export class TestSpecification {
     workspaceProject: WorkspaceProject,
     moduleId: string,
     pool: Pool,
-    // location?: WorkspaceSpecLocation | undefined,
-    testLocations: number[] | undefined,
+    testLocations?: number[] | undefined,
   ) {
     this[0] = workspaceProject
     this[1] = moduleId

diff --git a/packages/vitest/src/runtime/inspector.ts b/packages/vitest/src/runtime/inspector.ts
@@ -28,7 +28,9 @@ export function setupInspect(ctx: ContextRPC) {
       )
 
       if (config.inspectBrk) {
-        const firstTestFile = ctx.files[0]
+        const firstTestFile = typeof ctx.files[0] === 'string'
+          ? ctx.files[0]
+          : ctx.files[0].filepath
 
         // Stop at first test file
         if (firstTestFile) {

diff --git a/packages/vitest/src/runtime/runBaseTests.ts b/packages/vitest/src/runtime/runBaseTests.ts
@@ -62,7 +62,7 @@ export async function run(
           resetModules(workerState.moduleCache, true)
         }
 
-        workerState.filepath = file.file
+        workerState.filepath = file.filepath
 
         if (method === 'run') {
           await startTests([file], runner)