Properly cascade StopExecutionError's up the tree

- Fixes #1563
This commit is contained in:
Gregg Van Hove
2018-05-30 17:32:14 -07:00
parent 3636014917
commit 8f7327cb4d
6 changed files with 55 additions and 11 deletions

View File

@@ -159,7 +159,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
return;
}
self.errored = result.errored;
self.errored = self.errored || result.errored;
if (this.completeOnFirstError && result.errored) {
this.skipToCleanup(iterativeIndex);

View File

@@ -174,8 +174,11 @@ getJasmineRequireObj().TreeProcessor = function() {
queueRunnerFactory({
onComplete: function () {
var args = Array.prototype.slice.call(arguments, [0]);
node.cleanupBeforeAfter();
nodeComplete(node, node.getResult(), done);
nodeComplete(node, node.getResult(), function() {
done.apply(undefined, args);
});
},
queueableFns: [onStart].concat(wrapChildren(node, segmentNumber)),
userContext: node.sharedUserContext(),