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

add in regex matching for toThrow matcher

Browse Source
This commit is contained in:
Sheel Choksi
2013-04-07 01:27:20 -07:00
parent 2445fb36dc
commit c017257164
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1347,7 +1347,7 @@ jasmine.Matchers.prototype.toBeCloseTo = function(expected, precision) {
jasmine.Matchers.prototype.toThrow = function(expected) {
var result = false;
var exception;
var exception, exceptionMessage;
if (typeof this.actual != 'function') {
throw new Error('Actual is not a function');
}
@@ -1358,14 +1358,16 @@ jasmine.Matchers.prototype.toThrow = function(expected) {
}
if (exception) {
result = (jasmine.util.isUndefined(expected) || this.env.equals_(exception.message || exception, expected.message || expected));
exceptionMessage = exception.message || exception;
result = (jasmine.util.isUndefined(expected) || this.env.equals_(exceptionMessage, expected.message || expected) || (jasmine.isA_("RegExp", expected) && expected.test(exceptionMessage)));
}
var not = this.isNot ? "not " : "";
var regexMatch = jasmine.isA_("RegExp", expected) ? " an exception matching" : "";
this.message = function() {
if (exception) {
return ["Expected function " + not + "to throw", expected ? expected.message || expected : "an exception", ", but it threw", exception.message || exception].join(' ');
return ["Expected function " + not + "to throw" + regexMatch, expected ? expected.message || expected : "an exception", ", but it threw", exceptionMessage].join(' ');
} else {
return "Expected function to throw an exception.";
}

12
spec/core/MatchersSpec.js
View File

@@ -594,6 +594,12 @@ describe("jasmine.Matchers", function() {
expect(lastResult().message).toMatch("Other Error");
});
it("should match exceptions specified by regular expression", function() {
expect(match(throwingFn).toThrow(/Error/)).toPass();
expect(match(throwingFn).toThrow(/^Error/)).toFail();
expect(lastResult().message).toMatch("throw an exception matching /\\^Error/");
});
it("should match exceptions specified by Error", function() {
expect(match(throwingFn).toThrow(new Error("Fake Error"))).toPass();
expect(match(throwingFn).toThrow(new Error("Other Error"))).toFail();
@@ -612,6 +618,12 @@ describe("jasmine.Matchers", function() {
expect(match(throwingFn).not.toThrow("Other Error")).toPass();
});
it("should match exceptions specified by regular expression", function() {
expect(match(throwingFn).not.toThrow(/Error/)).toFail();
// expect(lastResult().message).toMatch(/Expected function not to throw an exception matching \/Error\/./);
expect(match(throwingFn).not.toThrow(/^Error/)).toPass();
});
it("should match exceptions specified by Error", function() {
expect(match(throwingFn).not.toThrow(new Error("Fake Error"))).toFail();
// expect(lastResult().message).toMatch("Other Error");

8
src/core/Matchers.js
View File

@@ -222,7 +222,7 @@ jasmine.Matchers.prototype.toBeCloseTo = function(expected, precision) {
jasmine.Matchers.prototype.toThrow = function(expected) {
var result = false;
var exception;
var exception, exceptionMessage;
if (typeof this.actual != 'function') {
throw new Error('Actual is not a function');
}
@@ -233,14 +233,16 @@ jasmine.Matchers.prototype.toThrow = function(expected) {
}
if (exception) {
result = (jasmine.util.isUndefined(expected) || this.env.equals_(exception.message || exception, expected.message || expected));
exceptionMessage = exception.message || exception;
result = (jasmine.util.isUndefined(expected) || this.env.equals_(exceptionMessage, expected.message || expected) || (jasmine.isA_("RegExp", expected) && expected.test(exceptionMessage)));
}
var not = this.isNot ? "not " : "";
var regexMatch = jasmine.isA_("RegExp", expected) ? " an exception matching" : "";
this.message = function() {
if (exception) {
return ["Expected function " + not + "to throw", expected ? expected.message || expected : "an exception", ", but it threw", exception.message || exception].join(' ');
return ["Expected function " + not + "to throw" + regexMatch, expected ? expected.message || expected : "an exception", ", but it threw", exceptionMessage].join(' ');
} else {
return "Expected function to throw an exception.";
}