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

fix(router): canLoad should cancel a navigation instead of failing it (#11001)

Browse Source
This commit is contained in:
Victor Savkin
2016-08-24 10:20:44 -07:00
committed by Kara
parent 7dfcaac730
commit f1ce7607a6
5 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/@angular/router/test/integration.spec.ts
View File

@ -1230,13 +1230,14 @@ describe('Integration', () => {
// failed navigation
router.navigateByUrl('/lazyFalse/loaded').catch(s => {});
router.navigateByUrl('/lazyFalse/loaded');
advance(fixture);
expect(location.path()).toEqual('/');
expectEvents(recordedEvents, [
[NavigationStart, '/lazyFalse/loaded'], [NavigationError, '/lazyFalse/loaded']
[NavigationStart, '/lazyFalse/loaded'],
[NavigationCancel, '/lazyFalse/loaded']
]);
recordedEvents.splice(0);