Remove jasmine.util.extend

This commit is contained in:
Davis W. Frank
2012-12-08 11:48:11 -08:00
parent 4ad43267ab
commit 668dd784ef
8 changed files with 32 additions and 46 deletions

View File

@@ -48,9 +48,9 @@
};
if (typeof window == "undefined" && typeof exports == "object") {
jasmine.util.extend(exports, jasmineInterface);
extend(exports, jasmineInterface);
} else {
jasmine.util.extend(window, jasmineInterface);
extend(window, jasmineInterface);
}
var htmlReporter = new jasmine.HtmlReporter(null, jasmine, env);
@@ -71,4 +71,9 @@
env.execute();
};
function extend(destination, source) {
for (var property in source) destination[property] = source[property];
return destination;
}
}());

View File

@@ -282,6 +282,7 @@ jasmine.HtmlReporter.ReporterView = function(dom, jasmine, catchExceptions) {
this.specComplete = function(result) {
this.completeSpecCount++;
//TODO: this needs to work in order to get blanks for skipped specs.
// if (isUndefined(this.views.specs[result.id])) {
// this.views.specs[result.id] = new this.jasmine.HtmlReporter.SpecView(result, dom);
// }

View File

@@ -445,11 +445,6 @@ jasmine.util.argsToArray = function(args) {
return arrayOfArgs;
};
jasmine.util.extend = function(destination, source) {
for (var property in source) destination[property] = source[property];
return destination;
};
//TODO: expectation result may make more sense as a presentation of an expectation.
jasmine.buildExpectationResult = function(params) {
return {