fix(router/instruction): ensure toLinkUrl includes extra params

petebacondarwin · alexeagle · commit 0d58b137a7e2 · 2016-03-09T16:21:43.000-08:00
Closes #7367
diff --git a/modules/angular2/src/router/instruction.ts b/modules/angular2/src/router/instruction.ts
@@ -160,7 +160,7 @@ export abstract class Instruction {
   // default instructions override these
   toLinkUrl(): string {
     return this.urlPath + this._stringifyAux() +
-           (isPresent(this.child) ? this.child._toLinkUrl() : '');
+           (isPresent(this.child) ? this.child._toLinkUrl() : '') + this.toUrlQuery();
   }
 
   // this is the non-root version (called recursively)
diff --git a/modules/angular2/test/router/route_registry_spec.ts b/modules/angular2/test/router/route_registry_spec.ts
@@ -91,6 +91,15 @@ export function main() {
       expect(instruction.component.params).toEqual({});
     });
 
+    it('should generate URLs with extra params in the query', () => {
+      registry.config(RootHostCmp,
+                      new Route({path: '/first/second', component: DummyCmpA, name: 'FirstCmp'}));
+
+      var instruction = registry.generate(['FirstCmp', {a: 'one'}], []);
+      expect(instruction.toLinkUrl()).toEqual('first/second?a=one');
+    });
+
+
     it('should generate URLs of loaded components after they are loaded',
        inject([AsyncTestCompleter], (async) => {
          registry.config(

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ export abstract class Instruction {`
`160`	`160`	`// default instructions override these`
`161`	`161`	`toLinkUrl(): string {`
`162`	`162`	`return this.urlPath + this._stringifyAux() +`
`163`		`- (isPresent(this.child) ? this.child._toLinkUrl() : '');`
	`163`	`+ (isPresent(this.child) ? this.child._toLinkUrl() : '') + this.toUrlQuery();`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`// this is the non-root version (called recursively)`