feat(router): changes router config not to use names
This commit is contained in:
vsavkin
@ -1,228 +1,216 @@
|
||||
import {DefaultUrlSerializer} from '../src/url_serializer';
|
||||
import {UrlTree} from '../src/url_tree';
|
||||
import {createEmptyState, Params, ActivatedRoute, PRIMARY_OUTLET} from '../src/router_state';
|
||||
import {Params, PRIMARY_OUTLET} from '../src/shared';
|
||||
import {createEmptyState, ActivatedRoute} from '../src/router_state';
|
||||
import {recognize} from '../src/recognize';
|
||||
|
||||
describe('recognize', () => {
|
||||
const empty = () => createEmptyState(RootComponent);
|
||||
const fakeComponentResolver = {
|
||||
resolveComponent(componentType:any):Promise<any> { return Promise.resolve({componentType}); },
|
||||
clearCache() {}
|
||||
};
|
||||
|
||||
it('should work', (done) => {
|
||||
recognize(fakeComponentResolver, [
|
||||
recognize([
|
||||
{
|
||||
name: 'a',
|
||||
path: 'a', component: ComponentA
|
||||
}
|
||||
], tree("a"), empty()).then(s => {
|
||||
], tree("a"), empty()).forEach(s => {
|
||||
checkActivatedRoute(s.root, "", {}, RootComponent);
|
||||
checkActivatedRoute(s.firstChild(s.root), "a", {}, ComponentA);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should handle position args', (done) => {
|
||||
recognize(fakeComponentResolver, [
|
||||
it('should handle position args', () => {
|
||||
recognize([
|
||||
{
|
||||
name: 'a',
|
||||
path: 'a/:id', component: ComponentA, children: [
|
||||
{ name: 'b', path: 'b/:id', component: ComponentB}
|
||||
{ path: 'b/:id', component: ComponentB}
|
||||
]
|
||||
}
|
||||
], tree("a/paramA/b/paramB"), empty()).then(s => {
|
||||
], tree("a/paramA/b/paramB"), empty()).forEach(s => {
|
||||
checkActivatedRoute(s.root, "", {}, RootComponent);
|
||||
checkActivatedRoute(s.firstChild(s.root), "a/paramA", {id: 'paramA'}, ComponentA);
|
||||
checkActivatedRoute(s.firstChild(<any>s.firstChild(s.root)), "b/paramB", {id: 'paramB'}, ComponentB);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should reuse activated routes', (done) => {
|
||||
const config = [{name: 'a', path: 'a/:id', component: ComponentA}];
|
||||
recognize(fakeComponentResolver, config, tree("a/paramA"), empty()).then(s => {
|
||||
it('should reuse activated routes', () => {
|
||||
const config = [{path: 'a/:id', component: ComponentA}];
|
||||
recognize(config, tree("a/paramA"), empty()).forEach(s => {
|
||||
const n1 = s.firstChild(s.root);
|
||||
const recorded = [];
|
||||
n1!.params.forEach(r => recorded.push(r));
|
||||
|
||||
recognize(fakeComponentResolver, config, tree("a/paramB"), s).then(s2 => {
|
||||
recognize(config, tree("a/paramB"), s).forEach(s2 => {
|
||||
const n2 = s2.firstChild(s2.root);
|
||||
expect(n1).toBe(n2);
|
||||
expect(recorded).toEqual([{id: 'paramA'}, {id: 'paramB'}]);
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
it('should support secondary routes', (done) => {
|
||||
recognize(fakeComponentResolver, [
|
||||
{ name: 'a', path: 'a', component: ComponentA },
|
||||
{ name: 'b', path: 'b', component: ComponentB, outlet: 'left' },
|
||||
{ name: 'c', path: 'c', component: ComponentC, outlet: 'right' }
|
||||
], tree("a(b//c)"), empty()).then(s => {
|
||||
it('should support secondary routes', () => {
|
||||
recognize([
|
||||
{ path: 'a', component: ComponentA },
|
||||
{ path: 'b', component: ComponentB, outlet: 'left' },
|
||||
{ path: 'c', component: ComponentC, outlet: 'right' }
|
||||
], tree("a(left:b//right:c)"), empty()).forEach(s => {
|
||||
const c = s.children(s.root);
|
||||
checkActivatedRoute(c[0], "a", {}, ComponentA);
|
||||
checkActivatedRoute(c[1], "b", {}, ComponentB, 'left');
|
||||
checkActivatedRoute(c[2], "c", {}, ComponentC, 'right');
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should handle nested secondary routes', (done) => {
|
||||
recognize(fakeComponentResolver, [
|
||||
{ name: 'a', path: 'a', component: ComponentA },
|
||||
{ name: 'b', path: 'b', component: ComponentB, outlet: 'left' },
|
||||
{ name: 'c', path: 'c', component: ComponentC, outlet: 'right' }
|
||||
], tree("a(b(c))"), empty()).then(s => {
|
||||
it('should use outlet name when matching secondary routes', () => {
|
||||
recognize([
|
||||
{ path: 'a', component: ComponentA },
|
||||
{ path: 'b', component: ComponentB, outlet: 'left' },
|
||||
{ path: 'b', component: ComponentC, outlet: 'right' }
|
||||
], tree("a(right:b)"), empty()).forEach(s => {
|
||||
const c = s.children(s.root);
|
||||
checkActivatedRoute(c[0], "a", {}, ComponentA);
|
||||
checkActivatedRoute(c[1], "b", {}, ComponentC, 'right');
|
||||
});
|
||||
});
|
||||
|
||||
it('should handle nested secondary routes', () => {
|
||||
recognize([
|
||||
{ path: 'a', component: ComponentA },
|
||||
{ path: 'b', component: ComponentB, outlet: 'left' },
|
||||
{ path: 'c', component: ComponentC, outlet: 'right' }
|
||||
], tree("a(left:b(right:c))"), empty()).forEach(s => {
|
||||
const c = s.children(s.root);
|
||||
checkActivatedRoute(c[0], "a", {}, ComponentA);
|
||||
checkActivatedRoute(c[1], "b", {}, ComponentB, 'left');
|
||||
checkActivatedRoute(c[2], "c", {}, ComponentC, 'right');
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should handle non top-level secondary routes', (done) => {
|
||||
recognize(fakeComponentResolver, [
|
||||
{ name: 'a', path: 'a', component: ComponentA, children: [
|
||||
{ name: 'b', path: 'b', component: ComponentB },
|
||||
{ name: 'c', path: 'c', component: ComponentC, outlet: 'left' }
|
||||
it('should handle non top-level secondary routes', () => {
|
||||
recognize([
|
||||
{ path: 'a', component: ComponentA, children: [
|
||||
{ path: 'b', component: ComponentB },
|
||||
{ path: 'c', component: ComponentC, outlet: 'left' }
|
||||
] },
|
||||
], tree("a/b(c))"), empty()).then(s => {
|
||||
], tree("a/b(left:c))"), empty()).forEach(s => {
|
||||
const c = s.children(<any>s.firstChild(s.root));
|
||||
checkActivatedRoute(c[0], "b", {}, ComponentB, PRIMARY_OUTLET);
|
||||
checkActivatedRoute(c[1], "c", {}, ComponentC, 'left');
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should support matrix parameters', (done) => {
|
||||
recognize(fakeComponentResolver, [
|
||||
it('should support matrix parameters', () => {
|
||||
recognize([
|
||||
{
|
||||
name: 'a',
|
||||
path: 'a', component: ComponentA, children: [
|
||||
{ name: 'b', path: 'b', component: ComponentB },
|
||||
{ name: 'c', path: 'c', component: ComponentC, outlet: 'left' }
|
||||
{ path: 'b', component: ComponentB },
|
||||
{ path: 'c', component: ComponentC, outlet: 'left' }
|
||||
]
|
||||
}
|
||||
], tree("a;a1=11;a2=22/b;b1=111;b2=222(c;c1=1111;c2=2222)"), empty()).then(s => {
|
||||
], tree("a;a1=11;a2=22/b;b1=111;b2=222(left:c;c1=1111;c2=2222)"), empty()).forEach(s => {
|
||||
checkActivatedRoute(s.firstChild(s.root), "a", {a1: '11', a2: '22'}, ComponentA);
|
||||
const c = s.children(<any>s.firstChild(s.root));
|
||||
checkActivatedRoute(c[0], "b", {b1: '111', b2: '222'}, ComponentB);
|
||||
checkActivatedRoute(c[1], "c", {c1: '1111', c2: '2222'}, ComponentC, 'left');
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
describe("index", () => {
|
||||
it("should support index routes", (done) => {
|
||||
recognize(fakeComponentResolver, [
|
||||
{
|
||||
name: 'a', index: true, component: ComponentA
|
||||
}
|
||||
], tree(""), empty()).then(s => {
|
||||
it("should support index routes", () => {
|
||||
recognize([
|
||||
{index: true, component: ComponentA}
|
||||
], tree(""), empty()).forEach(s => {
|
||||
checkActivatedRoute(s.firstChild(s.root), "a", {}, ComponentA);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it("should support index routes with children", (done) => {
|
||||
recognize(fakeComponentResolver, [
|
||||
it("should support index routes with children", () => {
|
||||
recognize([
|
||||
{
|
||||
name: 'a', index: true, component: ComponentA, children: [
|
||||
{ name: 'b', index: true, component: ComponentB, children: [
|
||||
{name: 'c', path: 'c/:id', component: ComponentC}
|
||||
index: true, component: ComponentA, children: [
|
||||
{ index: true, component: ComponentB, children: [
|
||||
{path: 'c/:id', component: ComponentC}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
], tree("c/10"), empty()).then(s => {
|
||||
], tree("c/10"), empty()).forEach(s => {
|
||||
checkActivatedRoute(s.firstChild(s.root), "", {}, ComponentA);
|
||||
checkActivatedRoute(s.firstChild(<any>s.firstChild(s.root)), "", {}, ComponentB);
|
||||
checkActivatedRoute(
|
||||
s.firstChild(<any>s.firstChild(<any>s.firstChild(s.root))), "c/10", {id: '10'}, ComponentC);
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("wildcards", () => {
|
||||
it("should support simple wildcards", (done) => {
|
||||
recognize(fakeComponentResolver, [
|
||||
{
|
||||
name: 'a', path: '**', component: ComponentA
|
||||
}
|
||||
], tree("a/b/c/d;a1=11"), empty()).then(s => {
|
||||
it("should support simple wildcards", () => {
|
||||
recognize([
|
||||
{path: '**', component: ComponentA}
|
||||
], tree("a/b/c/d;a1=11"), empty()).forEach(s => {
|
||||
checkActivatedRoute(s.firstChild(s.root), "a/b/c/d", {a1:'11'}, ComponentA);
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("query parameters", () => {
|
||||
it("should support query params", (done) => {
|
||||
const config = [{name: 'a', path: 'a', component: ComponentA}];
|
||||
recognize(fakeComponentResolver, config, tree("a?q=11"), empty()).then(s => {
|
||||
it("should support query params", () => {
|
||||
const config = [{path: 'a', component: ComponentA}];
|
||||
recognize(config, tree("a?q=11"), empty()).forEach(s => {
|
||||
const q1 = s.queryParams;
|
||||
const recorded = [];
|
||||
q1!.forEach(r => recorded.push(r));
|
||||
|
||||
recognize(fakeComponentResolver, config, tree("a?q=22"), s).then(s2 => {
|
||||
recognize(config, tree("a?q=22"), s).forEach(s2 => {
|
||||
const q2 = s2.queryParams;
|
||||
expect(q1).toBe(q2);
|
||||
expect(recorded).toEqual([{q: '11'}, {q: '22'}]);
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("fragment", () => {
|
||||
it("should support fragment", (done) => {
|
||||
const config = [{name: 'a', path: 'a', component: ComponentA}];
|
||||
recognize(fakeComponentResolver, config, tree("a#f1"), empty()).then(s => {
|
||||
it("should support fragment", () => {
|
||||
const config = [{path: 'a', component: ComponentA}];
|
||||
recognize(config, tree("a#f1"), empty()).forEach(s => {
|
||||
const f1 = s.fragment;
|
||||
const recorded = [];
|
||||
f1!.forEach(r => recorded.push(r));
|
||||
|
||||
recognize(fakeComponentResolver, config, tree("a#f2"), s).then(s2 => {
|
||||
recognize(config, tree("a#f2"), s).forEach(s2 => {
|
||||
const f2 = s2.fragment;
|
||||
expect(f1).toBe(f2);
|
||||
expect(recorded).toEqual(["f1", "f2"]);
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("error handling", () => {
|
||||
it('should error when two routes with the same outlet name got matched', (done) => {
|
||||
recognize(fakeComponentResolver, [
|
||||
{ name: 'a', path: 'a', component: ComponentA },
|
||||
{ name: 'b', path: 'b', component: ComponentB, outlet: 'aux' },
|
||||
{ name: 'c', path: 'c', component: ComponentC, outlet: 'aux' }
|
||||
], tree("a(b//c)"), empty()).catch(s => {
|
||||
expect(s.toString()).toContain("Two segments cannot have the same outlet name: 'b' and 'c'.");
|
||||
done();
|
||||
it('should error when two routes with the same outlet name got matched', () => {
|
||||
recognize([
|
||||
{ path: 'a', component: ComponentA },
|
||||
{ path: 'b', component: ComponentB, outlet: 'aux' },
|
||||
{ path: 'c', component: ComponentC, outlet: 'aux' }
|
||||
], tree("a(aux:b//aux:c)"), empty()).subscribe(null, s => {
|
||||
expect(s.toString()).toContain("Two segments cannot have the same outlet name: 'aux:b' and 'aux:c'.");
|
||||
});
|
||||
});
|
||||
|
||||
it("should error when no matching routes", (done) => {
|
||||
recognize(fakeComponentResolver, [
|
||||
{ name: 'a', path: 'a', component: ComponentA }
|
||||
], tree("invalid"), empty()).catch(s => {
|
||||
it("should error when no matching routes", () => {
|
||||
recognize([
|
||||
{ path: 'a', component: ComponentA }
|
||||
], tree("invalid"), empty()).subscribe(null, s => {
|
||||
expect(s.toString()).toContain("Cannot match any routes");
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it("should error when no matching routes (too short)", (done) => {
|
||||
recognize(fakeComponentResolver, [
|
||||
{ name: 'a', path: 'a/:id', component: ComponentA }
|
||||
], tree("a"), empty()).catch(s => {
|
||||
it("should error when no matching routes (too short)", () => {
|
||||
recognize([
|
||||
{ path: 'a/:id', component: ComponentA }
|
||||
], tree("a"), empty()).subscribe(null, s => {
|
||||
expect(s.toString()).toContain("Cannot match any routes");
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user