Permalink
Browse files

Regenerate jasmine.js.

  • Loading branch information...
xian committed Aug 26, 2010
1 parent b33b2d2 commit b8b4457b6bc70f5b93355b2ac941585e08dc6bcc
Showing with 4 additions and 2 deletions.
  1. +4 −2 lib/jasmine.js
View
@@ -1386,9 +1386,11 @@ jasmine.Matchers.prototype.toThrow = function(expected) {
result = (expected === jasmine.undefined || this.env.equals_(exception.message || exception, expected.message || expected));
}
var not = this.isNot ? "not " : "";
this.message = function() {
if (exception && (expected === jasmine.undefined || !this.env.equals_(exception.message || exception, expected.message || expected))) {
return ["Expected function to throw", expected ? expected.message || expected : " an exception", ", but it threw", exception.message || exception].join(' ');
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.";
}
@@ -2415,5 +2417,5 @@ jasmine.version_= {
"major": 0,
"minor": 11,
"build": 1,
"revision": 1282784791
"revision": 1282785506
};

0 comments on commit b8b4457

Please sign in to comment.