fix(mocker)!: don't restore mock to the original if module is mocked (#…

…3518)
vitest-dev · Jun 6, 2023 · c1004e1 · c1004e1
1 parent 821126f
commit c1004e1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/examples/mocks/test/automocking.spec.ts b/examples/mocks/test/automocking.spec.ts
@@ -56,8 +56,8 @@ test('automock properly restores mock', async () => {
     log.warn()
   }).not.toThrow()
 
-  expect(moduleWithSymbol[methodSymbol]()).toBe('hello')
-  expect(moduleWithSymbol.warn()).toBe('hello')
+  expect(moduleWithSymbol[methodSymbol]()).toBe(undefined)
+  expect(moduleWithSymbol.warn()).toBe(undefined)
 
   expect(log.warn).toHaveProperty('mockImplementation')
 })

diff --git a/packages/vitest/src/runtime/mocker.ts b/packages/vitest/src/runtime/mocker.ts
@@ -296,7 +296,7 @@ export class VitestMocker {
           const mock = spyOn(newContainer, property).mockImplementation(() => undefined)
           mock.mockRestore = () => {
             mock.mockReset()
-            mock.mockImplementation(undefined!)
+            mock.mockImplementation(() => undefined)
             return mock
           }
           // tinyspy retains length, but jest doesn't.

diff --git a/test/core/test/mocked-no-mocks.test.ts b/test/core/test/mocked-no-mocks.test.ts
@@ -15,6 +15,7 @@ test('mocking several modules work', () => {
 
   mockedB()
 
-  expect(mockedA).toHaveBeenCalledTimes(2)
+  // mockedA is not called because mockedB is restored to be undefined
+  expect(mockedA).toHaveBeenCalledTimes(1)
   expect(mockedB).toHaveBeenCalledTimes(1)
 })