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

refactor(router): convert PreActivation's resolve data to pure functions & remove PreActivation class (#26239)

Browse Source 
PR Close #26239
This commit is contained in:
Jason Aden
2018-10-02 14:39:23 -07:00
parent fe45b9cebd
commit ac68c75e26
5 changed files with 85 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/router/test/router.spec.ts
View File

@ -13,8 +13,8 @@ import {of } from 'rxjs';
import {Routes} from '../src/config';
import {ChildActivationStart} from '../src/events';
import {checkGuards as checkGuardsOperator} from '../src/operators/check_guards';
import {PreActivation} from '../src/pre_activation';
import {Router} from '../src/router';
import {resolveData as resolveDataOperator} from '../src/operators/resolve_data';
import {NavigationTransition, Router} from '../src/router';
import {ChildrenOutletContexts} from '../src/router_outlet_context';
import {RouterStateSnapshot, createEmptyStateSnapshot} from '../src/router_state';
import {DefaultUrlSerializer} from '../src/url_tree';
@ -538,15 +538,15 @@ describe('Router', () => {
function checkResolveData(
future: RouterStateSnapshot, curr: RouterStateSnapshot, injector: any, check: any): void {
const p = new PreActivation(future, curr, injector);
p.initialize(new ChildrenOutletContexts());
p.resolveData('emptyOnly').subscribe(check, (e) => { throw e; });
of ({ targetSnapshot: future, currentSnapshot: curr } as Partial<NavigationTransition>)
.pipe(resolveDataOperator(new ChildrenOutletContexts(), 'emptyOnly', injector))
.subscribe(check, (e) => { throw e; });
}
function checkGuards(
future: RouterStateSnapshot, curr: RouterStateSnapshot, injector: any,
check: (result: boolean) => void): void {
of ({ targetSnapshot: future, currentSnapshot: curr } as any)
of ({ targetSnapshot: future, currentSnapshot: curr } as Partial<NavigationTransition>)
.pipe(checkGuardsOperator(new ChildrenOutletContexts(), injector))
.subscribe(t => check(!!t.guardsResult), (e) => { throw e; });
}