chore: simplify test/ structure

.gitattributes

@@ -1,3 +1,3 @@
 * text=auto eol=lf
 
-test/reporters/fixtures/indicator-position.test.js eol=crlf
+test/cli/fixtures/reporters/indicator-position.test.js eol=crlf

packages/browser/src/node/project.ts

@@ -14,8 +14,8 @@ import type {
 import type { ParentBrowserProject } from './projectParent'
 import { existsSync } from 'node:fs'
 import { readFile } from 'node:fs/promises'
-import { fileURLToPath } from 'node:url'
 import { resolve } from 'pathe'
+import { distRoot } from './constants'
 import { BrowserServerState } from './state'
 import { getBrowserProvider } from './utils'
 
@@ -25,41 +25,35 @@ export class ProjectBrowser implements IProjectBrowser {
 
   public provider!: BrowserProvider
   public vitest: Vitest
+  public vite: ViteDevServer
   public config: ResolvedConfig
-  public children: Set<ProjectBrowser> = new Set<ProjectBrowser>()
-
-  public parent!: ParentBrowserProject
 
   public state: BrowserServerState = new BrowserServerState()
 
   constructor(
+    public parent: ParentBrowserProject,
     public project: TestProject,
     public base: string,
   ) {
     this.vitest = project.vitest
     this.config = project.config
+    this.vite = parent.vite
 
-    const pkgRoot = resolve(fileURLToPath(import.meta.url), '../..')
-    const distRoot = resolve(pkgRoot, 'dist')
-
+    // instances can override testerHtmlPath
     const testerHtmlPath = project.config.browser.testerHtmlPath
       ? resolve(project.config.root, project.config.browser.testerHtmlPath)
       : resolve(distRoot, 'client/tester/tester.html')
+    // TODO: when config resolution is rewritten, project and parentProject should be created before the vite server is started
     if (!existsSync(testerHtmlPath)) {
       throw new Error(`Tester HTML file "${testerHtmlPath}" doesn't exist.`)
     }
     this.testerFilepath = testerHtmlPath
-
     this.testerHtml = readFile(
-      testerHtmlPath,
+      this.testerFilepath,
       'utf8',
     ).then(html => (this.testerHtml = html))
   }
 
-  get vite(): ViteDevServer {
-    return this.parent.vite
-  }
-
   private commands = {} as Record<string, BrowserCommand<any, any>>
 
   public registerCommand<K extends keyof BrowserCommands>(
@@ -130,7 +124,7 @@ export class ProjectBrowser implements IProjectBrowser {
   }
 
   async close(): Promise<void> {
-    await this.parent.vite.close()
+    await this.vite.close()
   }
 }
 

packages/browser/src/node/projectParent.ts

@@ -147,10 +147,10 @@ export class ParentBrowserProject {
       throw new Error(`Cannot spawn child server without a parent dev server.`)
     }
     const clone = new ProjectBrowser(
+      this,
       project,
       '/',
     )
-    clone.parent = this
     this.children.add(clone)
     return clone
   }

packages/vitest/src/node/project.ts

@@ -505,7 +505,7 @@ export class TestProject {
         [
           this.vite?.close(),
           this.typechecker?.stop(),
-          this.browser?.close(),
+          (this.browser || this._parent?._parentBrowser?.vite)?.close(),
           this.clearTmpDir(),
         ].filter(Boolean),
       ).then(() => {

packages/vitest/src/node/reporters/junit.ts

@@ -35,6 +35,10 @@ export interface JUnitOptions {
    * @default false
    */
   addFileAttribute?: boolean
+  /**
+   * Hostname to use in the report. By default, it uses os.hostname()
+   */
+  hostname?: string
 }
 
 function flattenTasks(task: Task, baseName = ''): Task[] {
@@ -373,7 +377,7 @@ export class JUnitReporter implements Reporter {
           {
             name: filename,
             timestamp: new Date().toISOString(),
-            hostname: hostname(),
+            hostname: this.options.hostname || hostname(),
             tests: file.tasks.length,
             failures: file.stats.failures,
             errors: 0, // An errored test is one that had an unanticipated problem. We cannot detect those.