Skip to content

fix: stop changing the behaviour of spies on mockFn.mockReset #13692

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 11 commits into from
Jan 6, 2023
+36 −3
Merged

fix: stop changing the behaviour of spies on mockFn.mockReset #13692

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
da7cb94
resetMock now returns original value instead of undefined
feliperli Dec 23, 2022
a7efd83
reset all gives back the previous state
feliperli Jan 2, 2023
72c5ab4
Merge branch 'main' into stopChangingBehaviorMockReset
SimenB Jan 3, 2023
f86aa23
add e2e mock reset test
feliperli Jan 3, 2023
cda42a3
update changelog
feliperli Jan 3, 2023
c92375f
update docs
feliperli Jan 3, 2023
c85c62e
Merge branch 'main' into stopChangingBehaviorMockReset
SimenB Jan 4, 2023
36b8ac7
move changelog entry
SimenB Jan 4, 2023
961c562
resolves type conflict
feliperli Jan 4, 2023
69cdb87
change e2e to unit test
feliperli Jan 6, 2023
ba31a1f
adjust to moduleMocker
feliperli Jan 6, 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
resolves type conflict
  • Loading branch information
@feliperli
feliperli committed Jan 4, 2023
commit 961c562998499577c9095ef81944e7809605de49
2 changes: 1 addition & 1 deletion packages/jest-mock/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@ export class ModuleMocker {
return original.apply(this, arguments);
});
}
this._originalFn.set(object[methodKey], original);
this._originalFn.set(object[methodKey] as Mock, original);
return object[methodKey] as Mock;
}

Expand Down