Specs/Suites wait for an async spec to finish
Go back to having all suites and specs run asynchronously so that they properly wait for any async specs that there might be
This commit is contained in:
@@ -32,13 +32,10 @@ getJasmineRequireObj().QueueRunner = function() {
|
||||
}
|
||||
}
|
||||
|
||||
var runnerDone = iterativeIndex >= length,
|
||||
hasBeenAsyncSpec = recursiveIndex > 0;
|
||||
var runnerDone = iterativeIndex >= length;
|
||||
|
||||
if (runnerDone && hasBeenAsyncSpec) {
|
||||
if (runnerDone) {
|
||||
this.clearStack(this.onComplete);
|
||||
} else if(runnerDone) {
|
||||
this.onComplete();
|
||||
}
|
||||
|
||||
function attempt(fn) {
|
||||
|
||||
@@ -74,7 +74,7 @@ getJasmineRequireObj().Suite = function() {
|
||||
children = this.children_;
|
||||
|
||||
for (var i = 0; i < children.length; i++) {
|
||||
allFns.push(wrapChild(children[i]));
|
||||
allFns.push(wrapChildAsAsync(children[i]));
|
||||
}
|
||||
|
||||
this.onStart(this);
|
||||
@@ -92,8 +92,8 @@ getJasmineRequireObj().Suite = function() {
|
||||
}
|
||||
}
|
||||
|
||||
function wrapChild(child) {
|
||||
return function() { child.execute(); };
|
||||
function wrapChildAsAsync(child) {
|
||||
return function(done) { child.execute(done); };
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user