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

Merge branch 'main' into 3.99

Browse Source
This commit is contained in:
Steve Gravrock
2021-09-24 14:27:15 -07:00
parent 3b28ee7c29 40be00310d
commit fb4c16b23e
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/jasmine-core/jasmine.js
View File

@@ -8407,7 +8407,6 @@ getJasmineRequireObj().QueueRunner = function(j$) {
// TODO probably shouldn't next() right away here. // TODO probably shouldn't next() right away here.
// That makes debugging async failures much more confusing. // That makes debugging async failures much more confusing.
onException(error); onException(error);
next(error);
}, },
cleanup = once(function cleanup() { cleanup = once(function cleanup() {
if (timeoutId !== void 0) { if (timeoutId !== void 0) {

13
spec/core/QueueRunnerSpec.js
View File

@@ -783,9 +783,13 @@ describe('QueueRunner', function() {
jasmine.clock().uninstall(); jasmine.clock().uninstall();
}); });
it('skips to cleanup functions on the first exception', function() { it('skips to cleanup functions once the fn completes after an unhandled exception', function() {
var errorListeners = [], var errorListeners = [],
queueableFn = { fn: function(done) {} }, queueableFn = {
fn: function(done) {
queueableFnDone = done;
}
},
nextQueueableFn = { fn: jasmine.createSpy('nextFunction') }, nextQueueableFn = { fn: jasmine.createSpy('nextFunction') },
cleanupFn = { fn: jasmine.createSpy('cleanup') }, cleanupFn = { fn: jasmine.createSpy('cleanup') },
queueRunner = new jasmineUnderTest.QueueRunner({ queueRunner = new jasmineUnderTest.QueueRunner({
@@ -800,10 +804,13 @@ describe('QueueRunner', function() {
queueableFns: [queueableFn, nextQueueableFn], queueableFns: [queueableFn, nextQueueableFn],
cleanupFns: [cleanupFn], cleanupFns: [cleanupFn],
completeOnFirstError: true completeOnFirstError: true
}); }),
queueableFnDone;
queueRunner.execute(); queueRunner.execute();
errorListeners[errorListeners.length - 1](new Error('error')); errorListeners[errorListeners.length - 1](new Error('error'));
expect(cleanupFn.fn).not.toHaveBeenCalled();
queueableFnDone();
expect(nextQueueableFn.fn).not.toHaveBeenCalled(); expect(nextQueueableFn.fn).not.toHaveBeenCalled();
expect(cleanupFn.fn).toHaveBeenCalled(); expect(cleanupFn.fn).toHaveBeenCalled();
}); });

1
src/core/QueueRunner.js
View File

@@ -106,7 +106,6 @@ getJasmineRequireObj().QueueRunner = function(j$) {
// TODO probably shouldn't next() right away here. // TODO probably shouldn't next() right away here.
// That makes debugging async failures much more confusing. // That makes debugging async failures much more confusing.
onException(error); onException(error);
next(error);
}, },
cleanup = once(function cleanup() { cleanup = once(function cleanup() {
if (timeoutId !== void 0) { if (timeoutId !== void 0) {