Skip to content

fix(jest-mock): do not restore mocks when jest.resetAllMocks() is called #13866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SimenB merged 16 commits into from
Feb 15, 2023
Merged

fix(jest-mock): do not restore mocks when jest.resetAllMocks() is called #13866

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c971ab1
fix(jest-mock): do not restore mocks when `jest.resetAllMocks()` is c…
mrazauskas Feb 7, 2023
8e5b4c6
always clear mocks before restoring
mrazauskas Feb 7, 2023
bcc33cf
more tests
mrazauskas Feb 7, 2023
ae5ec45
rebase
mrazauskas Feb 8, 2023
aaedbfc
fix?
mrazauskas Feb 8, 2023
d2f0dd8
better call `mockReset()`
mrazauskas Feb 8, 2023
18877e4
handle property accessors
mrazauskas Feb 8, 2023
7c37365
factor out `attachMockImplementation`
mrazauskas Feb 8, 2023
2da3e7c
refactor methods
mrazauskas Feb 8, 2023
76d6f00
cleaner
mrazauskas Feb 8, 2023
25df462
add changelog entry
mrazauskas Feb 8, 2023
4ca3ae2
revert "refactor methods"
mrazauskas Feb 8, 2023
4658081
use optional chaining
mrazauskas Feb 8, 2023
88fef34
dispose state
mrazauskas Feb 8, 2023
4991bea
perf: no need to reset before restoring
mrazauskas Feb 8, 2023
883721a
Merge branch 'main' into fix-do-not-restore-mocks-when-jest.resetAllM…
SimenB Feb 10, 2023
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
Prev Previous commit
Next Next commit
better call mockReset()
  • Loading branch information
@mrazauskas
mrazauskas committed Feb 8, 2023
commit d2f0dd8050e5a81317474563a43ecddeb886f23f
3 changes: 1 addition & 2 deletions packages/jest-mock/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,8 +787,7 @@ export class ModuleMocker {
};

f.mockRestore = () => {
f.mockClear();
this._mockConfigRegistry.delete(f);
f.mockClear().mockReset();

if (spyState != null) {
spyState.restore();
Expand Down