Jardilio route redirect fix

src/ngRoute/route.js

@@ -588,46 +588,25 @@ function $RouteProvider() {
         $route.current = nextRoute;
         if (nextRoute) {
           if (nextRoute.redirectTo) {
+            var url = $location.url();
+            var newUrl;
             if (angular.isString(nextRoute.redirectTo)) {
-              $location.path(interpolate(nextRoute.redirectTo, nextRoute.params)).search(nextRoute.params)
+              $location.path(interpolate(nextRoute.redirectTo, nextRoute.params))
+                       .search(nextRoute.params)
                        .replace();
+              newUrl = $location.url();
             } else {
-              $location.url(nextRoute.redirectTo(nextRoute.pathParams, $location.path(), $location.search()))
-                       .replace();
+              newUrl = nextRoute.redirectTo(nextRoute.pathParams, $location.path(), $location.search());
+              $location.url(newUrl).replace();
+            }
+            if (isDefined(newUrl) && url !== newUrl) {
+              return; //exit out and don't process current next value, wait for next location change from redirect
             }
           }
         }
 
         $q.when(nextRoute).
-          then(function() {
-            if (nextRoute) {
-              var locals = angular.extend({}, nextRoute.resolve),
-                  template, templateUrl;
-
-              angular.forEach(locals, function(value, key) {
-                locals[key] = angular.isString(value) ?
-                    $injector.get(value) : $injector.invoke(value, null, null, key);
-              });
-
-              if (angular.isDefined(template = nextRoute.template)) {
-                if (angular.isFunction(template)) {
-                  template = template(nextRoute.params);
-                }
-              } else if (angular.isDefined(templateUrl = nextRoute.templateUrl)) {
-                if (angular.isFunction(templateUrl)) {
-                  templateUrl = templateUrl(nextRoute.params);
-                }
-                if (angular.isDefined(templateUrl)) {
-                  nextRoute.loadedTemplateUrl = $sce.valueOf(templateUrl);
-                  template = $templateRequest(templateUrl);
-                }
-              }
-              if (angular.isDefined(template)) {
-                locals['$template'] = template;
-              }
-              return $q.all(locals);
-            }
-          }).
+          then(resolveLocals).
           then(function(locals) {
             // after route change
             if (nextRoute === $route.current) {
@@ -645,6 +624,41 @@ function $RouteProvider() {
       }
     }
 
+    function resolveLocals(route) {
+      if (route) {
+        var locals = angular.extend({}, route.resolve);
+        angular.forEach(locals, function(value, key) {
+          locals[key] = angular.isString(value) ?
+              $injector.get(value) :
+              $injector.invoke(value, null, null, key);
+        });
+        var template = getTemplateFor(route);
+        if (angular.isDefined(template)) {
+          locals['$template'] = template;
+        }
+        return $q.all(locals);
+      }
+    }
+
+
+    function getTemplateFor(route) {
+      var template, templateUrl;
+      if (angular.isDefined(template = route.template)) {
+        if (angular.isFunction(template)) {
+          template = template(route.params);
+        }
+      } else if (angular.isDefined(templateUrl = route.templateUrl)) {
+        if (angular.isFunction(templateUrl)) {
+          templateUrl = templateUrl(route.params);
+        }
+        if (angular.isDefined(templateUrl)) {
+          route.loadedTemplateUrl = $sce.valueOf(templateUrl);
+          template = $templateRequest(templateUrl);
+        }
+      }
+      return template;
+    }
+
 
     /**
      * @returns {Object} the current active route, by matching it against the URL

test/ngRoute/routeSpec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-describe('$route', function() {
+fdescribe('$route', function() {
   var $httpBackend,
       element;
 
@@ -1061,6 +1061,55 @@ describe('$route', function() {
             .toEqual(['http://server/#!/bar/id3?extra=eId', true, null]);
       });
     });
+
+    it('should not instantiate controller or process template for a redirected route', function() {
+      var firstController = jasmine.createSpy('first controller spy');
+      var firstTemplate = jasmine.createSpy('first template spy').and.returnValue('redirected view');
+      var secondController = jasmine.createSpy('second controller spy');
+      var secondTemplate = jasmine.createSpy('second template spy').and.returnValue('redirected view');
+      module(function($routeProvider) {
+        $routeProvider.when('/redirect', {
+          template: firstTemplate,
+          redirectTo: '/redirected',
+          controller: firstController
+        });
+        $routeProvider.when('/redirected', {
+          template: secondTemplate,
+          controller: secondController
+        });
+      });
+      inject(function($route, $location, $rootScope, $compile) {
+        var element = $compile('<div><ng-view></ng-view></div>')($rootScope);
+        $location.path('/redirect');
+        $rootScope.$digest();
+        expect(firstController).not.toHaveBeenCalled();
+        expect(firstTemplate).not.toHaveBeenCalled();
+        expect(secondController).toHaveBeenCalled();
+        expect(secondTemplate).toHaveBeenCalled();
+        dealoc(element);
+      });
+    });
+
+    it('should not redirect transition if `redirectTo` returns `undefined`', function() {
+      var controller = jasmine.createSpy('first controller spy');
+      var templateFn = jasmine.createSpy('first template spy').and.returnValue('redirected view');
+      module(function($routeProvider) {
+        $routeProvider.when('/redirect/to/undefined', {
+          template: templateFn,
+          redirectTo: function() {},
+          controller: controller
+        });
+      });
+      inject(function($route, $location, $rootScope, $compile) {
+        var element = $compile('<div><ng-view></ng-view></div>')($rootScope);
+        $location.path('/redirect/to/undefined');
+        $rootScope.$digest();
+        expect(controller).toHaveBeenCalled();
+        expect(templateFn).toHaveBeenCalled();
+        expect($location.path()).toEqual('/redirect/to/undefined');
+        dealoc(element);
+      });
+    });
   });