fix(Transition): Reset URL to current state after aborted transition

If the user changd the url, we started a transition to a state, and then cancelled, the url remained set to the cancelled transition's tostate's url.
closes #2611

src/state/hooks/transitionManager.ts

@@ -14,6 +14,7 @@ import {TargetState} from "../targetState";
 import {ViewHooks} from "./viewHooks";
 import {EnterExitHooks} from "./enterExitHooks";
 import {ResolveHooks} from "./resolveHooks";
+import {UrlRouter} from "../../url/urlRouter";
 
 /**
  * This class:
@@ -41,7 +42,7 @@ export class TransitionManager {
   constructor(
       private transition: Transition,
       private $transitions,
-      private $urlRouter,
+      private $urlRouter: UrlRouter,
       private $view, // service
       private $state: StateService,
       private $stateParams, // service/obj
@@ -108,6 +109,10 @@ export class TransitionManager {
       if (error.type === RejectType.SUPERSEDED && error.redirected && error.detail instanceof TargetState) {
         return this._redirectMgr(transition.redirect(error.detail)).runTransition();
       }
+
+      if (error.type === RejectType.ABORTED) {
+        this.$urlRouter.update();
+      }
     }
 
     this.$transitions.defaultErrorHandler()(error);

src/url/urlRouter.ts

@@ -342,7 +342,7 @@ export class UrlRouter {
     return this.listener = this.listener || $location.onChange(evt => update(this.urlRouterProvider.rules, this.urlRouterProvider.otherwiseFn, evt));
   }
 
-  update(read) {
+  update(read?) {
     if (read) {
       this.location = $location.url();
       return;

test/stateSpec.js

@@ -2095,7 +2095,7 @@ describe('otherwise and state redirects', function() {
 });
 
 
-describe('hook redirects', function() {
+describe('transition hook', function() {
   var log, resolvelog;
   beforeEach(module(function ($stateProvider, $urlRouterProvider) {
     log = resolvelog = "";
@@ -2118,7 +2118,7 @@ describe('hook redirects', function() {
   }));
 
   // Test for #2455
-  it("from .otherwise() should go to the redirect-to target state and url", inject(function($transitions, $q, $state, $location) {
+  it("redirects from .otherwise() should go to the redirect-to target state and url", inject(function($transitions, $q, $state, $location) {
     $transitions.onBefore({ to: 'home' }, function() {
       return $state.target('loginPage', {}, { location: true });
     });
@@ -2128,7 +2128,7 @@ describe('hook redirects', function() {
   }));
 
   // Test for #2537
-  it("should be able to change option.reload", inject(function($transitions, $q, $state, $trace) {
+  it("redirects should be able to change option.reload", inject(function($transitions, $q, $state, $trace) {
     var count = 0;
     $q.flush();
     expect($state.current.name).toBe("home");
@@ -2151,7 +2151,7 @@ describe('hook redirects', function() {
   }));
 
   // Test for #2539
-  it("should re-resolve when reloading during a redirect", inject(function($transitions, $q, $state, $trace) {
+  it("redirects should re-resolve when reloading during a redirect", inject(function($transitions, $q, $state, $trace) {
     var count = 0;
     $q.flush();
 
@@ -2173,4 +2173,14 @@ describe('hook redirects', function() {
     expect($state.current.name).toBe("home");
     expect(resolvelog).toBe("fooResolve;fooResolve;");
   }));
+
+  // Test for #2611
+  it("aborts should reset the URL to the prevous state's", inject(function($transitions, $q, $state, $location) {
+    $q.flush();
+    $transitions.onStart({ to: 'home.foo' }, function() { return false; });
+    $location.path('/home/foo'); $q.flush();
+    expect($state.current.name).toBe("home");
+    expect($location.path()).toBe('/home');
+  }));
+
 });