Skip to content

Correctly merge property matchers with the rest of the snapshot in toMatchSnapshot. #6528

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
thymikee merged 12 commits into from
Aug 9, 2018
Merged

Correctly merge property matchers with the rest of the snapshot in toMatchSnapshot. #6528

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a88a7c0
deep merge property matchers in snapshot objects
swcisel Jun 23, 2018
994e09e
Update index.js
swcisel Jun 23, 2018
cbf8f6b
Update CHANGELOG.md
swcisel Jun 23, 2018
7ac7f4d
moved deepMerge to jest-snapshot utils.
swcisel Jun 24, 2018
a3b32ed
Merge remote-tracking branch 'origin/master' into full_snapshot_with_…
rickhanlonii Jul 12, 2018
74796b0
Update changelog
rickhanlonii Jul 12, 2018
d17e7f6
Update deepmerge tests
rickhanlonii Jul 12, 2018
1b8dd70
Add errors for invalid property matchers
rickhanlonii Jul 12, 2018
deb016c
Update changelog
rickhanlonii Jul 12, 2018
7032a35
Merge branch 'master' into full_snapshot_with_property_matcher
SimenB Jul 16, 2018
e4fbf98
Merge branch 'master' into full_snapshot_with_property_matcher
thymikee Aug 8, 2018
3902a22
Merge branch 'master' into full_snapshot_with_property_matcher
thymikee Aug 9, 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
Merge branch 'master' into full_snapshot_with_property_matcher
  • Loading branch information
@thymikee
thymikee authored Aug 9, 2018
commit 3902a22bdc65742481f6d454972300284965af6e
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
- `[jest-config]` Update default config for testURL from 'about:blank' to 'http://localhost' to address latest JSDOM security warning. ([#6792](https://github.com/facebook/jest/pull/6792))
- `[jest-cli]` Fix `testMatch` not working with negations ([#6648](https://github.com/facebook/jest/pull/6648))
- `[jest-cli]` Don't report promises as open handles ([#6716](https://github.com/facebook/jest/pull/6716))
- `[jest-each]` Add timeout support to parameterised tests ([#6660](https://github.com/facebook/jest/pull/6660))
- `[jest-cli]` Improve the message when running coverage while there are no files matching global threshold ([#6334](https://github.com/facebook/jest/pull/6334))
- `[jest-snapshot]` Correctly merge property matchers with the rest of the snapshot in `toMatchSnapshot`. ([#6528](https://github.com/facebook/jest/pull/6528))
- `[jest-snapshot]` Add error messages for invalid property matchers. ([#6528](https://github.com/facebook/jest/pull/6528))

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