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

ObjectContaining no longer tries to track exact mismatches

Browse Source 
- equals wasn't looking at it anyways, so just bail as soon as something
  is different.
This commit is contained in:
slackersoft
2014-12-05 08:06:20 -08:00
parent 4d5f27d359
commit 02161b7d48
4 changed files with 12 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -948,7 +948,7 @@ getJasmineRequireObj().Any = function() {
if (this.expectedObject == Object) { if (this.expectedObject == Object) {
return typeof other == 'object'; return typeof other == 'object';
} }
if (this.expectedObject == Boolean) { if (this.expectedObject == Boolean) {
return typeof other == 'boolean'; return typeof other == 'boolean';
} }
@@ -1545,26 +1545,21 @@ getJasmineRequireObj().ObjectContaining = function(j$) {
this.sample = sample; this.sample = sample;
} }
ObjectContaining.prototype.jasmineMatches = function(other, mismatchKeys, mismatchValues) { ObjectContaining.prototype.jasmineMatches = function(other) {
if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); } if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); }
mismatchKeys = mismatchKeys || [];
mismatchValues = mismatchValues || [];
var hasKey = function(obj, keyName) { var hasKey = function(obj, keyName) {
return obj !== null && !j$.util.isUndefined(obj[keyName]); return obj !== null && !j$.util.isUndefined(obj[keyName]);
}; };
for (var property in this.sample) { for (var property in this.sample) {
if (!hasKey(other, property) && hasKey(this.sample, property)) { if (!hasKey(other, property) && hasKey(this.sample, property) ||
mismatchKeys.push('expected has key \'' + property + '\', but missing from actual.'); !j$.matchersUtil.equals(other[property], this.sample[property])) {
} return false;
else if (!j$.matchersUtil.equals(other[property], this.sample[property])) {
mismatchValues.push('\'' + property + '\' was \'' + (other[property] ? j$.util.htmlEscape(other[property].toString()) : other[property]) + '\' in actual, but was \'' + (this.sample[property] ? j$.util.htmlEscape(this.sample[property].toString()) : this.sample[property]) + '\' in expected.');
} }
} }
return (mismatchKeys.length === 0 && mismatchValues.length === 0); return true;
}; };
ObjectContaining.prototype.jasmineToString = function() { ObjectContaining.prototype.jasmineToString = function() {

24
spec/core/ObjectContainingSpec.js
View File

@@ -31,30 +31,6 @@ describe("ObjectContaining", function() {
expect(containing.jasmineMatches({foo: "fooVal", bar: "barVal"})).toBe(false); expect(containing.jasmineMatches({foo: "fooVal", bar: "barVal"})).toBe(false);
}); });
it("mismatchValues parameter must return array with mismatched reason", function() {
var containing = new j$.ObjectContaining({foo: "other"});
var mismatchKeys = [];
var mismatchValues = [];
containing.jasmineMatches({foo: "fooVal", bar: "barVal"}, mismatchKeys, mismatchValues);
expect(mismatchValues.length).toBe(1);
expect(mismatchValues[0]).toEqual("'foo' was 'fooVal' in actual, but was 'other' in expected.");
});
it("adds keys in expected but not actual to the mismatchKeys parameter", function() {
var containing = new j$.ObjectContaining({foo: "fooVal"});
var mismatchKeys = [];
var mismatchValues = [];
containing.jasmineMatches({bar: "barVal"}, mismatchKeys, mismatchValues);
expect(mismatchKeys.length).toBe(1);
expect(mismatchKeys[0]).toEqual("expected has key 'foo', but missing from actual.");
});
it("jasmineToString's itself", function() { it("jasmineToString's itself", function() {
var containing = new j$.ObjectContaining({}); var containing = new j$.ObjectContaining({});

2
src/core/Any.js
View File

@@ -20,7 +20,7 @@ getJasmineRequireObj().Any = function() {
if (this.expectedObject == Object) { if (this.expectedObject == Object) {
return typeof other == 'object'; return typeof other == 'object';
} }
if (this.expectedObject == Boolean) { if (this.expectedObject == Boolean) {
return typeof other == 'boolean'; return typeof other == 'boolean';
} }

15
src/core/ObjectContaining.js
View File

@@ -4,26 +4,21 @@ getJasmineRequireObj().ObjectContaining = function(j$) {
this.sample = sample; this.sample = sample;
} }
ObjectContaining.prototype.jasmineMatches = function(other, mismatchKeys, mismatchValues) { ObjectContaining.prototype.jasmineMatches = function(other) {
if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); } if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); }
mismatchKeys = mismatchKeys || [];
mismatchValues = mismatchValues || [];
var hasKey = function(obj, keyName) { var hasKey = function(obj, keyName) {
return obj !== null && !j$.util.isUndefined(obj[keyName]); return obj !== null && !j$.util.isUndefined(obj[keyName]);
}; };
for (var property in this.sample) { for (var property in this.sample) {
if (!hasKey(other, property) && hasKey(this.sample, property)) { if (!hasKey(other, property) && hasKey(this.sample, property) ||
mismatchKeys.push('expected has key \'' + property + '\', but missing from actual.'); !j$.matchersUtil.equals(other[property], this.sample[property])) {
} return false;
else if (!j$.matchersUtil.equals(other[property], this.sample[property])) {
mismatchValues.push('\'' + property + '\' was \'' + (other[property] ? j$.util.htmlEscape(other[property].toString()) : other[property]) + '\' in actual, but was \'' + (this.sample[property] ? j$.util.htmlEscape(this.sample[property].toString()) : this.sample[property]) + '\' in expected.');
} }
} }
return (mismatchKeys.length === 0 && mismatchValues.length === 0); return true;
}; };
ObjectContaining.prototype.jasmineToString = function() { ObjectContaining.prototype.jasmineToString = function() {