Skip to content

Add mock return matchers #5879

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
cpojer merged 12 commits into from
May 4, 2018
Merged

Add mock return matchers #5879

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7a3cf01
Add toReturnValues and toHaveReturnedValues
rickhanlonii Mar 27, 2018
e25cc3c
Fix typos
rickhanlonii Mar 27, 2018
9c7ec28
Add spy matchers to pair with called
rickhanlonii Apr 18, 2018
19aada6
Clean up matchers
rickhanlonii Apr 22, 2018
c8d094b
Update docs
rickhanlonii Apr 22, 2018
64640a6
rm dupe note
rickhanlonii Apr 22, 2018
22b6884
Updates based on feedback
rickhanlonii Apr 29, 2018
3603150
Remove quotes
rickhanlonii Apr 29, 2018
c722a08
Update changelog
rickhanlonii Apr 29, 2018
d3d1b5a
Merge branch 'master' into rh-return-matchers
rickhanlonii Apr 29, 2018
19bbe7c
Revert this
rickhanlonii Apr 29, 2018
e8a669a
Lint md
rickhanlonii Apr 29, 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 branch 'master' into rh-return-matchers
  • Loading branch information
@rickhanlonii
rickhanlonii authored Apr 29, 2018
commit d3d1b5a4f8d74c611ca1010b1e61d1a3542f8319
11 changes: 10 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@
([#5826](https://github.com/facebook/jest/pull/5826))
* `[jest-cli]` Interactive Snapshot Mode improvements
([#5864](https://github.com/facebook/jest/pull/5864))
* `[jest-editor-support]` Add `no-color` option to runner
([#5909](https://github.com/facebook/jest/pull/5909))
* Pretty-print non-Error object errors
([#5980](https://github.com/facebook/jest/pull/5980))
* `[jest-message-util]` Include column in stack frames
([#5889](https://github.com/facebook/jest/pull/5889))
* `[expect]` Introduce toStrictEqual
([#6032](https://github.com/facebook/jest/pull/6032))
* `[expect]` Add return matchers
([#5879](https://github.com/facebook/jest/pull/5879))

Expand Down Expand Up @@ -895,7 +903,8 @@
* Fix issue mocking bound method
([#3805](https://github.com/facebook/jest/pull/3805))
* Fix jest-circus ([#4290](https://github.com/facebook/jest/pull/4290))
* Fix lint warning in master
* Fix lint warning in

([#4132](https://github.com/facebook/jest/pull/4132))
* Fix linting ([#3946](https://github.com/facebook/jest/pull/3946))
* fix merge conflict ([#4144](https://github.com/facebook/jest/pull/4144))
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.