From f865758124545099040564629b0c7062dbda8375 Mon Sep 17 00:00:00 2001 From: "Dan Hansen and Davis W. Frank" Date: Tue, 19 Feb 2013 11:52:16 -0800 Subject: [PATCH] Updated jasmine.js --- lib/jasmine-core/jasmine.js | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index e3db7790..d5f4f8d2 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -439,18 +439,15 @@ jasmine.util.argsToArray = function(args) { var arrayOfArgs = []; for (var i = 0; i < args.length; i++) arrayOfArgs.push(args[i]); return arrayOfArgs; -};jasmine.exceptionFormatter = function(e) { - var file = e.fileName || e.sourceURL || '', - line = e.lineNumber || e.line || '', - message = e.toString(); - - if (file.length && line.length) { - message += ' (' - + file - + ':' - + line - + ')'; - } +};jasmine.exceptionMessageFor = function(e) { + var message = e.name + + ': ' + + e.message + + ' in ' + + (e.fileName || e.sourceURL || '') + + ' (line ' + + (e.line || e.lineNumber || '') + + ')'; return message; }; @@ -1660,7 +1657,7 @@ jasmine.Spec.prototype.status = function() { jasmine.Spec.prototype.getFullName = function() { return this.getSpecName(this); -}; +} jasmine.Suite = function(attrs) { this.env = attrs.env; this.id = attrs.id;