From 4d7b83947370bfa9b94dc954e65dbe7c73d88328 Mon Sep 17 00:00:00 2001 From: Christian Williams Date: Mon, 2 Aug 2010 18:36:26 -0700 Subject: [PATCH] Fix not.toThrow() matcher exception when used with no args. --- spec/suites/MatchersSpec.js | 3 +++ src/Matchers.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/spec/suites/MatchersSpec.js b/spec/suites/MatchersSpec.js index ef26c95c..c39f66bd 100644 --- a/spec/suites/MatchersSpec.js +++ b/spec/suites/MatchersSpec.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); diff --git a/src/Matchers.js b/src/Matchers.js index 0e75bfb3..a4d8998b 100644 --- a/src/Matchers.js +++ b/src/Matchers.js @@ -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."; }