warren/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'fix-eq-for-edge' of https://github.com/everedifice/jasmine into everedifice-fix-eq-for-edge

Browse Source 
- Merges #1041
This commit is contained in:
Gregg Van Hove
2016-02-18 16:47:16 -08:00
parent 5bdd7e8fbf 3f27ff1c7c
commit 7224c6adf2
2 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/jasmine-core/jasmine.js
View File

@@ -2880,22 +2880,23 @@ getJasmineRequireObj().matchersUtil = function(j$) {
return false;
}
}
// Deep compare objects.
for (var key in a) {
if (has(a, key)) {
// Count the expected number of properties.
size++;
// Deep compare each member.
if (!(result = has(b, key) && eq(a[key], b[key], aStack, bStack, customTesters))) { break; }
var aKeys = keys(a), key;
size = aKeys.length;
// Ensure that both objects contain the same number of properties before comparing deep equality.
if (keys(b).length !== size) { return false; }
while (size--) {
key = aKeys[size];
// Deep compare each member
result = has(b, key) && eq(a[key], b[key], aStack, bStack, customTesters);
if (!result) {
return false;
}
}
// Ensure that both objects contain the same number of properties.
if (result) {
for (key in b) {
if (has(b, key) && !(size--)) { break; }
}
result = !size;
}
}
// Remove the first object from the stack of traversed objects.
aStack.pop();
@@ -2903,6 +2904,19 @@ getJasmineRequireObj().matchersUtil = function(j$) {
return result;
function keys(obj) {
return Object.keys ? Object.keys(obj) :
(function(o) {
var keys = [];
for (var key in o) {
if (has(o, key)) {
keys.push(key);
}
}
return keys;
})(obj);
}
function has(obj, key) {
return Object.prototype.hasOwnProperty.call(obj, key);
}

40
src/core/matchers/matchersUtil.js
View File

@@ -175,22 +175,23 @@ getJasmineRequireObj().matchersUtil = function(j$) {
return false;
}
}
// Deep compare objects.
for (var key in a) {
if (has(a, key)) {
// Count the expected number of properties.
size++;
// Deep compare each member.
if (!(result = has(b, key) && eq(a[key], b[key], aStack, bStack, customTesters))) { break; }
var aKeys = keys(a), key;
size = aKeys.length;
// Ensure that both objects contain the same number of properties before comparing deep equality.
if (keys(b).length !== size) { return false; }
while (size--) {
key = aKeys[size];
// Deep compare each member
result = has(b, key) && eq(a[key], b[key], aStack, bStack, customTesters);
if (!result) {
return false;
}
}
// Ensure that both objects contain the same number of properties.
if (result) {
for (key in b) {
if (has(b, key) && !(size--)) { break; }
}
result = !size;
}
}
// Remove the first object from the stack of traversed objects.
aStack.pop();
@@ -198,6 +199,19 @@ getJasmineRequireObj().matchersUtil = function(j$) {
return result;
function keys(obj) {
return Object.keys ? Object.keys(obj) :
(function(o) {
var keys = [];
for (var key in o) {
if (has(o, key)) {
keys.push(key);
}
}
return keys;
})(obj);
}
function has(obj, key) {
return Object.prototype.hasOwnProperty.call(obj, key);
}