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

fix(router/parsing): change route rule error to say PascalCase instead of CamelCase 

Closes #7874
This commit is contained in:
Pete Mertz 2016-04-01 18:24:45 -04:00 committed by Misko Hevery
parent ac6959c819
commit 830aecd1a7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/@angular/router-deprecated/src/rules/rule_set.ts
View File

@ -49,7 +49,7 @@ export class RuleSet {
if (isPresent(config.name) && config.name[0].toUpperCase() != config.name[0]) { if (isPresent(config.name) && config.name[0].toUpperCase() != config.name[0]) {
let suggestedName = config.name[0].toUpperCase() + config.name.substring(1); let suggestedName = config.name[0].toUpperCase() + config.name.substring(1);
throw new BaseException( 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) { if (config instanceof AuxRoute) {

4
modules/@angular/router-deprecated/test/route_config/route_config_spec.ts
View File

@ -172,7 +172,7 @@ export function main() {
.catch((e) => { .catch((e) => {
expect(e.originalException) expect(e.originalException)
.toContainError( .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(); async.done();
return null; return null;
})})); })}));
@ -185,7 +185,7 @@ export function main() {
.catch((e) => { .catch((e) => {
expect(e.originalException) expect(e.originalException)
.toContainError( .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(); async.done();
return null; return null;
})})); })}));

2
modules/@angular/router-deprecated/test/rules/rule_set_spec.ts
View File

@ -164,7 +164,7 @@ export function main() {
expect(() => recognizer.config( expect(() => recognizer.config(
new Route({path: 'app/user/:name', component: DummyCmpA, name: 'user'}))) new Route({path: 'app/user/:name', component: DummyCmpA, name: 'user'})))
.toThrowError( .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".`);
}); });