chore: always show workspace name

vitest-dev · Apr 8, 2023 · bde49db · bde49db
1 parent f85088c
commit bde49db
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/packages/vitest/src/node/core.ts b/packages/vitest/src/node/core.ts
@@ -50,6 +50,8 @@ export class Vitest {
   restartsCount = 0
   runner: ViteNodeRunner = undefined!
 
+  private coreWorkspace!: VitestWorkspace
+
   public workspaces: VitestWorkspace[] = []
   private workspacesTestFiles = new Map<string, Set<VitestWorkspace>>()
 
@@ -138,9 +140,16 @@ export class Vitest {
       runner: this.runner,
       server: this.vitenode,
     })
+    this.coreWorkspace = coreWorkspace
     return coreWorkspace
   }
 
+  public getCoreWorkspace() {
+    if (!this.coreWorkspace)
+      throw new Error('Core workspace not initialized')
+    return this.coreWorkspace
+  }
+
   private async resolveWorkspaces(options: UserConfig) {
     const rootFiles = await fs.readdir(this.config.root)
     const workspacesConfigPath = workspacesFiles.find((configFile) => {

diff --git a/packages/vitest/src/node/logger.ts b/packages/vitest/src/node/logger.ts
@@ -113,7 +113,7 @@ export class Logger {
       if (!workspace.browser)
         return
       const name = workspace.getName()
-      const output = (name === this.ctx.config.root || name === this.ctx.config.name) ? '' : ` [${name}]`
+      const output = workspace.isCore() ? '' : ` [${name}]`
 
       this.log(c.dim(c.green(`     ${output} Browser runner started at http://${workspace.config.browser.api?.host || 'localhost'}:${c.bold(`${workspace.browser.config.server.port}`)}`)))
     })

diff --git a/packages/vitest/src/node/plugins/workspace.ts b/packages/vitest/src/node/plugins/workspace.ts
@@ -1,4 +1,4 @@
-import { relative } from 'pathe'
+import { dirname, relative } from 'pathe'
 import type { UserConfig as ViteConfig, Plugin as VitePlugin } from 'vite'
 import { configDefaults } from '../../defaults'
 import { generateScopedClassName } from '../../integrations/css/css-modules'
@@ -11,6 +11,7 @@ import { GlobalSetupPlugin } from './globalSetup'
 
 interface WorkspaceOptions {
   root: string
+  workspacePath: string
 }
 
 export function WorkspaceVitestPlugin(workspace: VitestWorkspace, options: WorkspaceOptions) {
@@ -89,6 +90,7 @@ export function WorkspaceVitestPlugin(workspace: VitestWorkspace, options: Works
           },
           test: {
             env,
+            name: testConfig.name || dirname(options.workspacePath).split('/').pop(),
           },
         }
 

diff --git a/packages/vitest/src/node/workspace.ts b/packages/vitest/src/node/workspace.ts
@@ -29,12 +29,12 @@ export async function initializeWorkspace(workspacePath: string, ctx: Vitest) {
   const root = dirname(workspacePath)
 
   const config: ViteInlineConfig = {
-    root: dirname(workspacePath),
+    root,
     logLevel: 'error',
     configFile,
     // this will make "mode" = "test" inside defineConfig
     mode: ctx.config.mode || process.env.NODE_ENV,
-    plugins: WorkspaceVitestPlugin(workspace, { root }),
+    plugins: WorkspaceVitestPlugin(workspace, { root, workspacePath }),
   }
 
   const server = await createServer(config)
@@ -67,7 +67,11 @@ export class VitestWorkspace {
   ) { }
 
   getName() {
-    return this.config.name || dirname(this.path)
+    return this.config.name
+  }
+
+  isCore() {
+    return this.ctx.getCoreWorkspace() === this
   }
 
   get reporters() {