Skip to content

Commit bcd8bf2

Browse files
committed
Changelog + Jasmine 2.5.2 patch.
1 parent 1c1aa3b commit bcd8bf2

File tree

2 files changed

+29
-13
lines changed

2 files changed

+29
-13
lines changed

CHANGELOG.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
## master
22

3-
* `--json` now includes information about individual tests inside a file.
3+
## jest 17.0.0
4+
5+
* Added `expect.extend`.
6+
* Properly resolve modules with platform extensions on react-native.
7+
* Added support for custom snapshots serializers.
8+
* Updated to Jasmine 2.5.2.
9+
* Big diffs are now collapsed by default in snapshots and assertions. Added `--expand` (or `-e`) to show the full diff.
10+
* Replaced `scriptPreprocessor` with the new `transform` option.
11+
* Added `jest.resetMocks` which replaces `jest.clearAllMocks`.
12+
* Fixes for react-native preset.
13+
* Fixes for global built in objects in `jest-environment-node`.
14+
* Create mock objects in the vm context instead of the parent context.
15+
* `.babelrc` is now part of the transform cache key in `babel-jest`.
16+
* Fixes for docblock parsing with haste modules.
17+
* Exit with the proper code when the coverage threshold is not reached.
18+
* Implemented file watching in `jest-haste-map`.
19+
* `--json` now includes information about individual tests inside a file.
420

521
## jest 16.0.2
622

packages/jest-jasmine2/vendor/jasmine-2.5.2.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2981,9 +2981,9 @@ getJasmineRequireObj().matchersUtil = function(j$) {
29812981

29822982
while (size--) {
29832983
key = aKeys[size];
2984+
29842985
// Deep compare each member
2985-
// CUSTOM JEST CHANGE: don't check for keys here.
2986-
result = /*has(b, key) && */eq(a[key], b[key], aStack, bStack, customTesters);
2986+
result = has(b, key) && eq(a[key], b[key], aStack, bStack, customTesters);
29872987

29882988
if (!result) {
29892989
return false;
@@ -2996,16 +2996,16 @@ getJasmineRequireObj().matchersUtil = function(j$) {
29962996
return result;
29972997

29982998
function keys(obj, isArray) {
2999-
var allKeys = Object.keys ? Object.keys(obj) :
3000-
(function(o) {
3001-
var keys = [];
3002-
for (var key in o) {
3003-
if (has(o, key)) {
3004-
keys.push(key);
3005-
}
3006-
}
3007-
return keys;
3008-
})(obj);
2999+
// CUSTOM JEST CHANGE: don't consider undefined keys.
3000+
var allKeys = (function(o) {
3001+
var keys = [];
3002+
for (var key in o) {
3003+
if (has(o, key)) {
3004+
keys.push(key);
3005+
}
3006+
}
3007+
return keys;
3008+
})(obj);
30093009

30103010
if (!isArray) {
30113011
return allKeys;

0 commit comments

Comments
 (0)