fix(state): fire $stateChangeError if onEnter/onExit throws.

closes #2772

Author: christopherthielen

test/stateSpec.js

@@ -37,7 +37,10 @@ describe('state', function () {
       ISS2101 = { params: { bar: { squash: false, value: 'qux'}}, url: '/2101/{bar:string}' };
       AppInjectable = {};
 
-  beforeEach(module(function ($stateProvider, $provide) {
+  beforeEach(module(function ($stateProvider, $provide, $exceptionHandlerProvider) {
+    var x = this;
+    var foo = jasmine;
+    $exceptionHandlerProvider.mode('log')
     angular.forEach([ A, B, C, D, DD, E, H, HH, HHH ], function (state) {
       state.onEnter = callbackLogger('onEnter');
       state.onExit = callbackLogger('onExit');
@@ -120,11 +123,6 @@ describe('state', function () {
         },
         controller: function() { log += "controller;"}
       })
-      .state('onEnterFail', {
-        onEnter: function() {
-          throw new Error('negative onEnter');
-        }
-      })
       .state('badParam', {
         url: "/bad/{param:int}"
       })
@@ -556,20 +554,6 @@ describe('state', function () {
         'A.onEnter;');
     }));
 
-    it('sends $stateChangeError for exceptions in onEnter', inject(function ($state, $q, $rootScope) {
-      var called;
-      $rootScope.$on('$stateChangeError', function (ev, to, toParams, from, fromParams, options) {
-        called = true;
-      });
-
-      initStateTo(A);
-      $state.transitionTo('onEnterFail');
-      $q.flush();
-
-      expect(called).toBeTruthy();
-      expect($state.current.name).toEqual(A.name);
-    }));
-
     it('doesn\'t transition to parent state when child has no URL', inject(function ($state, $q) {
       $state.transitionTo('about.sidebar'); $q.flush();
       expect($state.current.name).toEqual('about.sidebar');
@@ -1063,7 +1047,6 @@ describe('state', function () {
         'logA',
         'logA.logB',
         'logA.logB.logC',
-        'onEnterFail',
         'resolveFail',
         'resolveTimeout',
         'root',
@@ -1670,6 +1653,35 @@ describe('state queue', function(){
   });
 });
 
+describe('exceptions in onEnter', function() {
+  beforeEach(module(function ($stateProvider, $exceptionHandlerProvider) {
+    $exceptionHandlerProvider.mode('log');
+    $stateProvider
+        .state('A', { })
+        .state('onEnterFail', {
+          onEnter: function() {
+            throw new Error('negative onEnter');
+          }
+        });
+  }));
+
+  it('sends $stateChangeError for exceptions in onEnter', inject(function ($state, $q, $rootScope) {
+    var called;
+    $rootScope.$on('$stateChangeError', function (ev, to, toParams, from, fromParams, options) {
+      called = true;
+    });
+
+    $state.go('A'); $q.flush();
+    expect($state.current.name).toEqual('A');
+
+    $state.transitionTo('onEnterFail');
+    $q.flush();
+
+    expect(called).toBeTruthy();
+    expect($state.current.name).toEqual('A');
+  }))
+});
+
 describe('$stateParams', function () {
   beforeEach(module('ui.router.state'));