Merge branch 'metamatt-matt-fail-transition-on-error' into legacy

Author: christopherthielen

src/state.js

@@ -1170,7 +1170,7 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory) {
         $urlRouter.update(true);
 
         return $state.current;
-      }, function (error) {
+      }).then(null, function (error) {
         if ($state.transition !== transition) return TransitionSuperseded;
 
         $state.transition = null;

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');
@@ -1650,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'));