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

Merge branch 'ksvitkovsky-github-1388'

Browse Source 
- Closes #1408 from @ksvitkovsky
- Fixes #1388
This commit is contained in:
Gregg Van Hove
2017-08-04 10:27:55 -07:00
parent 8dd0ad531c 1db81c334d
commit 8c0a8a1b33
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec/core/matchers/toEqualSpec.js
+2 -2
View File
@@ -570,9 +570,9 @@ describe("toEqual", function() {
it("does not report a mismatch when asymmetric matchers are satisfied", function() { it("does not report a mismatch when asymmetric matchers are satisfied", function() {
var actual = {a: 'a'}, var actual = {a: 'a'},
expected = {a: jasmineUnderTest.any(String)}, expected = {a: jasmineUnderTest.any(String)};
message = 'Expected $.a = 1 to equal <jasmine.any(String)>.';
expect(compareEquals(actual, expected).message).toEqual('');
expect(compareEquals(actual, expected).pass).toBe(true) expect(compareEquals(actual, expected).pass).toBe(true)
}); });
src/core/matchers/matchersUtil.js
+6 -2
View File
@@ -66,13 +66,17 @@ getJasmineRequireObj().matchersUtil = function(j$) {
if (asymmetricA) { if (asymmetricA) {
result = a.asymmetricMatch(b, customTesters); result = a.asymmetricMatch(b, customTesters);
diffBuilder.record(a, b); if (!result) {
diffBuilder.record(a, b);
}
return result; return result;
} }
if (asymmetricB) { if (asymmetricB) {
result = b.asymmetricMatch(a, customTesters); result = b.asymmetricMatch(a, customTesters);
diffBuilder.record(a, b); if (!result) {
diffBuilder.record(a, b);
}
return result; return result;
} }
} }