cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(Router): add extra validation for when route was passed as Array (#9942)

Browse Source
This commit is contained in:
Hiroto Fukui 2016-07-15 00:28:31 +09:00 committed by Victor Berchet
parent 85be729c70
commit aa88438b54
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/@angular/router/src/config.ts
View File

@ -503,6 +503,9 @@ export function validateConfig(config: Routes): void {
} }
function validateNode(route: Route): void { function validateNode(route: Route): void {
if (Array.isArray(route)) {
throw new Error(`Invalid route configuration: Array cannot be specified`);
}
if (!!route.redirectTo && !!route.children) { if (!!route.redirectTo && !!route.children) {
throw new Error( throw new Error(
`Invalid configuration of route '${route.path}': redirectTo and children cannot be used together`); `Invalid configuration of route '${route.path}': redirectTo and children cannot be used together`);

9
modules/@angular/router/test/config.spec.ts
View File

@ -6,6 +6,15 @@ describe('config', () => {
validateConfig([{path: 'a', redirectTo: 'b'}, {path: 'b', component: ComponentA}]); validateConfig([{path: 'a', redirectTo: 'b'}, {path: 'b', component: ComponentA}]);
}); });
it('should throw when Array is passed', () => {
expect(() => {
validateConfig([
{path: 'a', component: ComponentA},
[{path: 'b', component: ComponentB}, {path: 'c', component: ComponentC}]
]);
}).toThrowError(`Invalid route configuration: Array cannot be specified`);
});
it('should throw when redirectTo and children are used together', () => { it('should throw when redirectTo and children are used together', () => {
expect(() => { expect(() => {
validateConfig( validateConfig(