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

ObjectContaining wrong filed value error message

Browse Source
This commit is contained in:
Albert Andrejev
2013-06-21 15:16:41 +03:00
parent 582ad6512a
commit 7acc6b327a
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec/core/ObjectContainingSpec.js
+13
View File
@@ -30,6 +30,19 @@ 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("jasmineToString's itself", function() { it("jasmineToString's itself", function() {
var containing = new j$.ObjectContaining({}); var containing = new j$.ObjectContaining({});
src/core/ObjectContaining.js
+1 -1
View File
@@ -17,7 +17,7 @@ getJasmineRequireObj().ObjectContaining = function(j$) {
mismatchKeys.push("expected has key '" + property + "', but missing from actual."); mismatchKeys.push("expected has key '" + property + "', but missing from actual.");
} }
else if (!j$.matchersUtil.equals(this.sample[property], other[property], mismatchKeys, mismatchValues)) { else if (!j$.matchersUtil.equals(this.sample[property], other[property], mismatchKeys, mismatchValues)) {
mismatchValues.push("'" + property + "' was '" + (other[property] ? j$.util.htmlEscape(other[property].toString()) : other[property]) + "' in expected, but was '" + (this.sample[property] ? j$.util.htmlEscape(this.sample[property].toString()) : this.sample[property]) + "' in actual."); 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.");
} }
} }