cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(router): rename navigate and navigateInstruction methods

Browse Source
This commit is contained in:
Brian Ford
2015-09-08 21:41:56 -07:00
parent 5e49d7e624
commit acc2722cb8
17 changed files with 126 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/angular1_router/test/component_mapper_spec.js vendored
View File

@ -63,7 +63,7 @@ describe('$componentMapper', function () {
{ path: '/', component: Ctrl }
]);
$router.navigate('/');
$router.navigateByUrl('/');
$rootScope.$digest();
expect(elt.text()).toBe('howdy');

52
modules/angular1_router/test/integration/lifecycle_hook_spec.js vendored
View File

@ -51,7 +51,7 @@ describe('ngOutlet', function () {
]);
compile('<div>outer { <div ng-outlet></div> }</div>');
$router.navigate('/a');
$router.navigateByUrl('/a');
$rootScope.$digest();
expect(spy).toHaveBeenCalled();
@ -69,7 +69,7 @@ describe('ngOutlet', function () {
]);
compile('<div ng-outlet></div>');
$router.navigate('/user/brian');
$router.navigateByUrl('/user/brian');
$rootScope.$digest();
expect(spy).toHaveBeenCalledWith(instructionFor(UserController), undefined);
@ -88,9 +88,9 @@ describe('ngOutlet', function () {
]);
compile('<div ng-outlet></div>');
$router.navigate('/user/brian');
$router.navigateByUrl('/user/brian');
$rootScope.$digest();
$router.navigate('/post/123');
$router.navigateByUrl('/post/123');
$rootScope.$digest();
expect(spy).toHaveBeenCalledWith(instructionFor(activate),
instructionFor(OneController));
@ -108,7 +108,7 @@ describe('ngOutlet', function () {
]);
compile('<div ng-outlet></div>');
$router.navigate('/user');
$router.navigateByUrl('/user');
$rootScope.$digest();
expect(injectedScope).toBeDefined();
@ -127,9 +127,9 @@ describe('ngOutlet', function () {
]);
compile('<div ng-outlet></div>');
$router.navigate('/a');
$router.navigateByUrl('/a');
$rootScope.$digest();
$router.navigate('/b');
$router.navigateByUrl('/b');
$rootScope.$digest();
expect(spy).toHaveBeenCalled();
});
@ -147,9 +147,9 @@ describe('ngOutlet', function () {
]);
compile('<div ng-outlet></div>');
$router.navigate('/user/brian');
$router.navigateByUrl('/user/brian');
$rootScope.$digest();
$router.navigate('/post/123');
$router.navigateByUrl('/post/123');
$rootScope.$digest();
expect(spy).toHaveBeenCalledWith(instructionFor(OneController),
instructionFor(deactivate));
@ -177,9 +177,9 @@ describe('ngOutlet', function () {
]);
compile('outer { <div ng-outlet></div> }');
$router.navigate('/a');
$router.navigateByUrl('/a');
$rootScope.$digest();
$router.navigate('/b');
$router.navigateByUrl('/b');
$rootScope.$digest();
expect(log).toEqual(['deactivate', 'activate']);
@ -207,13 +207,13 @@ describe('ngOutlet', function () {
]);
compile('outer { <div ng-outlet></div> }');
$router.navigate('/on-reuse/1/a');
$router.navigateByUrl('/on-reuse/1/a');
$rootScope.$digest();
expect(log).toEqual([]);
expect(cmpInstanceCount).toBe(1);
expect(elt.text()).toBe('outer { reuse {one} }');
$router.navigate('/on-reuse/2/b');
$router.navigateByUrl('/on-reuse/2/b');
$rootScope.$digest();
expect(log).toEqual(['reuse: on-reuse/1 -> on-reuse/2']);
expect(cmpInstanceCount).toBe(1);
@ -242,13 +242,13 @@ describe('ngOutlet', function () {
]);
compile('outer { <div ng-outlet></div> }');
$router.navigate('/never-reuse/1/a');
$router.navigateByUrl('/never-reuse/1/a');
$rootScope.$digest();
expect(log).toEqual([]);
expect(cmpInstanceCount).toBe(1);
expect(elt.text()).toBe('outer { reuse {one} }');
$router.navigate('/never-reuse/2/b');
$router.navigateByUrl('/never-reuse/2/b');
$rootScope.$digest();
expect(log).toEqual([]);
expect(cmpInstanceCount).toBe(2);
@ -270,7 +270,7 @@ describe('ngOutlet', function () {
]);
compile('outer { <div ng-outlet></div> }');
$router.navigate('/a');
$router.navigateByUrl('/a');
$rootScope.$digest();
expect(spy).not.toHaveBeenCalled();
@ -292,7 +292,7 @@ describe('ngOutlet', function () {
]);
compile('<div ng-outlet></div>');
$router.navigate('/a');
$router.navigateByUrl('/a');
$rootScope.$digest();
expect(spy).toHaveBeenCalled();
@ -314,7 +314,7 @@ describe('ngOutlet', function () {
]);
compile('<div ng-outlet></div>');
$router.navigate('/a');
$router.navigateByUrl('/a');
$rootScope.$digest();
expect(spy).toHaveBeenCalled();
@ -335,7 +335,7 @@ describe('ngOutlet', function () {
]);
compile('<div ng-outlet></div>');
$router.navigate('/user/brian');
$router.navigateByUrl('/user/brian');
$rootScope.$digest();
expect(spy).toHaveBeenCalledWith({name: 'brian'}, $http);
}));
@ -354,11 +354,11 @@ describe('ngOutlet', function () {
]);
compile('outer { <div ng-outlet></div> }');
$router.navigate('/a');
$router.navigateByUrl('/a');
$rootScope.$digest();
expect(elt.text()).toBe('outer { hi }');
$router.navigate('/b');
$router.navigateByUrl('/b');
$rootScope.$digest();
expect(elt.text()).toBe('outer { hi }');
});
@ -377,11 +377,11 @@ describe('ngOutlet', function () {
]);
compile('outer { <div ng-outlet></div> }');
$router.navigate('/a');
$router.navigateByUrl('/a');
$rootScope.$digest();
expect(elt.text()).toBe('outer { hi }');
$router.navigate('/b');
$router.navigateByUrl('/b');
$rootScope.$digest();
expect(elt.text()).toBe('outer { one }');
});
@ -401,7 +401,7 @@ describe('ngOutlet', function () {
]);
compile('<div ng-outlet></div>');
$router.navigate('/a');
$router.navigateByUrl('/a');
$rootScope.$digest();
expect(spy).toHaveBeenCalled();
@ -421,9 +421,9 @@ describe('ngOutlet', function () {
]);
compile('<div ng-outlet></div>');
$router.navigate('/user/brian');
$router.navigateByUrl('/user/brian');
$rootScope.$digest();
$router.navigate('/post/123');
$router.navigateByUrl('/post/123');
$rootScope.$digest();
expect(spy).toHaveBeenCalledWith(instructionFor(OneController),
instructionFor(deactivate));

28
modules/angular1_router/test/integration/navigation_spec.js vendored
View File

@ -43,7 +43,7 @@ describe('navigation', function () {
{ path: '/', component: OneController }
]);
$router.navigate('/');
$router.navigateByUrl('/');
$rootScope.$digest();
expect(elt.text()).toBe('one');
@ -59,7 +59,7 @@ describe('navigation', function () {
spyOn(console, 'warn');
compile('<ng-outlet></ng-outlet>');
$router.navigate('/');
$router.navigateByUrl('/');
expect(console.warn).toHaveBeenCalledWith('Could not find controller for', 'NoControllerController');
expect(elt.text()).toBe('4');
@ -72,11 +72,11 @@ describe('navigation', function () {
]);
compile('<ng-outlet></ng-outlet>');
$router.navigate('/user/brian');
$router.navigateByUrl('/user/brian');
$rootScope.$digest();
expect(elt.text()).toBe('hello brian');
$router.navigate('/user/igor');
$router.navigateByUrl('/user/igor');
$rootScope.$digest();
expect(elt.text()).toBe('hello igor');
});
@ -97,14 +97,14 @@ describe('navigation', function () {
]);
compile('<ng-outlet></ng-outlet>');
$router.navigate('/parent/user/brian');
$router.navigateByUrl('/parent/user/brian');
$rootScope.$digest();
expect(spy).toHaveBeenCalled();
expect(elt.text()).toBe('parent { hello brian }');
spy.calls.reset();
$router.navigate('/parent/user/igor');
$router.navigateByUrl('/parent/user/igor');
$rootScope.$digest();
expect(spy).not.toHaveBeenCalled();
expect(elt.text()).toBe('parent { hello igor }');
@ -121,7 +121,7 @@ describe('navigation', function () {
]);
compile('<div>outer { <div ng-outlet></div> }</div>');
$router.navigate('/a/b');
$router.navigateByUrl('/a/b');
$rootScope.$digest();
expect(elt.text()).toBe('outer { inner { one } }');
@ -136,7 +136,7 @@ describe('navigation', function () {
]);
compile('<div>root { <div ng-outlet></div> }</div>');
$router.navigate('/');
$router.navigateByUrl('/');
$rootScope.$digest();
expect(elt.text()).toBe('root { one }');
});
@ -152,7 +152,7 @@ describe('navigation', function () {
]);
compile('<div ng-outlet></div>');
$router.navigate('/user');
$router.navigateByUrl('/user');
$rootScope.$digest();
expect(injectedScope).toBeDefined();
@ -166,7 +166,7 @@ describe('navigation', function () {
compile('<div ng-outlet></div>');
$router.navigate('/user');
$router.navigateByUrl('/user');
$rootScope.$digest();
expect($location.path()).toBe('/user');
@ -181,7 +181,7 @@ describe('navigation', function () {
{ path: '/user', component: UserController }
]);
$router.navigate('/');
$router.navigateByUrl('/');
$rootScope.$digest();
expect($location.path()).toBe('/user');
@ -203,13 +203,13 @@ describe('navigation', function () {
compile('<div ng-outlet></div>');
$router.navigate('/old-parent/old-child');
$router.navigateByUrl('/old-parent/old-child');
$rootScope.$digest();
expect($location.path()).toBe('/new-parent/new-child');
expect(elt.text()).toBe('inner { one }');
$router.navigate('/old-parent/old-child-two');
$router.navigateByUrl('/old-parent/old-child-two');
$rootScope.$digest();
expect($location.path()).toBe('/new-parent/new-child-two');
@ -243,7 +243,7 @@ describe('navigation', function () {
]);
compile('<div ng-outlet></div>');
$router.navigate('/pendingActivate');
$router.navigateByUrl('/pendingActivate');
$rootScope.$digest();
expect($router.navigating).toBe(true);
defer.resolve();

8
modules/angular1_router/test/ng_link_spec.js vendored
View File

@ -42,7 +42,7 @@ describe('ngOutlet', function () {
]);
compile('<a ng-link="[\'/two\']">link</a> | outer { <div ng-outlet></div> }');
$router.navigate('/a');
$router.navigateByUrl('/a');
$rootScope.$digest();
expect(elt.find('a').attr('href')).toBe('./b');
@ -57,7 +57,7 @@ describe('ngOutlet', function () {
]);
compile('outer { <div ng-outlet></div> }');
$router.navigate('/a');
$router.navigateByUrl('/a');
$rootScope.$digest();
expect(elt.find('a').attr('href')).toBe('./b');
@ -74,7 +74,7 @@ describe('ngOutlet', function () {
]);
compile('<div ng-outlet></div>');
$router.navigate('/a');
$router.navigateByUrl('/a');
$rootScope.$digest();
expect(elt.find('a').attr('href')).toBe('./b/lol');
@ -91,7 +91,7 @@ describe('ngOutlet', function () {
]);
compile('<div ng-outlet></div>');
$router.navigate('/a');
$router.navigateByUrl('/a');
$rootScope.$digest();
expect(elt.find('a').attr('href')).toBe('./b/one');

4
modules/angular1_router/test/ng_outlet_animation_spec.js vendored
View File

@ -46,7 +46,7 @@ describe('ngOutlet animations', function () {
{ path: '/user/:name', component: UserController }
]);
$router.navigate('/user/brian');
$router.navigateByUrl('/user/brian');
$rootScope.$digest();
expect(elt.text()).toBe('hello brian');
@ -55,7 +55,7 @@ describe('ngOutlet animations', function () {
expect(item.event).toBe('enter');
// navigate to pete
$router.navigate('/user/pete');
$router.navigateByUrl('/user/pete');
$rootScope.$digest();
expect(elt.text()).toBe('hello pete');