diff --git a/src/transition/transitionHook.ts b/src/transition/transitionHook.ts index 31c69a0fd..4125a5f25 100644 --- a/src/transition/transitionHook.ts +++ b/src/transition/transitionHook.ts @@ -93,7 +93,7 @@ export class TransitionHook { try { results.push(hooks[i].invokeStep(locals)); } catch (exception) { - if (!swallowExceptions) throw exception; + if (!swallowExceptions) return REJECT.aborted(exception); console.log("Swallowed exception during synchronous hook handler: " + exception); // TODO: What to do here? } } diff --git a/test/transitionSpec.ts b/test/transitionSpec.ts index 4adae99ca..33fd847f2 100644 --- a/test/transitionSpec.ts +++ b/test/transitionSpec.ts @@ -123,6 +123,23 @@ describe('transition', function () { expect(result.get().reject.message).toEqual("transition failed"); })); + it('$transition$.promise should reject on error in synchronous hooks', inject(function($transitions, $q) { + var result = new PromiseResult(); + + transitionProvider.onBefore({ from: "*", to: "third" }, function($transition$) { + result.setPromise($transition$.promise); + throw new Error("transition failed"); + }); + + try { + makeTransition("", "third").run(); + } catch (e) {} + $q.flush(); + + expect(result.called()).toEqual({ resolve: false, reject: true, complete: true }); + expect(result.get().reject.detail.message).toEqual("transition failed"); + })); + it('should inject $transition$', inject(function($transitions, $q) { var t = null;