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

12
modules/angular2/test/router/integration/router_integration_spec.ts
View File

@ -72,7 +72,7 @@ export function main() {
inject([AsyncTestCompleter, TestComponentBuilder], (async, tcb: TestComponentBuilder) => {
tcb.createAsync(AppCmp).then((rootTC) => {
var router = rootTC.componentInstance.router;
PromiseWrapper.catchError(router.navigate('/cause-error'), (error) => {
PromiseWrapper.catchError(router.navigateByUrl('/cause-error'), (error) => {
expect(rootTC.nativeElement).toHaveText('outer { oh no }');
expect(error).toContainError('oops!');
async.done();
@ -123,11 +123,11 @@ export function main() {
if (flipped) {
location.back();
} else {
router.navigate(nextUrl);
router.navigateByUrl(nextUrl);
}
});
router.navigate(history[0][0]);
router.navigateByUrl(history[0][0]);
});
}), 1000);
});
@ -146,7 +146,7 @@ export function main() {
expect(rootTC.componentInstance.location.path()).toEqual('/parent/child');
async.done();
});
router.navigate('/parent/child');
router.navigateByUrl('/parent/child');
});
}), 1000);
@ -165,7 +165,7 @@ export function main() {
.toEqual('/my/app/parent/child');
async.done();
});
router.navigate('/parent/child');
router.navigateByUrl('/parent/child');
});
}),
1000);
@ -190,7 +190,7 @@ export function main() {
.toEqual('/qs?q=search-for-something');*/
async.done();
});
router.navigate('/qs?q=search-for-something');
router.navigateByUrl('/qs?q=search-for-something');
rootTC.detectChanges();
});
}), 1000);