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

Use instanceof when checking Error types in toThrowError

Browse Source 
Fixes #819
This commit is contained in:
Gregg Van Hove
2015-04-09 15:36:59 -07:00
parent 7cd8c41d31
commit ff029b37b5
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/core/matchers/toThrowErrorSpec.js
View File

@@ -170,7 +170,6 @@ describe("toThrowError", function() {
result; result;
CustomError.prototype = new Error(); CustomError.prototype = new Error();
CustomError.prototype.constructor = CustomError;
result = matcher.compare(fn, CustomError); result = matcher.compare(fn, CustomError);
@@ -222,7 +221,6 @@ describe("toThrowError", function() {
result; result;
CustomError.prototype = new Error(); CustomError.prototype = new Error();
CustomError.prototype.constructor = CustomError;
result = matcher.compare(fn, CustomError, "foo"); result = matcher.compare(fn, CustomError, "foo");

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

@@ -109,7 +109,7 @@ getJasmineRequireObj().toThrowError = function(j$) {
return expected === null && errorType === null; return expected === null && errorType === null;
}, },
matches: function(error) { matches: function(error) {
return (errorType === null || error.constructor === errorType) && return (errorType === null || error instanceof errorType) &&
(expected === null || messageMatch(error.message)); (expected === null || messageMatch(error.message));
} }
}; };