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

Just return the result directly from any and objectContaining

Browse Source 
- They return false when they fail which means not equal.
This commit is contained in:
slackersoft
2014-12-02 07:56:40 -08:00
parent dc7be9c55e
commit b68ba90ad7
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2241,24 +2241,15 @@ getJasmineRequireObj().matchersUtil = function(j$) {
} }
if (a instanceof j$.Any) { if (a instanceof j$.Any) {
result = a.jasmineMatches(b); return a.jasmineMatches(b);
if (result) {
return true;
}
} }
if (b instanceof j$.Any) { if (b instanceof j$.Any) {
result = b.jasmineMatches(a); return b.jasmineMatches(a);
if (result) {
return true;
}
} }
if (b instanceof j$.ObjectContaining) { if (b instanceof j$.ObjectContaining) {
result = b.jasmineMatches(a); return b.jasmineMatches(a);
if (result) {
return true;
}
} }
if (a instanceof Error && b instanceof Error) { if (a instanceof Error && b instanceof Error) {

15
src/core/matchers/matchersUtil.js
View File

@@ -64,24 +64,15 @@ getJasmineRequireObj().matchersUtil = function(j$) {
} }
if (a instanceof j$.Any) { if (a instanceof j$.Any) {
result = a.jasmineMatches(b); return a.jasmineMatches(b);
if (result) {
return true;
}
} }
if (b instanceof j$.Any) { if (b instanceof j$.Any) {
result = b.jasmineMatches(a); return b.jasmineMatches(a);
if (result) {
return true;
}
} }
if (b instanceof j$.ObjectContaining) { if (b instanceof j$.ObjectContaining) {
result = b.jasmineMatches(a); return b.jasmineMatches(a);
if (result) {
return true;
}
} }
if (a instanceof Error && b instanceof Error) { if (a instanceof Error && b instanceof Error) {