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

simplify failure message logic in the toThrow matcher

Browse Source
This commit is contained in:
Sheel Choksi
2013-04-06 22:06:14 -07:00
parent eec6d7d23e
commit 2445fb36dc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1364,7 +1364,7 @@ jasmine.Matchers.prototype.toThrow = function(expected) {
var not = this.isNot ? "not " : "";
this.message = function() {
if (exception && (jasmine.util.isUndefined(expected) || !this.env.equals_(exception.message || exception, expected.message || expected))) {
if (exception) {
return ["Expected function " + not + "to throw", expected ? expected.message || expected : "an exception", ", but it threw", exception.message || exception].join(' ');
} else {
return "Expected function to throw an exception.";

2
src/core/Matchers.js
View File

@@ -239,7 +239,7 @@ jasmine.Matchers.prototype.toThrow = function(expected) {
var not = this.isNot ? "not " : "";
this.message = function() {
if (exception && (jasmine.util.isUndefined(expected) || !this.env.equals_(exception.message || exception, expected.message || expected))) {
if (exception) {
return ["Expected function " + not + "to throw", expected ? expected.message || expected : "an exception", ", but it threw", exception.message || exception].join(' ');
} else {
return "Expected function to throw an exception.";