Skip to content

Commit a325321

Browse files
committed
Revert "Revert "test(router): remove View decorator in router link fixtures""
This reverts commit a3353a5.
1 parent 0dbd0b3 commit a325321

1 file changed

Lines changed: 27 additions & 21 deletions

File tree

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

Lines changed: 27 additions & 21 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, View} from 'angular2/core';
24+
import {provide, Component, DirectiveResolver} from 'angular2/core';
2525

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

389-
@Component({selector: 'user-cmp'})
390-
@View({template: "hello {{user}}"})
389+
@Component({
390+
selector: 'user-cmp',
391+
template: "hello {{user}}"
392+
})
391393
class UserCmp {
392394
user: string;
393395
constructor(params: RouteParams) { this.user = params.get('name'); }
394396
}
395397

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

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

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

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

436442
function parentCmpLoader() {
437443
return PromiseWrapper.resolve(ParentCmp);
438444
}
439445

440-
@Component({selector: 'parent-cmp'})
441-
@View({
446+
@Component({
447+
selector: 'parent-cmp',
442448
template: `{ <a [router-link]="['./Grandchild']" class="grandchild-link">Grandchild</a>
443449
<a [router-link]="['./BetterGrandchild']" class="better-grandchild-link">Better Grandchild</a>
444450
<router-outlet></router-outlet> }`,
@@ -452,8 +458,8 @@ class ParentCmp {
452458
constructor(public router: Router) {}
453459
}
454460

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

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

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

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

0 commit comments

Comments
 (0)