Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/browser/src/client/tester/runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,8 @@ function createBrowserRunner(
if (mode === 'collect' && trace !== 'off') {
await this.commands.triggerCommand('__vitest_startTracing', [])
}
// static imports don't wait for mocks queued by a setup file
await mocker.prepare()
try {
await import(/* @vite-ignore */ importpath)
} catch (err) {
Expand Down
3 changes: 3 additions & 0 deletions test/browser/fixtures/mocking-setup-file/browser-setup.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { vi } from 'vitest'

vi.mock('./source', () => ({ answer: () => 'mocked' }))
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { expect, test } from 'vitest'

test('a dynamic import gets the mock from the setup file', async () => {
const { answer } = await import('./source')
expect(answer()).toBe('mocked')
})
3 changes: 3 additions & 0 deletions test/browser/fixtures/mocking-setup-file/source.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export function answer() {
return 'original'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { expect, test } from 'vitest'
import { answer } from './source'

test('a static import gets the mock from the setup file', () => {
expect(answer()).toBe('mocked')
})
28 changes: 28 additions & 0 deletions test/browser/fixtures/mocking-setup-file/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
import { instances, provider } from '../../settings'

export default defineConfig({
cacheDir: fileURLToPath(new URL('./node_modules/.vite', import.meta.url)),
plugins: [
{
// registering the mock takes longer than importing the test file
name: 'slow-mock-registration',
enforce: 'pre',
async resolveId(id, importer) {
if (id === './source' && importer?.endsWith('browser-setup.ts')) {
await new Promise(resolve => setTimeout(resolve, 500))
}
},
},
],
test: {
setupFiles: ['./browser-setup.ts'],
browser: {
enabled: true,
provider,
instances,
headless: true,
},
},
})
21 changes: 21 additions & 0 deletions test/browser/specs/mocking.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,24 @@ test('mocking out of root', async () => {
expect(vitest.stdout).toReportPassedTest('basic.test.js', browser)
})
})

// fix https://github.com/vitest-dev/vitest/issues/11519
test('mocks from a setup file apply to static imports of a test file', async () => {
const result = await runVitest({
root: 'fixtures/mocking-setup-file',
})

onTestFailed(() => {
console.error(result.stdout)
console.error(result.stderr)
})

expect(result.stderr).toReportNoErrors()

instances.forEach(({ browser }) => {
expect(result.stdout).toReportPassedTest('static-import.test.ts', browser)
expect(result.stdout).toReportPassedTest('dynamic-import.test.ts', browser)
})

expect(result.exitCode).toBe(0)
})
Loading