fix($q): reject should catch & forward exceptions thrown in errback

This commit is contained in:
Igor Minar 2013-08-21 22:57:48 -07:00
parent 80d0f98263
commit 5d9f42050a
2 changed files with 25 additions and 2 deletions

View file

@ -375,7 +375,12 @@ function qFactory(nextTick, exceptionHandler) {
then: function(callback, errback) {
var result = defer();
nextTick(function() {
result.resolve((isFunction(errback) ? errback : defaultErrback)(reason));
try {
result.resolve((isFunction(errback) ? errback : defaultErrback)(reason));
} catch(e) {
result.reject(e);
exceptionHandler(e);
}
});
return result.promise;
}

View file

@ -950,6 +950,15 @@ describe('q', function() {
syncResolve(deferred, rejectedPromise.then());
expect(log).toEqual(['error(rejected)->reject(rejected)']);
});
it('should catch exceptions thrown in errback and forward them to derived promises', function() {
var rejectedPromise = q.reject('rejected');
rejectedPromise.then(null, error('Broken', 'catch me!', true)).
then(null, error('Affected'))
mockNextTick.flush();
expect(log).toEqual(['errorBroken(rejected)->throw(catch me!)', 'errorAffected(catch me!)->reject(catch me!)']);
});
});
@ -1460,7 +1469,7 @@ describe('q', function() {
deferred = q.defer();
});
afterEach(function() {
// Restore the original exception logging mode
mockNextTick.logExceptions = originalLogExceptions;
@ -1468,6 +1477,15 @@ describe('q', function() {
it('should still reject the promise, when exception is thrown in success handler, even if exceptionHandler rethrows', function() {
deferred.promise.then(function() { throw 'reject'; }).then(null, errorSpy);
deferred.resolve('resolve');
mockNextTick.flush();
expect(exceptionExceptionSpy).toHaveBeenCalled();
expect(errorSpy).toHaveBeenCalled();
});
it('should still reject the promise, when exception is thrown in error handler, even if exceptionHandler rethrows', function() {
deferred.promise.then(null, function() { throw 'reject again'; }).then(null, errorSpy);
deferred.reject('reject');
mockNextTick.flush();