Skip to content
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

[expect] Improve mock "return" matchers to properly handle calls that throw #6172

Merged
merged 7 commits into from
May 22, 2018
+675 −98
Merged

[expect] Improve mock "return" matchers to properly handle calls that throw #6172

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6603c8e
Improve mock "return" matchers to properly handle calls that throw
UselessPickles May 12, 2018
cd50a53
Fix unit test that was broken because expect().toThrow() does not
UselessPickles May 12, 2018
9265208
update CHANGELOG
UselessPickles May 12, 2018
8fbc2e9
Fix comment typo
UselessPickles May 12, 2018
cc7508f
Simplify structure of how mock function results are maintained.
UselessPickles May 16, 2018
0c8c4d3
Merge from master
UselessPickles May 16, 2018
006f616
Merge from remote/master
UselessPickles May 22, 2018
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
Merge from master
@UselessPickles
UselessPickles committed May 16, 2018

Verified

This commit was signed with the committer’s verified signature. The key has expired.
danielleadams Danielle Adams
GPG key ID: D3A89613643B6201
Expired
Verified
Learn about vigilant mode
commit 0c8c4d38cfbfd554ce1f1e7b622864999dc1f3c5
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -88,6 +88,8 @@
([#6032](https://github.com/facebook/jest/pull/6032))
* `[expect]` Add return matchers
([#5879](https://github.com/facebook/jest/pull/5879))
* `[jest-cli]` Improve snapshot summaries
([#6181](https://github.com/facebook/jest/pull/6181))
* `[expect]` Improve return matchers
([#6172](https://github.com/facebook/jest/pull/6172))

You are viewing a condensed version of this merge commit. You can view the full changes here.