Skip to content

Commit a3353a5

Browse files
committed
Revert "test(router): remove View decorator in router link fixtures"
This reverts commit 422a7b1.
1 parent c5294c7 commit a3353a5

1 file changed

Lines changed: 21 additions & 27 deletions

File tree

modules/angular2/test/router/integration/router_link_spec.ts

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {NumberWrapper} from 'angular2/src/facade/lang';
2121
import {PromiseWrapper} from 'angular2/src/facade/async';
2222
import {ListWrapper} from 'angular2/src/facade/collection';
2323

24-
import {provide, Component, DirectiveResolver} from 'angular2/core';
24+
import {provide, Component, DirectiveResolver, View} from 'angular2/core';
2525

2626
import {SpyLocation} from 'angular2/src/mock/location_mock';
2727
import {
@@ -386,17 +386,15 @@ class MyComp {
386386
name;
387387
}
388388

389-
@Component({
390-
selector: 'user-cmp',
391-
template: "hello {{user}}"
392-
})
389+
@Component({selector: 'user-cmp'})
390+
@View({template: "hello {{user}}"})
393391
class UserCmp {
394392
user: string;
395393
constructor(params: RouteParams) { this.user = params.get('name'); }
396394
}
397395

398-
@Component({
399-
selector: 'page-cmp',
396+
@Component({selector: 'page-cmp'})
397+
@View({
400398
template:
401399
`page #{{pageNumber}} | <a href="hello" [router-link]="[\'../Page\', {number: nextPage}]">next</a>`,
402400
directives: [RouterLink]
@@ -410,8 +408,8 @@ class SiblingPageCmp {
410408
}
411409
}
412410

413-
@Component({
414-
selector: 'page-cmp',
411+
@Component({selector: 'page-cmp'})
412+
@View({
415413
template:
416414
`page #{{pageNumber}} | <a href="hello" [router-link]="[\'Page\', {number: nextPage}]">next</a>`,
417415
directives: [RouterLink]
@@ -425,26 +423,22 @@ class NoPrefixSiblingPageCmp {
425423
}
426424
}
427425

428-
@Component({
429-
selector: 'hello-cmp',
430-
template: 'hello'
431-
})
426+
@Component({selector: 'hello-cmp'})
427+
@View({template: 'hello'})
432428
class HelloCmp {
433429
}
434430

435-
@Component({
436-
selector: 'hello2-cmp',
437-
template: 'hello2'
438-
})
431+
@Component({selector: 'hello2-cmp'})
432+
@View({template: 'hello2'})
439433
class Hello2Cmp {
440434
}
441435

442436
function parentCmpLoader() {
443437
return PromiseWrapper.resolve(ParentCmp);
444438
}
445439

446-
@Component({
447-
selector: 'parent-cmp',
440+
@Component({selector: 'parent-cmp'})
441+
@View({
448442
template: `{ <a [router-link]="['./Grandchild']" class="grandchild-link">Grandchild</a>
449443
<a [router-link]="['./BetterGrandchild']" class="better-grandchild-link">Better Grandchild</a>
450444
<router-outlet></router-outlet> }`,
@@ -458,8 +452,8 @@ class ParentCmp {
458452
constructor(public router: Router) {}
459453
}
460454

461-
@Component({
462-
selector: 'book-cmp',
455+
@Component({selector: 'book-cmp'})
456+
@View({
463457
template: `<a href="hello" [router-link]="[\'./Page\', {number: 100}]">{{title}}</a> |
464458
<router-outlet></router-outlet>`,
465459
directives: ROUTER_DIRECTIVES
@@ -470,8 +464,8 @@ class BookCmp {
470464
constructor(params: RouteParams) { this.title = params.get('title'); }
471465
}
472466

473-
@Component({
474-
selector: 'book-cmp',
467+
@Component({selector: 'book-cmp'})
468+
@View({
475469
template: `<a href="hello" [router-link]="[\'Page\', {number: 100}]">{{title}}</a> |
476470
<router-outlet></router-outlet>`,
477471
directives: ROUTER_DIRECTIVES
@@ -482,8 +476,8 @@ class NoPrefixBookCmp {
482476
constructor(params: RouteParams) { this.title = params.get('title'); }
483477
}
484478

485-
@Component({
486-
selector: 'book-cmp',
479+
@Component({selector: 'book-cmp'})
480+
@View({
487481
template: `<a href="hello" [router-link]="[\'Book\', {number: 100}]">{{title}}</a> |
488482
<router-outlet></router-outlet>`,
489483
directives: ROUTER_DIRECTIVES
@@ -494,8 +488,8 @@ class AmbiguousBookCmp {
494488
constructor(params: RouteParams) { this.title = params.get('title'); }
495489
}
496490

497-
@Component({
498-
selector: 'aux-cmp',
491+
@Component({selector: 'aux-cmp'})
492+
@View({
499493
template:
500494
`<a [router-link]="[\'./Hello\', [ \'Aside\' ] ]">aside</a> |
501495
<router-outlet></router-outlet> | aside <router-outlet name="aside"></router-outlet>`,

0 commit comments

Comments
 (0)