honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test(router): remove View decorator in router link fixtures

This commit is contained in:
Brian Ford 2015-11-02 16:15:05 -08:00
parent 0b1ff2db9e
commit 422a7b18f6
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
modules/angular2/test/router/integration/router_link_spec.ts
View File

@ -21,7 +21,7 @@ import {NumberWrapper} from 'angular2/src/facade/lang';
import {PromiseWrapper} from 'angular2/src/facade/async'; import {PromiseWrapper} from 'angular2/src/facade/async';
import {ListWrapper} from 'angular2/src/facade/collection'; import {ListWrapper} from 'angular2/src/facade/collection';
import {provide, Component, DirectiveResolver, View} from 'angular2/core'; import {provide, Component, DirectiveResolver} from 'angular2/core';
import {SpyLocation} from 'angular2/src/mock/location_mock'; import {SpyLocation} from 'angular2/src/mock/location_mock';
import { import {
@ -386,15 +386,17 @@ class MyComp {
name; name;
} }
@Component({selector: 'user-cmp'}) @Component({
@View({template: "hello {{user}}"}) selector: 'user-cmp',
template: "hello {{user}}"
})
class UserCmp { class UserCmp {
user: string; user: string;
constructor(params: RouteParams) { this.user = params.get('name'); } constructor(params: RouteParams) { this.user = params.get('name'); }
} }
@Component({selector: 'page-cmp'}) @Component({
@View({ selector: 'page-cmp',
template: template:
`page #{{pageNumber}} | <a href="hello" [router-link]="[\'../Page\', {number: nextPage}]">next</a>`, `page #{{pageNumber}} | <a href="hello" [router-link]="[\'../Page\', {number: nextPage}]">next</a>`,
directives: [RouterLink] directives: [RouterLink]
@ -408,8 +410,8 @@ class SiblingPageCmp {
} }
} }
@Component({selector: 'page-cmp'}) @Component({
@View({ selector: 'page-cmp',
template: template:
`page #{{pageNumber}} | <a href="hello" [router-link]="[\'Page\', {number: nextPage}]">next</a>`, `page #{{pageNumber}} | <a href="hello" [router-link]="[\'Page\', {number: nextPage}]">next</a>`,
directives: [RouterLink] directives: [RouterLink]
@ -423,13 +425,17 @@ class NoPrefixSiblingPageCmp {
} }
} }
@Component({selector: 'hello-cmp'}) @Component({
@View({template: 'hello'}) selector: 'hello-cmp',
template: 'hello'
})
class HelloCmp { class HelloCmp {
} }
@Component({selector: 'hello2-cmp'}) @Component({
@View({template: 'hello2'}) selector: 'hello2-cmp',
template: 'hello2'
})
class Hello2Cmp { class Hello2Cmp {
} }
@ -437,8 +443,8 @@ function parentCmpLoader() {
return PromiseWrapper.resolve(ParentCmp); return PromiseWrapper.resolve(ParentCmp);
} }
@Component({selector: 'parent-cmp'}) @Component({
@View({ selector: 'parent-cmp',
template: `{ <a [router-link]="['./Grandchild']" class="grandchild-link">Grandchild</a> template: `{ <a [router-link]="['./Grandchild']" class="grandchild-link">Grandchild</a>
<a [router-link]="['./BetterGrandchild']" class="better-grandchild-link">Better Grandchild</a> <a [router-link]="['./BetterGrandchild']" class="better-grandchild-link">Better Grandchild</a>
<router-outlet></router-outlet> }`, <router-outlet></router-outlet> }`,
@ -452,8 +458,8 @@ class ParentCmp {
constructor(public router: Router) {} constructor(public router: Router) {}
} }
@Component({selector: 'book-cmp'}) @Component({
@View({ selector: 'book-cmp',
template: `<a href="hello" [router-link]="[\'./Page\', {number: 100}]">{{title}}</a> | template: `<a href="hello" [router-link]="[\'./Page\', {number: 100}]">{{title}}</a> |
<router-outlet></router-outlet>`, <router-outlet></router-outlet>`,
directives: ROUTER_DIRECTIVES directives: ROUTER_DIRECTIVES
@ -464,8 +470,8 @@ class BookCmp {
constructor(params: RouteParams) { this.title = params.get('title'); } constructor(params: RouteParams) { this.title = params.get('title'); }
} }
@Component({selector: 'book-cmp'}) @Component({
@View({ selector: 'book-cmp',
template: `<a href="hello" [router-link]="[\'Page\', {number: 100}]">{{title}}</a> | template: `<a href="hello" [router-link]="[\'Page\', {number: 100}]">{{title}}</a> |
<router-outlet></router-outlet>`, <router-outlet></router-outlet>`,
directives: ROUTER_DIRECTIVES directives: ROUTER_DIRECTIVES
@ -476,8 +482,8 @@ class NoPrefixBookCmp {
constructor(params: RouteParams) { this.title = params.get('title'); } constructor(params: RouteParams) { this.title = params.get('title'); }
} }
@Component({selector: 'book-cmp'}) @Component({
@View({ selector: 'book-cmp',
template: `<a href="hello" [router-link]="[\'Book\', {number: 100}]">{{title}}</a> | template: `<a href="hello" [router-link]="[\'Book\', {number: 100}]">{{title}}</a> |
<router-outlet></router-outlet>`, <router-outlet></router-outlet>`,
directives: ROUTER_DIRECTIVES directives: ROUTER_DIRECTIVES
@ -488,8 +494,8 @@ class AmbiguousBookCmp {
constructor(params: RouteParams) { this.title = params.get('title'); } constructor(params: RouteParams) { this.title = params.get('title'); }
} }
@Component({selector: 'aux-cmp'}) @Component({
@View({ selector: 'aux-cmp',
template: template:
`<a [router-link]="[\'./Hello\', [ \'Aside\' ] ]">aside</a> | `<a [router-link]="[\'./Hello\', [ \'Aside\' ] ]">aside</a> |
<router-outlet></router-outlet> | aside <router-outlet name="aside"></router-outlet>`, <router-outlet></router-outlet> | aside <router-outlet name="aside"></router-outlet>`,