refactor(router): use CamelCase aliases for routes

Author: btford

modules/angular1_router/test/ng_link_spec.js

@@ -38,9 +38,9 @@ describe('ngOutlet', function () {
 
  $router.config([
  { path: '/a', component: OneController },
- { path: '/b', component: TwoController, as: 'two' }
+ { path: '/b', component: TwoController, as: 'Two' }
  ]);
- compile('<a ng-link="[\'/two\']">link</a> | outer { <div ng-outlet></div> }');
+ compile('<a ng-link="[\'/Two\']">link</a> | outer { <div ng-outlet></div> }');
 
  $router.navigateByUrl('/a');
  $rootScope.$digest();
@@ -49,11 +49,11 @@ describe('ngOutlet', function () {
  });
 
  it('should allow linking from the child and the parent', function () {
- put('one', '<div><a ng-link="[\'/two\']">{{number}}</a></div>');
+ put('one', '<div><a ng-link="[\'/Two\']">{{number}}</a></div>');
 
  $router.config([
  { path: '/a', component: OneController },
- { path: '/b', component: TwoController, as: 'two' }
+ { path: '/b', component: TwoController, as: 'Two' }
  ]);
  compile('outer { <div ng-outlet></div> }');
 
@@ -66,11 +66,11 @@ describe('ngOutlet', function () {
 
  it('should allow params in routerLink directive', function () {
  put('router', '<div>outer { <div ng-outlet></div> }</div>');
- put('one', '<div><a ng-link="[\'/two\', {param: \'lol\'}]">{{number}}</a></div>');
+ put('one', '<div><a ng-link="[\'/Two\', {param: \'lol\'}]">{{number}}</a></div>');
 
  $router.config([
  { path: '/a', component: OneController },
- { path: '/b/:param', component: TwoController, as: 'two' }
+ { path: '/b/:param', component: TwoController, as: 'Two' }
  ]);
  compile('<div ng-outlet></div>');
 
@@ -83,11 +83,11 @@ describe('ngOutlet', function () {
  // TODO: test dynamic links
  it('should update the href of links with bound params', function () {
  put('router', '<div>outer { <div ng-outlet></div> }</div>');
- put('one', '<div><a ng-link="[\'/two\', {param: one.number}]">{{one.number}}</a></div>');
+ put('one', '<div><a ng-link="[\'/Two\', {param: one.number}]">{{one.number}}</a></div>');
 
  $router.config([
  { path: '/a', component: OneController },
- { path: '/b/:param', component: TwoController, as: 'two' }
+ { path: '/b/:param', component: TwoController, as: 'Two' }
  ]);
  compile('<div ng-outlet></div>');
 

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

@@ -72,9 +72,9 @@ export function main() {
  it('should generate absolute hrefs that include the base href',
  inject([AsyncTestCompleter], (async) => {
  location.setBaseHref('/my/base');
- compile('<a href="hello" [router-link]="[\'./user\']"></a>')
+ compile('<a href="hello" [router-link]="[\'./User\']"></a>')
  .then((_) =>
- router.config([new Route({path: '/user', component: UserCmp, as: 'user'})]))
+ router.config([new Route({path: '/user', component: UserCmp, as: 'User'})]))
  .then((_) => router.navigateByUrl('/a/b'))
  .then((_) => {
  rootTC.detectChanges();
@@ -85,9 +85,9 @@ export function main() {
 
 
  it('should generate link hrefs without params', inject([AsyncTestCompleter], (async) => {
- compile('<a href="hello" [router-link]="[\'./user\']"></a>')
+ compile('<a href="hello" [router-link]="[\'./User\']"></a>')
  .then((_) =>
- router.config([new Route({path: '/user', component: UserCmp, as: 'user'})]))
+ router.config([new Route({path: '/user', component: UserCmp, as: 'User'})]))
  .then((_) => router.navigateByUrl('/a/b'))
  .then((_) => {
  rootTC.detectChanges();
@@ -98,9 +98,9 @@ export function main() {
 
 
  it('should generate link hrefs with params', inject([AsyncTestCompleter], (async) => {
- compile('<a href="hello" [router-link]="[\'./user\', {name: name}]">{{name}}</a>')
+ compile('<a href="hello" [router-link]="[\'./User\', {name: name}]">{{name}}</a>')
  .then((_) => router.config(
- [new Route({path: '/user/:name', component: UserCmp, as: 'user'})]))
+ [new Route({path: '/user/:name', component: UserCmp, as: 'User'})]))
  .then((_) => router.navigateByUrl('/a/b'))
  .then((_) => {
  rootTC.debugElement.componentInstance.name = 'brian';
@@ -117,7 +117,7 @@ export function main() {
  inject([AsyncTestCompleter], (async) => {
  compile()
  .then((_) => router.config(
- [new Route({path: '/page/:number', component: SiblingPageCmp, as: 'page'})]))
+ [new Route({path: '/page/:number', component: SiblingPageCmp, as: 'Page'})]))
  .then((_) => router.navigateByUrl('/page/1'))
  .then((_) => {
  rootTC.detectChanges();
@@ -137,10 +137,10 @@ export function main() {
  new AsyncRoute({
  path: '/child-with-grandchild/...',
  loader: parentCmpLoader,
- as: 'child-with-grandchild'
+ as: 'ChildWithGrandchild'
  })
  ]))
- .then((_) => router.navigate(['/child-with-grandchild']))
+ .then((_) => router.navigate(['/ChildWithGrandchild']))
  .then((_) => {
  rootTC.detectChanges();
  expect(DOM.getAttribute(rootTC.debugElement.componentViewChildren[1]
@@ -156,7 +156,7 @@ export function main() {
  inject([AsyncTestCompleter], (async) => {
  compile()
  .then((_) => router.config(
- [new Route({path: '/book/:title/...', component: BookCmp, as: 'book'})]))
+ [new Route({path: '/book/:title/...', component: BookCmp, as: 'Book'})]))
  .then((_) => router.navigateByUrl('/book/1984/page/1'))
  .then((_) => {
  rootTC.detectChanges();
@@ -180,11 +180,11 @@ export function main() {
  describe('router-link-active CSS class', () => {
  it('should be added to the associated element', inject([AsyncTestCompleter], (async) => {
  router.config([
- new Route({path: '/child', component: HelloCmp, as: 'child'}),
- new Route({path: '/better-child', component: Hello2Cmp, as: 'better-child'})
+ new Route({path: '/child', component: HelloCmp, as: 'Child'}),
+ new Route({path: '/better-child', component: Hello2Cmp, as: 'BetterChild'})
  ])
- .then((_) => compile(`<a [router-link]="['./child']" class="child-link">Child</a>
- <a [router-link]="['./better-child']" class="better-child-link">Better Child</a>
+ .then((_) => compile(`<a [router-link]="['./Child']" class="child-link">Child</a>
+ <a [router-link]="['./BetterChild']" class="better-child-link">Better Child</a>
  <router-outlet></router-outlet>`))
  .then((_) => {
  var element = rootTC.debugElement.nativeElement;
@@ -211,15 +211,15 @@ export function main() {
 
  it('should be added to links in child routes', inject([AsyncTestCompleter], (async) => {
  router.config([
- new Route({path: '/child', component: HelloCmp, as: 'child'}),
+ new Route({path: '/child', component: HelloCmp, as: 'Child'}),
  new Route({
  path: '/child-with-grandchild/...',
  component: ParentCmp,
- as: 'child-with-grandchild'
+ as: 'ChildWithGrandchild'
  })
  ])
- .then((_) => compile(`<a [router-link]="['./child']" class="child-link">Child</a>
- <a [router-link]="['./child-with-grandchild/grandchild']" class="child-with-grandchild-link">Better Child</a>
+ .then((_) => compile(`<a [router-link]="['./Child']" class="child-link">Child</a>
+ <a [router-link]="['./ChildWithGrandchild/Grandchild']" class="child-with-grandchild-link">Better Child</a>
  <router-outlet></router-outlet>`))
  .then((_) => {
  var element = rootTC.debugElement.nativeElement;
@@ -261,9 +261,9 @@ export function main() {
  };
 
  it('should navigate to link hrefs without params', inject([AsyncTestCompleter], (async) => {
- compile('<a href="hello" [router-link]="[\'./user\']"></a>')
+ compile('<a href="hello" [router-link]="[\'./User\']"></a>')
  .then((_) => router.config(
- [new Route({path: '/user', component: UserCmp, as: 'user'})]))
+ [new Route({path: '/user', component: UserCmp, as: 'User'})]))
  .then((_) => router.navigateByUrl('/a/b'))
  .then((_) => {
  rootTC.detectChanges();
@@ -282,9 +282,9 @@ export function main() {
  it('should navigate to link hrefs in presence of base href',
  inject([AsyncTestCompleter], (async) => {
  location.setBaseHref('/base');
- compile('<a href="hello" [router-link]="[\'./user\']"></a>')
+ compile('<a href="hello" [router-link]="[\'./User\']"></a>')
  .then((_) => router.config(
- [new Route({path: '/user', component: UserCmp, as: 'user'})]))
+ [new Route({path: '/user', component: UserCmp, as: 'User'})]))
  .then((_) => router.navigateByUrl('/a/b'))
  .then((_) => {
  rootTC.detectChanges();
@@ -322,7 +322,7 @@ class UserCmp {
 @Component({selector: 'page-cmp'})
 @View({
  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]
 })
 class SiblingPageCmp {
@@ -350,26 +350,26 @@ function parentCmpLoader() {
 
 @Component({selector: 'parent-cmp'})
 @View({
- template: `{ <a [router-link]="['./grandchild']" class="grandchild-link">Grandchild</a>
- <a [router-link]="['./better-grandchild']" class="better-grandchild-link">Better Grandchild</a>
+ template: `{ <a [router-link]="['./Grandchild']" class="grandchild-link">Grandchild</a>
+ <a [router-link]="['./BetterGrandchild']" class="better-grandchild-link">Better Grandchild</a>
  <router-outlet></router-outlet> }`,
  directives: ROUTER_DIRECTIVES
 })
 @RouteConfig([
- new Route({path: '/grandchild', component: HelloCmp, as: 'grandchild'}),
- new Route({path: '/better-grandchild', component: Hello2Cmp, as: 'better-grandchild'})
+ new Route({path: '/grandchild', component: HelloCmp, as: 'Grandchild'}),
+ new Route({path: '/better-grandchild', component: Hello2Cmp, as: 'BetterGrandchild'})
 ])
 class ParentCmp {
  constructor(public router: Router) {}
 }
 
 @Component({selector: 'book-cmp'})
 @View({
- 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>`,
  directives: ROUTER_DIRECTIVES
 })
-@RouteConfig([new Route({path: '/page/:number', component: SiblingPageCmp, as: 'page'})])
+@RouteConfig([new Route({path: '/page/:number', component: SiblingPageCmp, as: 'Page'})])
 class BookCmp {
  title: string;
  constructor(params: RouteParams) { this.title = params.get('title'); }

modules/angular2/test/router/route_recognizer_spec.ts

@@ -108,28 +108,28 @@ export function main() {
 
 
  it('should generate URLs with params', () => {
- recognizer.config(new Route({path: '/app/user/:name', component: DummyCmpA, as: 'user'}));
- var instruction = recognizer.generate('user', {'name': 'misko'});
+ recognizer.config(new Route({path: '/app/user/:name', component: DummyCmpA, as: 'User'}));
+ var instruction = recognizer.generate('User', {'name': 'misko'});
  expect(instruction.urlPath).toEqual('app/user/misko');
  });
 
 
  it('should generate URLs with numeric params', () => {
- recognizer.config(new Route({path: '/app/page/:number', component: DummyCmpA, as: 'page'}));
- expect(recognizer.generate('page', {'number': 42}).urlPath).toEqual('app/page/42');
+ recognizer.config(new Route({path: '/app/page/:number', component: DummyCmpA, as: 'Page'}));
+ expect(recognizer.generate('Page', {'number': 42}).urlPath).toEqual('app/page/42');
  });
 
 
  it('should throw in the absence of required params URLs', () => {
- recognizer.config(new Route({path: 'app/user/:name', component: DummyCmpA, as: 'user'}));
- expect(() => recognizer.generate('user', {}))
+ recognizer.config(new Route({path: 'app/user/:name', component: DummyCmpA, as: 'User'}));
+ expect(() => recognizer.generate('User', {}))
  .toThrowError('Route generator for \'name\' was not included in parameters passed.');
  });
 
 
  describe('params', () => {
  it('should recognize parameters within the URL path', () => {
- recognizer.config(new Route({path: 'profile/:name', component: DummyCmpA, as: 'user'}));
+ recognizer.config(new Route({path: 'profile/:name', component: DummyCmpA, as: 'User'}));
  var solution = recognize(recognizer, '/profile/matsko?comments=all');
  expect(solution.params).toEqual({'name': 'matsko', 'comments': 'all'});
  });
@@ -138,26 +138,26 @@ export function main() {
  it('should generate and populate the given static-based route with querystring params',
  () => {
  recognizer.config(
- new Route({path: 'forum/featured', component: DummyCmpA, as: 'forum-page'}));
+ new Route({path: 'forum/featured', component: DummyCmpA, as: 'ForumPage'}));
 
  var params = {'start': 10, 'end': 100};
 
- var result = recognizer.generate('forum-page', params);
+ var result = recognizer.generate('ForumPage', params);
  expect(result.urlPath).toEqual('forum/featured');
  expect(result.urlParams).toEqual(['start=10', 'end=100']);
  });
 
 
  it('should prefer positional params over query params', () => {
- recognizer.config(new Route({path: 'profile/:name', component: DummyCmpA, as: 'user'}));
+ recognizer.config(new Route({path: 'profile/:name', component: DummyCmpA, as: 'User'}));
 
  var solution = recognize(recognizer, '/profile/yegor?name=igor');
  expect(solution.params).toEqual({'name': 'yegor'});
  });
 
 
  it('should ignore matrix params for the top-level component', () => {
- recognizer.config(new Route({path: '/home/:subject', component: DummyCmpA, as: 'user'}));
+ recognizer.config(new Route({path: '/home/:subject', component: DummyCmpA, as: 'User'}));
  var solution = recognize(recognizer, '/home;sort=asc/zero;one=1?two=2');
  expect(solution.params).toEqual({'subject': 'zero', 'two': '2'});
  });