fix(angular1_router): rename $route service to $rootRouter

The singleton service that represents the top level router was called
`$router` but this is confusing since there are actually lots of routers,
which depend upon where you are in the DOM. This is similar to the situation
with scopes.

This commit clarifies this singleton by renaming it to `$rootRouter`.

BREAKING CHANGE:

The `$router` injectable service has been renamed to `$rootRouter`

modules/angular1_router/test/integration/animation_spec.js

@@ -5,7 +5,7 @@ describe('ngOutlet animations', function () {
     $animate,
     $compile,
     $rootScope,
-    $router,
+    $rootRouter,
     $compileProvider;
 
   beforeEach(function () {
@@ -17,11 +17,11 @@ describe('ngOutlet animations', function () {
       $compileProvider = _$compileProvider_;
     });
 
-    inject(function (_$animate_, _$compile_, _$rootScope_, _$router_) {
+    inject(function (_$animate_, _$compile_, _$rootScope_, _$rootRouter_) {
       $animate = _$animate_;
       $compile = _$compile_;
       $rootScope = _$rootScope_;
-      $router = _$router_;
+      $rootRouter = _$rootRouter_;
     });
 
     registerComponent('userCmp', {
@@ -41,11 +41,11 @@ describe('ngOutlet animations', function () {
 
     compile('<div ng-outlet></div>');
 
-    $router.config([
+    $rootRouter.config([
       { path: '/user/:name', component: 'userCmp' }
     ]);
 
-    $router.navigateByUrl('/user/brian');
+    $rootRouter.navigateByUrl('/user/brian');
     $rootScope.$digest();
     expect(elt.text()).toBe('hello brian');
 
@@ -54,7 +54,7 @@ describe('ngOutlet animations', function () {
     expect(item.event).toBe('enter');
 
     // navigate to pete
-    $router.navigateByUrl('/user/pete');
+    $rootRouter.navigateByUrl('/user/pete');
     $rootScope.$digest();
     expect(elt.text()).toBe('hello pete');
 

modules/angular1_router/test/integration/lifecycle_hook_spec.js

@@ -4,7 +4,7 @@ describe('Navigation lifecycle', function () {
   var elt,
     $compile,
     $rootScope,
-    $router,
+    $rootRouter,
     $compileProvider;
 
   beforeEach(function () {
@@ -14,10 +14,10 @@ describe('Navigation lifecycle', function () {
       $compileProvider = _$compileProvider_;
     });
 
-    inject(function (_$compile_, _$rootScope_, _$router_) {
+    inject(function (_$compile_, _$rootScope_, _$rootRouter_) {
       $compile = _$compile_;
       $rootScope = _$rootScope_;
-      $router = _$router_;
+      $rootRouter = _$rootRouter_;
     });
 
     registerComponent('oneCmp', {
@@ -38,12 +38,12 @@ describe('Navigation lifecycle', function () {
       $routerOnActivate: spy
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/a', component: 'activateCmp' }
     ]);
     compile('<div>outer { <div ng-outlet></div> }</div>');
 
-    $router.navigateByUrl('/a');
+    $rootRouter.navigateByUrl('/a');
     $rootScope.$digest();
 
     expect(spy).toHaveBeenCalled();
@@ -56,12 +56,12 @@ describe('Navigation lifecycle', function () {
       $routerOnActivate: spy
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/user/:name', component: 'userCmp' }
     ]);
     compile('<div ng-outlet></div>');
 
-    $router.navigateByUrl('/user/brian');
+    $rootRouter.navigateByUrl('/user/brian');
     $rootScope.$digest();
 
     expect(spy).toHaveBeenCalledWith(instructionFor('userCmp'), undefined);
@@ -75,15 +75,15 @@ describe('Navigation lifecycle', function () {
       $routerOnActivate: spy
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/user/:name', component: 'oneCmp' },
       { path: '/post/:id', component: 'activateCmp' }
     ]);
     compile('<div ng-outlet></div>');
 
-    $router.navigateByUrl('/user/brian');
+    $rootRouter.navigateByUrl('/user/brian');
     $rootScope.$digest();
-    $router.navigateByUrl('/post/123');
+    $rootRouter.navigateByUrl('/post/123');
     $rootScope.$digest();
     expect(spy).toHaveBeenCalledWith(instructionFor('activateCmp'),
                                      instructionFor('oneCmp'));
@@ -98,12 +98,12 @@ describe('Navigation lifecycle', function () {
       }
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/user', component: 'userCmp' }
     ]);
     compile('<div ng-outlet></div>');
 
-    $router.navigateByUrl('/user');
+    $rootRouter.navigateByUrl('/user');
     $rootScope.$digest();
 
     expect(injectedScope).toBeDefined();
@@ -116,15 +116,15 @@ describe('Navigation lifecycle', function () {
       $routerOnDeactivate: spy
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/a', component: 'deactivateCmp' },
       { path: '/b', component: 'oneCmp' }
     ]);
     compile('<div ng-outlet></div>');
 
-    $router.navigateByUrl('/a');
+    $rootRouter.navigateByUrl('/a');
     $rootScope.$digest();
-    $router.navigateByUrl('/b');
+    $rootRouter.navigateByUrl('/b');
     $rootScope.$digest();
     expect(spy).toHaveBeenCalled();
   });
@@ -136,15 +136,15 @@ describe('Navigation lifecycle', function () {
       $routerOnDeactivate: spy
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/user/:name', component: 'deactivateCmp' },
       { path: '/post/:id', component: 'oneCmp' }
     ]);
     compile('<div ng-outlet></div>');
 
-    $router.navigateByUrl('/user/brian');
+    $rootRouter.navigateByUrl('/user/brian');
     $rootScope.$digest();
-    $router.navigateByUrl('/post/123');
+    $rootRouter.navigateByUrl('/post/123');
     $rootScope.$digest();
     expect(spy).toHaveBeenCalledWith(instructionFor('oneCmp'),
                                      instructionFor('deactivateCmp'));
@@ -166,15 +166,15 @@ describe('Navigation lifecycle', function () {
       }
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/a', component: 'deactivateCmp' },
       { path: '/b', component: 'activateCmp' }
     ]);
     compile('outer { <div ng-outlet></div> }');
 
-    $router.navigateByUrl('/a');
+    $rootRouter.navigateByUrl('/a');
     $rootScope.$digest();
-    $router.navigateByUrl('/b');
+    $rootRouter.navigateByUrl('/b');
     $rootScope.$digest();
 
     expect(log).toEqual(['deactivate', 'activate']);
@@ -203,19 +203,19 @@ describe('Navigation lifecycle', function () {
       }
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/on-reuse/:number/...', component: 'reuseCmp' },
       { path: '/two', component: 'twoCmp', name: 'Two'}
     ]);
     compile('outer { <div ng-outlet></div> }');
 
-    $router.navigateByUrl('/on-reuse/1/a');
+    $rootRouter.navigateByUrl('/on-reuse/1/a');
     $rootScope.$digest();
     expect(log).toEqual([]);
     expect(cmpInstanceCount).toBe(1);
     expect(elt.text()).toBe('outer { reuse {one} }');
 
-    $router.navigateByUrl('/on-reuse/2/b');
+    $rootRouter.navigateByUrl('/on-reuse/2/b');
     $rootScope.$digest();
     expect(log).toEqual(['reuse: on-reuse/1 -> on-reuse/2']);
     expect(cmpInstanceCount).toBe(1);
@@ -245,19 +245,19 @@ describe('Navigation lifecycle', function () {
       }
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/never-reuse/:number/...', component: 'reuseCmp' },
       { path: '/two', component: 'twoCmp', name: 'Two'}
     ]);
     compile('outer { <div ng-outlet></div> }');
 
-    $router.navigateByUrl('/never-reuse/1/a');
+    $rootRouter.navigateByUrl('/never-reuse/1/a');
     $rootScope.$digest();
     expect(log).toEqual([]);
     expect(cmpInstanceCount).toBe(1);
     expect(elt.text()).toBe('outer { reuse {one} }');
 
-    $router.navigateByUrl('/never-reuse/2/b');
+    $rootRouter.navigateByUrl('/never-reuse/2/b');
     $rootScope.$digest();
     expect(log).toEqual([]);
     expect(cmpInstanceCount).toBe(2);
@@ -274,12 +274,12 @@ describe('Navigation lifecycle', function () {
       $routerOnActivate: spy
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/a', component: 'activateCmp' }
     ]);
     compile('outer { <div ng-outlet></div> }');
 
-    $router.navigateByUrl('/a');
+    $rootRouter.navigateByUrl('/a');
     $rootScope.$digest();
 
     expect(spy).not.toHaveBeenCalled();
@@ -296,12 +296,12 @@ describe('Navigation lifecycle', function () {
       $routerOnActivate: activateSpy
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/a', component: 'activateCmp' }
     ]);
     compile('<div ng-outlet></div>');
 
-    $router.navigateByUrl('/a');
+    $rootRouter.navigateByUrl('/a');
     $rootScope.$digest();
 
     expect(canActivateSpy).toHaveBeenCalled();
@@ -320,12 +320,12 @@ describe('Navigation lifecycle', function () {
       $routerOnActivate: spy
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/a', component: 'activateCmp' }
     ]);
     compile('<div ng-outlet></div>');
 
-    $router.navigateByUrl('/a');
+    $rootRouter.navigateByUrl('/a');
     $rootScope.$digest();
 
     expect(spy).toHaveBeenCalled();
@@ -341,12 +341,12 @@ describe('Navigation lifecycle', function () {
 
     spy.$inject = ['$nextInstruction', '$http'];
 
-    $router.config([
+    $rootRouter.config([
       { path: '/user/:name', component: 'activateCmp' }
     ]);
     compile('<div ng-outlet></div>');
 
-    $router.navigateByUrl('/user/brian');
+    $rootRouter.navigateByUrl('/user/brian');
     $rootScope.$digest();
 
     expect(spy).toHaveBeenCalled();
@@ -364,17 +364,17 @@ describe('Navigation lifecycle', function () {
       }
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/a', component: 'activateCmp' },
       { path: '/b', component: 'oneCmp' }
     ]);
     compile('outer { <div ng-outlet></div> }');
 
-    $router.navigateByUrl('/a');
+    $rootRouter.navigateByUrl('/a');
     $rootScope.$digest();
     expect(elt.text()).toBe('outer { hi }');
 
-    $router.navigateByUrl('/b');
+    $rootRouter.navigateByUrl('/b');
     $rootScope.$digest();
     expect(elt.text()).toBe('outer { hi }');
   });
@@ -388,17 +388,17 @@ describe('Navigation lifecycle', function () {
       }
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/a', component: 'activateCmp' },
       { path: '/b', component: 'oneCmp' }
     ]);
     compile('outer { <div ng-outlet></div> }');
 
-    $router.navigateByUrl('/a');
+    $rootRouter.navigateByUrl('/a');
     $rootScope.$digest();
     expect(elt.text()).toBe('outer { hi }');
 
-    $router.navigateByUrl('/b');
+    $rootRouter.navigateByUrl('/b');
     $rootScope.$digest();
     expect(elt.text()).toBe('outer { one }');
   });
@@ -414,12 +414,12 @@ describe('Navigation lifecycle', function () {
       $routerOnActivate: spy
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/a', component: 'activateCmp' }
     ]);
     compile('<div ng-outlet></div>');
 
-    $router.navigateByUrl('/a');
+    $rootRouter.navigateByUrl('/a');
     $rootScope.$digest();
 
     expect(spy).toHaveBeenCalled();
@@ -433,15 +433,15 @@ describe('Navigation lifecycle', function () {
       $routerCanDeactivate: spy
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/user/:name', component: 'deactivateCmp' },
       { path: '/post/:id', component: 'oneCmp' }
     ]);
     compile('<div ng-outlet></div>');
 
-    $router.navigateByUrl('/user/brian');
+    $rootRouter.navigateByUrl('/user/brian');
     $rootScope.$digest();
-    $router.navigateByUrl('/post/123');
+    $rootRouter.navigateByUrl('/post/123');
     $rootScope.$digest();
     expect(spy).toHaveBeenCalledWith(instructionFor('oneCmp'),
                                      instructionFor('deactivateCmp'));

modules/angular1_router/test/integration/navigation_spec.js

@@ -5,7 +5,7 @@ describe('navigation', function () {
   var elt,
       $compile,
       $rootScope,
-      $router,
+      $rootRouter,
       $compileProvider;
 
   beforeEach(function () {
@@ -15,10 +15,10 @@ describe('navigation', function () {
       $compileProvider = _$compileProvider_;
     });
 
-    inject(function (_$compile_, _$rootScope_, _$router_) {
+    inject(function (_$compile_, _$rootScope_, _$rootRouter_) {
       $compile = _$compile_;
       $rootScope = _$rootScope_;
-      $router = _$router_;
+      $rootRouter = _$rootRouter_;
     });
 
     registerDirective('userCmp', {
@@ -52,11 +52,11 @@ describe('navigation', function () {
   it('should work in a simple case', function () {
     compile('<ng-outlet></ng-outlet>');
 
-    $router.config([
+    $rootRouter.config([
       { path: '/', component: 'oneCmp' }
     ]);
 
-    $router.navigateByUrl('/');
+    $rootRouter.navigateByUrl('/');
     $rootScope.$digest();
 
     expect(elt.text()).toBe('one');
@@ -66,11 +66,11 @@ describe('navigation', function () {
   it('should work with components created by the `mod.component()` helper', function () {
     compile('<ng-outlet></ng-outlet>');
 
-    $router.config([
+    $rootRouter.config([
       { path: '/', component: 'threeCmp' }
     ]);
 
-    $router.navigateByUrl('/');
+    $rootRouter.navigateByUrl('/');
     $rootScope.$digest();
 
     expect(elt.text()).toBe('three');
@@ -78,16 +78,16 @@ describe('navigation', function () {
 
 
   it('should navigate between components with different parameters', function () {
-    $router.config([
+    $rootRouter.config([
       { path: '/user/:name', component: 'userCmp' }
     ]);
     compile('<ng-outlet></ng-outlet>');
 
-    $router.navigateByUrl('/user/brian');
+    $rootRouter.navigateByUrl('/user/brian');
     $rootScope.$digest();
     expect(elt.text()).toBe('hello brian');
 
-    $router.navigateByUrl('/user/igor');
+    $rootRouter.navigateByUrl('/user/igor');
     $rootScope.$digest();
     expect(elt.text()).toBe('hello igor');
   });
@@ -106,17 +106,17 @@ describe('navigation', function () {
       controller: ParentController
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/parent/...', component: 'parentCmp' }
     ]);
     compile('<ng-outlet></ng-outlet>');
 
-    $router.navigateByUrl('/parent/user/brian');
+    $rootRouter.navigateByUrl('/parent/user/brian');
     $rootScope.$digest();
     expect(instanceCount).toBe(1);
     expect(elt.text()).toBe('parent { hello brian }');
 
-    $router.navigateByUrl('/parent/user/igor');
+    $rootRouter.navigateByUrl('/parent/user/igor');
     $rootScope.$digest();
     expect(instanceCount).toBe(1);
     expect(elt.text()).toBe('parent { hello igor }');
@@ -131,12 +131,12 @@ describe('navigation', function () {
       ]
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/a/...', component: 'childCmp' }
     ]);
     compile('<div>outer { <div ng-outlet></div> }</div>');
 
-    $router.navigateByUrl('/a/b');
+    $rootRouter.navigateByUrl('/a/b');
     $rootScope.$digest();
 
     expect(elt.text()).toBe('outer { inner { one } }');
@@ -150,12 +150,12 @@ describe('navigation', function () {
       ]
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/...', component: 'childCmp' }
     ]);
     compile('<div>outer { <div ng-outlet></div> }</div>');
 
-    $router.navigateByUrl('/b');
+    $rootRouter.navigateByUrl('/b');
     $rootScope.$digest();
 
     expect(elt.text()).toBe('outer { inner { one } }');
@@ -171,26 +171,26 @@ describe('navigation', function () {
         { path: '/end', component: 'oneCmp' }
       ]});
 
-    $router.config([
+    $rootRouter.config([
       { path: '/recur', component: 'recurCmp' },
       { path: '/', component: 'oneCmp' }
     ]);
 
     compile('<div>root { <div ng-outlet></div> }</div>');
-    $router.navigateByUrl('/recur/recur/end');
+    $rootRouter.navigateByUrl('/recur/recur/end');
     $rootScope.$digest();
     expect(elt.text()).toBe('root { one }');
   });
 
 
   it('should change location path', inject(function ($location) {
-    $router.config([
+    $rootRouter.config([
       { path: '/user', component: 'userCmp' }
     ]);
 
     compile('<div ng-outlet></div>');
 
-    $router.navigateByUrl('/user');
+    $rootRouter.navigateByUrl('/user');
     $rootScope.$digest();
 
     expect($location.path()).toBe('/user');
@@ -198,13 +198,13 @@ describe('navigation', function () {
 
 
   it('should pass through query terms to the location', inject(function ($location) {
-    $router.config([
+    $rootRouter.config([
       { path: '/user', component: 'userCmp' }
     ]);
 
     compile('<div ng-outlet></div>');
 
-    $router.navigateByUrl('/user?x=y');
+    $rootRouter.navigateByUrl('/user?x=y');
     $rootScope.$digest();
 
     expect($location.path()).toBe('/user');
@@ -215,12 +215,12 @@ describe('navigation', function () {
   it('should change location to the canonical route', inject(function ($location) {
     compile('<div ng-outlet></div>');
 
-    $router.config([
+    $rootRouter.config([
       { path: '/',     redirectTo: ['/User'] },
       { path: '/user', component:  'userCmp', name: 'User' }
     ]);
 
-    $router.navigateByUrl('/');
+    $rootRouter.navigateByUrl('/');
     $rootScope.$digest();
 
     expect($location.path()).toBe('/user');
@@ -236,7 +236,7 @@ describe('navigation', function () {
       ]
     });
 
-    $router.config([
+    $rootRouter.config([
       { path: '/old-parent/old-child', redirectTo: ['/NewParent', 'NewChild'] },
       { path: '/old-parent/old-child-two', redirectTo: ['/NewParent', 'NewChildTwo'] },
       { path: '/new-parent/...', component:  'childRouter', name: 'NewParent' }
@@ -244,13 +244,13 @@ describe('navigation', function () {
 
     compile('<div ng-outlet></div>');
 
-    $router.navigateByUrl('/old-parent/old-child');
+    $rootRouter.navigateByUrl('/old-parent/old-child');
     $rootScope.$digest();
 
     expect($location.path()).toBe('/new-parent/new-child');
     expect(elt.text()).toBe('inner { one }');
 
-    $router.navigateByUrl('/old-parent/old-child-two');
+    $rootRouter.navigateByUrl('/old-parent/old-child-two');
     $rootScope.$digest();
 
     expect($location.path()).toBe('/new-parent/new-child-two');
@@ -259,7 +259,7 @@ describe('navigation', function () {
 
 
   it('should navigate when the location path changes', inject(function ($location) {
-    $router.config([
+    $rootRouter.config([
       { path: '/one', component: 'oneCmp' }
     ]);
     compile('<div ng-outlet></div>');
@@ -272,7 +272,7 @@ describe('navigation', function () {
 
 
   it('should navigate when the location query changes', inject(function ($location) {
-    $router.config([
+    $rootRouter.config([
       { path: '/get/params', component: 'getParams' }
     ]);
     compile('<div ng-outlet></div>');
@@ -284,7 +284,7 @@ describe('navigation', function () {
   }));
 
 
-  it('should expose a "navigating" property on $router', inject(function ($q) {
+  it('should expose a "navigating" property on $rootRouter', inject(function ($q) {
     var defer;
     registerDirective('pendingActivate', {
       $canActivate: function () {
@@ -292,17 +292,17 @@ describe('navigation', function () {
         return defer.promise;
       }
     });
-    $router.config([
+    $rootRouter.config([
       { path: '/pending-activate', component: 'pendingActivate' }
     ]);
     compile('<div ng-outlet></div>');
 
-    $router.navigateByUrl('/pending-activate');
+    $rootRouter.navigateByUrl('/pending-activate');
     $rootScope.$digest();
-    expect($router.navigating).toBe(true);
+    expect($rootRouter.navigating).toBe(true);
     defer.resolve();
     $rootScope.$digest();
-    expect($router.navigating).toBe(false);
+    expect($rootRouter.navigating).toBe(false);
   }));
 
   function registerDirective(name, options) {

modules/angular1_router/test/integration/router_spec.js

@@ -5,7 +5,7 @@ describe('router', function () {
   var elt,
       $compile,
       $rootScope,
-      $router,
+      $rootRouter,
       $compileProvider;
 
   beforeEach(function () {
@@ -18,10 +18,10 @@ describe('router', function () {
       $compileProvider = _$compileProvider_;
     });
 
-    inject(function (_$compile_, _$rootScope_, _$router_) {
+    inject(function (_$compile_, _$rootScope_, _$rootRouter_) {
       $compile = _$compile_;
       $rootScope = _$rootScope_;
-      $router = _$router_;
+      $rootRouter = _$rootRouter_;
     });
   });
 

modules/angular1_router/test/integration/shim_spec.js

@@ -5,7 +5,7 @@ describe('ngRoute shim', function () {
   var elt,
     $compile,
     $rootScope,
-    $router,
+    $rootRouter,
     $compileProvider,
     $routeProvider;
 
@@ -18,10 +18,10 @@ describe('ngRoute shim', function () {
       $routeProvider = _$routeProvider_;
     });
 
-    inject(function (_$compile_, _$rootScope_, _$router_) {
+    inject(function (_$compile_, _$rootScope_, _$rootRouter_) {
       $compile = _$compile_;
       $rootScope = _$rootScope_;
-      $router = _$router_;
+      $rootRouter = _$rootRouter_;
     });
   });
 
@@ -36,7 +36,7 @@ describe('ngRoute shim', function () {
 
     compile('<ng-outlet></ng-outlet>');
 
-    $router.navigateByUrl('/');
+    $rootRouter.navigateByUrl('/');
     $rootScope.$digest();
 
     expect(elt.text()).toBe('one');
@@ -55,7 +55,7 @@ describe('ngRoute shim', function () {
 
     compile('root {<ng-outlet></ng-outlet>}');
 
-    $router.navigateByUrl('/');
+    $rootRouter.navigateByUrl('/');
     $rootScope.$digest();
     expect(elt.text()).toBe('root {one}');
   }));
@@ -76,7 +76,7 @@ describe('ngRoute shim', function () {
 
     compile('<ng-outlet></ng-outlet>');
 
-    $router.navigateByUrl('/');
+    $rootRouter.navigateByUrl('/');
     $rootScope.$digest();
 
     expect(elt.text()).toBe('value: 42');
@@ -94,11 +94,11 @@ describe('ngRoute shim', function () {
 
     compile('<ng-outlet></ng-outlet>');
 
-    $router.navigateByUrl('/user/brian');
+    $rootRouter.navigateByUrl('/user/brian');
     $rootScope.$digest();
     expect(elt.text()).toBe('hello brian');
 
-    $router.navigateByUrl('/user/igor');
+    $rootRouter.navigateByUrl('/user/igor');
     $rootScope.$digest();
     expect(elt.text()).toBe('hello igor');
   });
@@ -115,7 +115,7 @@ describe('ngRoute shim', function () {
 
     compile('<ng-outlet></ng-outlet>');
 
-    $router.navigateByUrl('/home/foo/bar/123');
+    $rootRouter.navigateByUrl('/home/foo/bar/123');
     $rootScope.$digest();
     expect(elt.text()).toBe('rest: foo/bar/123');
   });
@@ -129,7 +129,7 @@ describe('ngRoute shim', function () {
 
     compile('root {<ng-outlet></ng-outlet>}');
 
-    $router.navigateByUrl('/home/test');
+    $rootRouter.navigateByUrl('/home/test');
     $rootScope.$digest();
     expect(elt.text()).toBe('root {}');
     expect(console.warn)
@@ -150,7 +150,7 @@ describe('ngRoute shim', function () {
 
     compile('root {<ng-outlet></ng-outlet>}');
 
-    $router.navigateByUrl('/');
+    $rootRouter.navigateByUrl('/');
     $rootScope.$digest();
     expect(elt.text()).toBe('root {welcome home!}');
     expect($location.path()).toBe('/home');
@@ -169,7 +169,7 @@ describe('ngRoute shim', function () {
 
     compile('root {<ng-outlet></ng-outlet>}');
 
-    $router.navigateByUrl('/somewhere');
+    $rootRouter.navigateByUrl('/somewhere');
     $rootScope.$digest();
     expect(elt.text()).toBe('root {welcome home!}');
     expect($location.path()).toBe('/home');