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

fix(router): merge SystemJsAppModuleFactoryLoader and SystemJsAllModuleLoader

Browse Source
This commit is contained in:
vsavkin
2016-07-13 10:39:16 -07:00
parent 0b54e3cf0a
commit 0426325ef7
6 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/@angular/router/test/router.spec.ts
View File

@ -111,7 +111,7 @@ describe('Integration', () => {
children: [{path: 'user/:name', component: UserCmp}]
}]);
const recordedEvents: any = [];
const recordedEvents: any[] = [];
router.events.forEach(e => recordedEvents.push(e));
router.navigateByUrl('/team/22/user/victor');
@ -123,7 +123,7 @@ describe('Integration', () => {
(<any>location).simulateUrlPop('/team/22/user/fedor');
advance(fixture);
expect(fixture.debugElement.nativeElement).toHaveText('team 22 { user fedor, right: }');
expect(fixture.debugElement.nativeElement).toHaveText('team 22 [ user fedor, right: ]');
expectEvents(recordedEvents, [
[NavigationStart, '/team/22/user/victor'], [RoutesRecognized, '/team/22/user/victor'],
@ -298,7 +298,7 @@ describe('Integration', () => {
router.resetConfig([{path: 'user/:name', component: UserCmp}]);
const recordedEvents: any = [];
const recordedEvents: any[] = [];
router.events.forEach(e => recordedEvents.push(e));
router.navigateByUrl('/user/init');
@ -335,7 +335,7 @@ describe('Integration', () => {
router.resetConfig([{path: 'user/:name', component: UserCmp}]);
const recordedEvents: any = [];
const recordedEvents: any[] = [];
router.events.forEach(e => recordedEvents.push(e));
let e: any;
@ -1217,7 +1217,7 @@ describe('Integration', () => {
router.resetConfig([{path: 'lazy', loadChildren: 'invalid'}]);
const recordedEvents: any = [];
const recordedEvents: any[] = [];
router.events.forEach(e => recordedEvents.push(e));
router.navigateByUrl('/lazy/loaded').catch(s => {})