+3 -1

packages/browser/src/client/tester/runner.ts

Reviewed

··· 257 257 258 258 importFile = async (filepath: string, mode: 'collect' | 'setup') => { 259 259 let hash = this.hashMap.get(filepath) 260 260 - if (!hash) { 260 260 + 261 261 + // if the mode is setup, we need to re-evaluate the setup file on each test run 262 262 + if (mode === 'setup' || !hash) { 261 263 hash = Date.now().toString() 262 264 this.hashMap.set(filepath, hash) 263 265 }

+7

test/browser/fixtures/isolate-and-setup-file/a.test.ts

Reviewed

··· 1 1 + import { expect, test } from 'vitest' 2 2 + import { counter } from './counter' 3 3 + 4 4 + test('increment counter', () => { 5 5 + counter.increment() 6 6 + expect(counter.get()).toBe(1) 7 7 + });

+7

test/browser/fixtures/isolate-and-setup-file/b.test.ts

Reviewed

··· 1 1 + import { expect, test } from 'vitest' 2 2 + import { counter } from './counter' 3 3 + 4 4 + test('make sure the counter is reset by the setup file beforeEach hook', () => { 5 5 + counter.increment() 6 6 + expect(counter.get()).toBe(1) 7 7 + });

+4

test/browser/fixtures/isolate-and-setup-file/browser-setup.ts

Reviewed

··· 1 1 + import { beforeEach } from 'vitest' 2 2 + import { counter } from './counter' 3 3 + 4 4 + beforeEach(() => counter.reset())

+6

test/browser/fixtures/isolate-and-setup-file/counter.ts

Reviewed

··· 1 1 + const g = globalThis as unknown as { counter: number }; 2 2 + export const counter = { 3 3 + get: () => g.counter, 4 4 + increment: () => g.counter++, 5 5 + reset: () => (g.counter = 0), 6 6 + };

+17

test/browser/fixtures/isolate-and-setup-file/vitest.config.ts

Reviewed

··· 1 1 + import { fileURLToPath } from 'node:url' 2 2 + import { defineConfig } from 'vitest/config' 3 3 + import { instances, provider } from '../../settings' 4 4 + 5 5 + export default defineConfig({ 6 6 + cacheDir: fileURLToPath(new URL("./node_modules/.vite", import.meta.url)), 7 7 + test: { 8 8 + setupFiles: ['./browser-setup.ts'], 9 9 + browser: { 10 10 + enabled: true, 11 11 + isolate: false, 12 12 + provider, 13 13 + instances, 14 14 + headless: false, 15 15 + }, 16 16 + }, 17 17 + })

+13

test/browser/specs/runner.test.ts

Reviewed

··· 290 290 expect(stdout).toContain(`Tests ${instances.length} passed`) 291 291 }) 292 292 293 293 + test('re-evaluate setupFiles on each test run even when isolate is false', async () => { 294 294 + const { exitCode, stderr, stdout } = await runBrowserTests({ 295 295 + root: './fixtures/isolate-and-setup-file', 296 296 + }) 297 297 + 298 298 + expect(stderr).toBe('') 299 299 + expect(exitCode).toBe(0) 300 300 + instances.forEach(({ browser }) => { 301 301 + expect(stdout).toReportPassedTest('a.test.ts', browser) 302 302 + expect(stdout).toReportPassedTest('b.test.ts', browser) 303 303 + }) 304 304 + }) 305 305 + 293 306 test.runIf(provider.name === 'playwright')('timeout hooks', async ({ onTestFailed }) => { 294 307 const { stderr } = await runBrowserTests({ 295 308 root: './fixtures/timeout-hooks',