Updated jasmine.js

This commit is contained in:
Dan Hansen and Davis W. Frank
2013-02-19 11:52:16 -08:00
parent 3fc79bac9e
commit f865758124

View File

@@ -439,18 +439,15 @@ jasmine.util.argsToArray = function(args) {
var arrayOfArgs = []; var arrayOfArgs = [];
for (var i = 0; i < args.length; i++) arrayOfArgs.push(args[i]); for (var i = 0; i < args.length; i++) arrayOfArgs.push(args[i]);
return arrayOfArgs; return arrayOfArgs;
};jasmine.exceptionFormatter = function(e) { };jasmine.exceptionMessageFor = function(e) {
var file = e.fileName || e.sourceURL || '', var message = e.name
line = e.lineNumber || e.line || '', + ': '
message = e.toString(); + e.message
+ ' in '
if (file.length && line.length) { + (e.fileName || e.sourceURL || '')
message += ' (' + ' (line '
+ file + (e.line || e.lineNumber || '')
+ ':' + ')';
+ line
+ ')';
}
return message; return message;
}; };
@@ -1660,7 +1657,7 @@ jasmine.Spec.prototype.status = function() {
jasmine.Spec.prototype.getFullName = function() { jasmine.Spec.prototype.getFullName = function() {
return this.getSpecName(this); return this.getSpecName(this);
}; }
jasmine.Suite = function(attrs) { jasmine.Suite = function(attrs) {
this.env = attrs.env; this.env = attrs.env;
this.id = attrs.id; this.id = attrs.id;