Collect unhandled exceptions and pass them to the current runnable

Fixes #529
Fixes #937
This commit is contained in:
Gregg Van Hove
2017-03-07 16:32:11 -08:00
parent 92e7436db2
commit 1042c9a2dd
8 changed files with 283 additions and 0 deletions

View File

@@ -20,6 +20,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
this.userContext = attrs.userContext || {};
this.timeout = attrs.timeout || {setTimeout: setTimeout, clearTimeout: clearTimeout};
this.fail = attrs.fail || function() {};
this.globalErrors = attrs.globalErrors || { pushListener: function() {}, popListener: function() {} };
}
QueueRunner.prototype.execute = function() {
@@ -56,8 +57,13 @@ getJasmineRequireObj().QueueRunner = function(j$) {
var clearTimeout = function () {
Function.prototype.apply.apply(self.timeout.clearTimeout, [j$.getGlobal(), [timeoutId]]);
},
handleError = function(error) {
onException(error);
next();
},
next = once(function () {
clearTimeout(timeoutId);
self.globalErrors.popListener(handleError);
self.run(queueableFns, iterativeIndex + 1);
}),
timeoutId;
@@ -67,6 +73,8 @@ getJasmineRequireObj().QueueRunner = function(j$) {
next();
};
self.globalErrors.pushListener(handleError);
if (queueableFn.timeout) {
timeoutId = Function.prototype.apply.apply(self.timeout.setTimeout, [j$.getGlobal(), [function() {
var error = new Error('Timeout - Async callback was not invoked within timeout specified by jasmine.DEFAULT_TIMEOUT_INTERVAL.');