forked from angular/angular
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(router): support links with just auxiliary routes
Closes angular#5930
- Loading branch information
Showing
12 changed files
with
466 additions
and
285 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
150 changes: 12 additions & 138 deletions
150
modules/angular2/test/router/integration/auxiliary_route_spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,145 +1,19 @@ | ||
| import { | ||
| ComponentFixture, | ||
| AsyncTestCompleter, | ||
| TestComponentBuilder, | ||
| beforeEach, | ||
| ddescribe, | ||
| xdescribe, | ||
| describe, | ||
| el, | ||
| expect, | ||
| iit, | ||
| inject, | ||
| beforeEachProviders, | ||
| it, | ||
| xit | ||
| } from 'angular2/testing_internal'; | ||
| describeRouter, | ||
| ddescribeRouter, | ||
| describeWith, | ||
| describeWithout, | ||
| describeWithAndWithout, | ||
| itShouldRoute | ||
| } from './util'; | ||
|
|
||
| import {provide, Component, Injector, Inject} from 'angular2/core'; | ||
|
|
||
| import {Router, ROUTER_DIRECTIVES, RouteParams, RouteData, Location} from 'angular2/router'; | ||
| import {RouteConfig, Route, AuxRoute, Redirect} from 'angular2/src/router/route_config_decorator'; | ||
|
|
||
| import {TEST_ROUTER_PROVIDERS, RootCmp, compile, clickOnElement, getHref} from './util'; | ||
|
|
||
| function getLinkElement(rtc: ComponentFixture) { | ||
| return rtc.debugElement.componentViewChildren[0].nativeElement; | ||
| } | ||
|
|
||
| var cmpInstanceCount; | ||
| var childCmpInstanceCount; | ||
| import {registerSpecs} from './impl/aux_route_spec_impl'; | ||
|
|
||
| export function main() { | ||
| describe('auxiliary routes', () => { | ||
|
|
||
| var tcb: TestComponentBuilder; | ||
| var fixture: ComponentFixture; | ||
| var rtr; | ||
|
|
||
| beforeEachProviders(() => TEST_ROUTER_PROVIDERS); | ||
|
|
||
| beforeEach(inject([TestComponentBuilder, Router], (tcBuilder, router) => { | ||
| tcb = tcBuilder; | ||
| rtr = router; | ||
| childCmpInstanceCount = 0; | ||
| cmpInstanceCount = 0; | ||
| })); | ||
|
|
||
| it('should recognize and navigate from the URL', inject([AsyncTestCompleter], (async) => { | ||
| compile(tcb, `main {<router-outlet></router-outlet>} | aux {<router-outlet name="modal"></router-outlet>}`) | ||
| .then((rtc) => {fixture = rtc}) | ||
| .then((_) => rtr.config([ | ||
| new Route({path: '/hello', component: HelloCmp, name: 'Hello'}), | ||
| new AuxRoute({path: '/modal', component: ModalCmp, name: 'Aux'}) | ||
| ])) | ||
| .then((_) => rtr.navigateByUrl('/hello(modal)')) | ||
| .then((_) => { | ||
| fixture.detectChanges(); | ||
| expect(fixture.debugElement.nativeElement).toHaveText('main {hello} | aux {modal}'); | ||
| async.done(); | ||
| }); | ||
| })); | ||
|
|
||
| it('should navigate via the link DSL', inject([AsyncTestCompleter], (async) => { | ||
| compile(tcb, `main {<router-outlet></router-outlet>} | aux {<router-outlet name="modal"></router-outlet>}`) | ||
| .then((rtc) => {fixture = rtc}) | ||
| .then((_) => rtr.config([ | ||
| new Route({path: '/hello', component: HelloCmp, name: 'Hello'}), | ||
| new AuxRoute({path: '/modal', component: ModalCmp, name: 'Modal'}) | ||
| ])) | ||
| .then((_) => rtr.navigate(['/Hello', ['Modal']])) | ||
| .then((_) => { | ||
| fixture.detectChanges(); | ||
| expect(fixture.debugElement.nativeElement).toHaveText('main {hello} | aux {modal}'); | ||
| async.done(); | ||
| }); | ||
| })); | ||
| registerSpecs(); | ||
|
|
||
| it('should generate a link URL', inject([AsyncTestCompleter], (async) => { | ||
| compile( | ||
| tcb, | ||
| `<a [routerLink]="['/Hello', ['Modal']]">open modal</a> | main {<router-outlet></router-outlet>} | aux {<router-outlet name="modal"></router-outlet>}`) | ||
| .then((rtc) => {fixture = rtc}) | ||
| .then((_) => rtr.config([ | ||
| new Route({path: '/hello', component: HelloCmp, name: 'Hello'}), | ||
| new AuxRoute({path: '/modal', component: ModalCmp, name: 'Modal'}) | ||
| ])) | ||
| .then((_) => { | ||
| fixture.detectChanges(); | ||
| expect(getHref(getLinkElement(fixture))).toEqual('/hello(modal)'); | ||
| async.done(); | ||
| }); | ||
| })); | ||
|
|
||
| it('should navigate from a link click', | ||
| inject([AsyncTestCompleter, Location], (async, location) => { | ||
| compile( | ||
| tcb, | ||
| `<a [routerLink]="['/Hello', ['Modal']]">open modal</a> | main {<router-outlet></router-outlet>} | aux {<router-outlet name="modal"></router-outlet>}`) | ||
| .then((rtc) => {fixture = rtc}) | ||
| .then((_) => rtr.config([ | ||
| new Route({path: '/hello', component: HelloCmp, name: 'Hello'}), | ||
| new AuxRoute({path: '/modal', component: ModalCmp, name: 'Modal'}) | ||
| ])) | ||
| .then((_) => { | ||
| fixture.detectChanges(); | ||
| expect(fixture.debugElement.nativeElement) | ||
| .toHaveText('open modal | main {} | aux {}'); | ||
|
|
||
| rtr.subscribe((_) => { | ||
| fixture.detectChanges(); | ||
| expect(fixture.debugElement.nativeElement) | ||
| .toHaveText('open modal | main {hello} | aux {modal}'); | ||
| expect(location.urlChanges).toEqual(['/hello(modal)']); | ||
| async.done(); | ||
| }); | ||
|
|
||
| clickOnElement(getLinkElement(fixture)); | ||
| }); | ||
| })); | ||
| describeRouter('aux routes', () => { | ||
| itShouldRoute(); | ||
| describeWith('a primary route', itShouldRoute); | ||
| }); | ||
| } | ||
|
|
||
|
|
||
| @Component({selector: 'hello-cmp', template: `{{greeting}}`}) | ||
| class HelloCmp { | ||
| greeting: string; | ||
| constructor() { this.greeting = 'hello'; } | ||
| } | ||
|
|
||
| @Component({selector: 'modal-cmp', template: `modal`}) | ||
| class ModalCmp { | ||
| } | ||
|
|
||
| @Component({ | ||
| selector: 'aux-cmp', | ||
| template: 'main {<router-outlet></router-outlet>} | ' + | ||
| 'aux {<router-outlet name="modal"></router-outlet>}', | ||
| directives: [ROUTER_DIRECTIVES], | ||
| }) | ||
| @RouteConfig([ | ||
| new Route({path: '/hello', component: HelloCmp, name: 'Hello'}), | ||
| new AuxRoute({path: '/modal', component: ModalCmp, name: 'Aux'}) | ||
| ]) | ||
| class AuxCmp { | ||
| } |
Oops, something went wrong.