Permalink
Browse files

Fix not.toThrow() matcher exception when used with no args.

  • Loading branch information...
1 parent 89afebd commit 4d7b83947370bfa9b94dc954e65dbe7c73d88328 @xian xian committed Aug 3, 2010
Showing with 4 additions and 1 deletion.
  1. +3 −0 spec/suites/MatchersSpec.js
  2. +1 −1 src/Matchers.js
@@ -457,7 +457,10 @@ describe("jasmine.Matchers", function() {
var expected = match(function() {
throw new Error("Fake Error");
});
+
expect(expected.toThrow()).toEqual(true);
+ expect(expected.not.toThrow()).toEqual(false);
+
expect(expected.toThrow("Fake Error")).toEqual(true);
expect(expected.toThrow(new Error("Fake Error"))).toEqual(true);
View
@@ -297,7 +297,7 @@ jasmine.Matchers.prototype.toThrow = function(expected) {
this.message = function() {
if (exception && (expected === jasmine.undefined || !this.env.equals_(exception.message || exception, expected.message || expected))) {
- return ["Expected function to throw", expected.message || expected, ", but it threw", exception.message || exception].join(' ');
+ return ["Expected function to throw", expected ? expected.message || expected : " an exception", ", but it threw", exception.message || exception].join(' ');
} else {
return "Expected function to throw an exception.";
}

0 comments on commit 4d7b839

Please sign in to comment.