From 830aecd1a70949283d603c39245cfae8c0316816 Mon Sep 17 00:00:00 2001 From: Pete Mertz Date: Fri, 1 Apr 2016 18:24:45 -0400 Subject: [PATCH] fix(router/parsing): change route rule error to say PascalCase instead of CamelCase Closes #7874 --- modules/@angular/router-deprecated/src/rules/rule_set.ts | 2 +- .../router-deprecated/test/route_config/route_config_spec.ts | 4 ++-- .../@angular/router-deprecated/test/rules/rule_set_spec.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/@angular/router-deprecated/src/rules/rule_set.ts b/modules/@angular/router-deprecated/src/rules/rule_set.ts index b6d42ff777..ff0159dc2e 100644 --- a/modules/@angular/router-deprecated/src/rules/rule_set.ts +++ b/modules/@angular/router-deprecated/src/rules/rule_set.ts @@ -49,7 +49,7 @@ export class RuleSet { if (isPresent(config.name) && config.name[0].toUpperCase() != config.name[0]) { let suggestedName = config.name[0].toUpperCase() + config.name.substring(1); throw new BaseException( - `Route "${config.path}" with name "${config.name}" does not begin with an uppercase letter. Route names should be CamelCase like "${suggestedName}".`); + `Route "${config.path}" with name "${config.name}" does not begin with an uppercase letter. Route names should be PascalCase like "${suggestedName}".`); } if (config instanceof AuxRoute) { diff --git a/modules/@angular/router-deprecated/test/route_config/route_config_spec.ts b/modules/@angular/router-deprecated/test/route_config/route_config_spec.ts index 8bcc767383..f5d6d44894 100644 --- a/modules/@angular/router-deprecated/test/route_config/route_config_spec.ts +++ b/modules/@angular/router-deprecated/test/route_config/route_config_spec.ts @@ -172,7 +172,7 @@ export function main() { .catch((e) => { expect(e.originalException) .toContainError( - `Route "/child" with name "child" does not begin with an uppercase letter. Route names should be CamelCase like "Child".`); + `Route "/child" with name "child" does not begin with an uppercase letter. Route names should be PascalCase like "Child".`); async.done(); return null; })})); @@ -185,7 +185,7 @@ export function main() { .catch((e) => { expect(e.originalException) .toContainError( - `Route "/child" with name "child" does not begin with an uppercase letter. Route names should be CamelCase like "Child".`); + `Route "/child" with name "child" does not begin with an uppercase letter. Route names should be PascalCase like "Child".`); async.done(); return null; })})); diff --git a/modules/@angular/router-deprecated/test/rules/rule_set_spec.ts b/modules/@angular/router-deprecated/test/rules/rule_set_spec.ts index ce1ef54695..fd579a50a7 100644 --- a/modules/@angular/router-deprecated/test/rules/rule_set_spec.ts +++ b/modules/@angular/router-deprecated/test/rules/rule_set_spec.ts @@ -164,7 +164,7 @@ export function main() { expect(() => recognizer.config( new Route({path: 'app/user/:name', component: DummyCmpA, name: 'user'}))) .toThrowError( - `Route "app/user/:name" with name "user" does not begin with an uppercase letter. Route names should be CamelCase like "User".`); + `Route "app/user/:name" with name "user" does not begin with an uppercase letter. Route names should be PascalCase like "User".`); });