Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f39d750
Expect only overrides error stack for built-in matchers
bvaughn Dec 22, 2017
e7d9bbd
Fixed naggy lint issue
bvaughn Dec 22, 2017
9c10921
Replaced for...of with Object.keys().forEach()
bvaughn Dec 22, 2017
eb5d29c
Merged master
bvaughn Jan 2, 2018
ea088cf
Removed JestAssertionError export (as it is no longer needed)
bvaughn Jan 2, 2018
f2e7335
Added custom matcher test
bvaughn Jan 2, 2018
3e00753
Adjusted custom_matcher test to use prettified, non-absolute stack
bvaughn Jan 3, 2018
9e0cfae
test: refactor integration test
SimenB Jan 3, 2018
31f8e58
update with correct snapshot
SimenB Jan 3, 2018
c388a49
test: skip on windows
SimenB Jan 3, 2018
0c5c78c
Clarified comment
bvaughn Jan 3, 2018
5843ab5
Further clarified comment
bvaughn Jan 3, 2018
f902b4b
test: fix test for node 6
SimenB Jan 3, 2018
bd21922
test: move custom matcher stack to separate file to be able to skip i…
SimenB Jan 3, 2018
3ef09ea
Revert "test: fix test for node 6"
SimenB Jan 3, 2018
f88bf07
test: really fix node 6
SimenB Jan 3, 2018
ff50df6
Merge branch 'master' into override-error-stack-only-for-internal-mat…
SimenB Jan 4, 2018
2da0eee
docs: add package prefix to changelog
SimenB Jan 4, 2018
6f6dd91
Merge branch 'master' into override-error-stack-only-for-internal-mat…
bvaughn Jan 4, 2018
e8ab539
Reverted unrelated Markdown changes that had made their way into the …
bvaughn Jan 4, 2018
7dad466
Replaced '__jestInternal' string attribute with a Symbol
bvaughn Jan 4, 2018
179093c
Merge branch 'master' into override-error-stack-only-for-internal-mat…
bvaughn Jan 5, 2018
b8c6bfe
Updated snapshot
bvaughn Jan 5, 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 override-error-stack-only-for-internal-mat…
…chers
  • Loading branch information
SimenB committed Jan 4, 2018
commit ff50df6a3eebe5b783f5a1fe2ed9bbf579573660
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
with git. ([#5189](https://github.com/facebook/jest/pull/5189))
* `[jest-config]` fix unexpected condition to avoid infinite recursion in
Windows platform. ([#5161](https://github.com/facebook/jest/pull/5161))
* `[jest-regex-util]` Fix breaking change in `--testPathPattern`
([#5230](https://github.com/facebook/jest/pull/5230))
* Do not override `Error` stack (with `Error.captureStackTrace`) for custom matchers.
([#5162](https://github.com/facebook/jest/pull/5162))

Expand Down Expand Up @@ -1354,4 +1356,4 @@ See https://facebook.github.io/jest/blog/2016/12/15/2016-in-jest.html

## <=0.4.0

* See commit history for changes in previous versions of jest.
* See commit history for changes in previous versions of jest.
You are viewing a condensed version of this merge commit. You can view the full changes here.