admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip everything except afterAll fns when a beforeAll fn errors

Browse Source 
* Fixes #1533
This commit is contained in:
Steve Gravrock
2021-09-30 10:19:58 -07:00
parent 5eaeeb0b6c
commit 5f1ef5ac2b
14 changed files with 316 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/QueueRunner.js
View File

@@ -59,7 +59,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
const SkipPolicy = attrs.SkipPolicy || j$.NeverSkipPolicy;
this.skipPolicy_ = new SkipPolicy(this.queueableFns, this.firstCleanupIx);
this.errored = false;
this.errored_ = false;
if (typeof this.onComplete !== 'function') {
throw new Error('invalid onComplete ' + JSON.stringify(this.onComplete));
@@ -115,7 +115,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
if (!(err instanceof StopExecutionError) && !err.jasmineMessage) {
self.fail(err);
}
self.errored = errored = true;
self.recordError_(iterativeIndex);
}
function runNext() {
@@ -141,7 +141,6 @@ getJasmineRequireObj().QueueRunner = function(j$) {
}
}
),
errored = false,
timedOut = false,
queueableFn = self.queueableFns[iterativeIndex],
timeoutId,
@@ -149,7 +148,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
next.fail = function nextFail() {
self.fail.apply(null, arguments);
self.errored = errored = true;
self.recordError_(iterativeIndex);
next();
};
@@ -192,15 +191,15 @@ getJasmineRequireObj().QueueRunner = function(j$) {
}
} catch (e) {
onException(e);
self.errored = errored = true;
self.recordError_(iterativeIndex);
}
cleanup();
return { completedSynchronously: true, errored: errored };
return { completedSynchronously: true };
function onException(e) {
self.onException(e);
self.errored = errored = true;
self.recordError_(iterativeIndex);
}
function onPromiseRejection(e) {
@@ -224,14 +223,12 @@ getJasmineRequireObj().QueueRunner = function(j$) {
if (!result.completedSynchronously) {
return;
}
self.errored = self.errored || result.errored;
}
this.clearStack(function() {
self.globalErrors.popListener(self.handleFinalError);
if (self.errored) {
if (self.errored_) {
self.onComplete(new StopExecutionError());
} else {
self.onComplete();
@@ -240,7 +237,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
};
QueueRunner.prototype.nextFnIx_ = function(currentFnIx) {
const result = this.skipPolicy_.skipTo(currentFnIx, this.errored);
const result = this.skipPolicy_.skipTo(currentFnIx);
if (result === currentFnIx) {
throw new Error("Can't skip to the same queueable fn that just finished");
@@ -249,6 +246,11 @@ getJasmineRequireObj().QueueRunner = function(j$) {
return result;
};
QueueRunner.prototype.recordError_ = function(currentFnIx) {
this.errored_ = true;
this.skipPolicy_.fnErrored(currentFnIx);
};
QueueRunner.prototype.diagnoseConflictingAsync_ = function(fn, retval) {
var msg;