fix: fix mock race condition

vitest-dev · Dec 12, 2024 · 2ce84d0 · 2ce84d0
1 parent 4e60333
commit 2ce84d0
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/packages/vitest/src/runtime/execute.ts b/packages/vitest/src/runtime/execute.ts
@@ -272,9 +272,7 @@ export class VitestExecutor extends ViteNodeRunner {
   }
 
   async resolveUrl(id: string, importer?: string) {
-    if (VitestMocker.pendingIds.length) {
-      await this.mocker.resolveMocks()
-    }
+    await this.mocker.resolveMocks()
 
     if (importer && importer.startsWith('mock:')) {
       importer = importer.slice(5)

diff --git a/packages/vitest/src/runtime/mocker.ts b/packages/vitest/src/runtime/mocker.ts
@@ -19,6 +19,7 @@ interface MockContext {
 
 export class VitestMocker {
   static pendingIds: PendingSuiteMock[] = []
+  static pendingResolve?: Promise<unknown>
   private spyModule?: typeof import('@vitest/spy')
   private primitives: {
     Object: typeof Object
@@ -159,12 +160,14 @@ export class VitestMocker {
   }
 
   public async resolveMocks() {
-    if (!VitestMocker.pendingIds.length) {
+    await VitestMocker.pendingResolve
+    const pendingIds = VitestMocker.pendingIds
+    if (pendingIds.length === 0) {
       return
     }
-
-    await Promise.all(
-      VitestMocker.pendingIds.map(async (mock) => {
+    VitestMocker.pendingIds = []
+    VitestMocker.pendingResolve = Promise.all(
+      pendingIds.map(async (mock) => {
         const { fsPath, external } = await this.resolvePath(
           mock.id,
           mock.importer,
@@ -183,8 +186,7 @@ export class VitestMocker {
         }
       }),
     )
-
-    VitestMocker.pendingIds = []
+    await VitestMocker.pendingResolve
   }
 
   private async callFunctionMock(dep: string, mock: ManualMockedModule) {

diff --git a/test/core/test/mocking/race-condition-mocked.ts b/test/core/test/mocking/race-condition-mocked.ts
@@ -0,0 +1 @@
+export default 'original'
diff --git a/test/core/test/mocking/race-condition.spec.ts b/test/core/test/mocking/race-condition.spec.ts
@@ -0,0 +1,22 @@
+import { expect, test, vi } from 'vitest'
+
+vi.mock('./race-condition-mocked', () => ({ default: 'mocked' }))
+
+test('import in parallel', async () => {
+  const all = await Promise.all([
+    import('./race-condition-mocked').then(v => v.default),
+    import('./race-condition-mocked').then(v => v.default),
+    import('./race-condition-mocked').then(v => v.default),
+    import('./race-condition-mocked').then(v => v.default),
+    import('./race-condition-mocked').then(v => v.default),
+  ])
+  expect(all).toMatchInlineSnapshot(`
+    [
+      "mocked",
+      "mocked",
+      "mocked",
+      "mocked",
+      "mocked",
+    ]
+  `)
+})