Merge branch 'ksvitkovsky-github-1388'

- Closes #1408 from @ksvitkovsky
- Fixes #1388
This commit is contained in:
Gregg Van Hove
2017-08-04 10:27:55 -07:00
2 changed files with 8 additions and 4 deletions

View File

@@ -570,9 +570,9 @@ describe("toEqual", function() {
it("does not report a mismatch when asymmetric matchers are satisfied", function() {
var actual = {a: 'a'},
expected = {a: jasmineUnderTest.any(String)},
message = 'Expected $.a = 1 to equal <jasmine.any(String)>.';
expected = {a: jasmineUnderTest.any(String)};
expect(compareEquals(actual, expected).message).toEqual('');
expect(compareEquals(actual, expected).pass).toBe(true)
});

View File

@@ -66,13 +66,17 @@ getJasmineRequireObj().matchersUtil = function(j$) {
if (asymmetricA) {
result = a.asymmetricMatch(b, customTesters);
diffBuilder.record(a, b);
if (!result) {
diffBuilder.record(a, b);
}
return result;
}
if (asymmetricB) {
result = b.asymmetricMatch(a, customTesters);
diffBuilder.record(a, b);
if (!result) {
diffBuilder.record(a, b);
}
return result;
}
}