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

Extracted the predicate version of toThrowError into its own matcher

Browse Source 
This simplifies the signature of each matcher to something that jsdoc
can actually handle.

[Finishes #20622765]
This commit is contained in:
Steve Gravrock
2017-11-28 09:16:09 -08:00
parent b7e4c1e779
commit 9619acf91f
6 changed files with 218 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/matchers/toThrowError.js
View File

@@ -56,8 +56,6 @@ getJasmineRequireObj().toThrowError = function(j$) {
if (isAnErrorType(arguments[1])) {
return exactMatcher(null, arguments[1]);
} else if (j$.isFunction_(arguments[1])) {
return predicateMatcher(arguments[1]);
} else {
return exactMatcher(arguments[1], null);
}
@@ -74,30 +72,12 @@ getJasmineRequireObj().toThrowError = function(j$) {
};
}
function predicateMatcher(predicate) {
return {
match: function(thrown) {
if (predicate(thrown)) {
return pass(function() {
return 'Expected function not to throw an exception matching a predicate.';
});
} else {
return fail(function() {
return 'Expected function to throw an exception matching a predicate, ' +
'but it threw ' + j$.fnNameFor(thrown.constructor) + ' with message ' +
j$.pp(thrown.message) + '.';
});
}
}
};
}
function exactMatcher(expected, errorType) {
if (expected && !isStringOrRegExp(expected)) {
if (errorType) {
throw new Error(getErrorMsg('Expected error message is not a string or RegExp.'));
} else {
throw new Error(getErrorMsg('Expected is not an Error, string, RegExp, or Function.'));
throw new Error(getErrorMsg('Expected is not an Error, string, or RegExp.'));
}
}