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

feat(router): change location when navigating

Browse Source
This commit is contained in:
vsavkin
2016-04-28 08:01:27 -07:00
committed by Victor Savkin
parent de56dd5f30
commit 560cc14d97
11 changed files with 589 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/angular2/test/alt_router/integration_spec.ts
View File

@ -28,8 +28,10 @@ import {
Routes,
RouterUrlSerializer,
DefaultRouterUrlSerializer,
OnActivate
OnActivate,
Location
} from 'angular2/alt_router';
import {SpyLocation} from 'angular2/src/mock/location_mock';
import {DOM} from 'angular2/src/platform/dom/dom_adapter';
export function main() {
@ -37,14 +39,28 @@ export function main() {
beforeEachProviders(() => [
provide(RouterUrlSerializer, {useClass: DefaultRouterUrlSerializer}),
RouterOutletMap,
provide(Location, {useClass: SpyLocation}),
provide(Router,
{
useFactory: (resolver, urlParser, outletMap) =>
new Router(RootCmp, resolver, urlParser, outletMap),
deps: [ComponentResolver, RouterUrlSerializer, RouterOutletMap]
useFactory: (resolver, urlParser, outletMap, location) =>
new Router(RootCmp, resolver, urlParser, outletMap, location),
deps: [ComponentResolver, RouterUrlSerializer, RouterOutletMap, Location]
})
]);
it('should update location when navigating',
fakeAsync(inject([Router, TestComponentBuilder, Location], (router, tcb, location) => {
let fixture = tcb.createFakeAsync(RootCmp);
router.navigateByUrl('/team/22/user/victor');
advance(fixture);
expect(location.path()).toEqual('/team/22/user/victor');
router.navigateByUrl('/team/33/simple');
advance(fixture);
expect(location.path()).toEqual('/team/33/simple');
})));
it('should support nested routes',
fakeAsync(inject([Router, TestComponentBuilder], (router, tcb) => {
let fixture = tcb.createFakeAsync(RootCmp);