Check for ObjectContaining on either side of equality.
- Also clean up `undefined` check. Fixes #682
This commit is contained in:
@@ -7,13 +7,9 @@ getJasmineRequireObj().ObjectContaining = function(j$) {
|
||||
ObjectContaining.prototype.asymmetricMatch = function(other) {
|
||||
if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); }
|
||||
|
||||
var hasKey = function(obj, keyName) {
|
||||
return obj !== null && !j$.util.isUndefined(obj[keyName]);
|
||||
};
|
||||
|
||||
for (var property in this.sample) {
|
||||
if (!hasKey(other, property) && hasKey(this.sample, property) ||
|
||||
!j$.matchersUtil.equals(other[property], this.sample[property])) {
|
||||
if (!Object.prototype.hasOwnProperty.call(other, property) ||
|
||||
!j$.matchersUtil.equals(this.sample[property], other[property])) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -71,6 +71,10 @@ getJasmineRequireObj().matchersUtil = function(j$) {
|
||||
return b.asymmetricMatch(a);
|
||||
}
|
||||
|
||||
if (a instanceof j$.ObjectContaining) {
|
||||
return a.asymmetricMatch(b);
|
||||
}
|
||||
|
||||
if (b instanceof j$.ObjectContaining) {
|
||||
return b.asymmetricMatch(a);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user