Remove results from Queue
- consequently, Runner & Suite no longer have results. - Results come back to reporters from Spec, we should not have a need to walk them later via suite/runner (in fact, no reporter used results on suite/runner -- only bad tests) - Remove/clean up tests relying on #results - Remove integration tests that duplicate already tested behavior
This commit is contained in:
@@ -57,7 +57,7 @@ jasmine.Queue.prototype.next_ = function() {
|
||||
|
||||
while (goAgain) {
|
||||
goAgain = false;
|
||||
|
||||
|
||||
if (self.index < self.blocks.length && !(this.abort && !this.ensured[self.index])) {
|
||||
var calledSynchronously = true;
|
||||
var completedSynchronously = false;
|
||||
@@ -95,7 +95,7 @@ jasmine.Queue.prototype.next_ = function() {
|
||||
if (completedSynchronously) {
|
||||
onComplete();
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
self.running = false;
|
||||
if (self.onComplete) {
|
||||
@@ -104,15 +104,3 @@ jasmine.Queue.prototype.next_ = function() {
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
jasmine.Queue.prototype.results = function() {
|
||||
var results = new jasmine.NestedResults();
|
||||
for (var i = 0; i < this.blocks.length; i++) {
|
||||
if (this.blocks[i].results) {
|
||||
results.addResult(this.blocks[i].results());
|
||||
}
|
||||
}
|
||||
return results;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -71,7 +71,3 @@ jasmine.Runner.prototype.topLevelSuites = function() {
|
||||
}
|
||||
return topLevelSuites;
|
||||
};
|
||||
|
||||
jasmine.Runner.prototype.results = function() {
|
||||
return this.queue.results();
|
||||
};
|
||||
|
||||
@@ -47,10 +47,6 @@ jasmine.Suite.prototype.afterEach = function(afterEachFunction) {
|
||||
this.after_.unshift(afterEachFunction);
|
||||
};
|
||||
|
||||
jasmine.Suite.prototype.results = function() {
|
||||
return this.queue.results();
|
||||
};
|
||||
|
||||
jasmine.Suite.prototype.add = function(suiteOrSpec) {
|
||||
this.children_.push(suiteOrSpec);
|
||||
if (suiteOrSpec instanceof jasmine.Suite) {
|
||||
|
||||
Reference in New Issue
Block a user