Skip to content

Commit

Permalink
[BUGFIX beta] Fix link-to throwing in integration tests
Browse files Browse the repository at this point in the history
Fixes #15831

Fixes a regression introduced by #15788 by returning early again from `routing.generateURL()` when `router._routerMicrolib` is not present.
  • Loading branch information
simonihmig committed Nov 30, 2017
1 parent 76c4383 commit 6f47b09
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion packages/ember-routing/lib/services/routing.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,16 @@ export default Service.extend({
},

generateURL(routeName, models, queryParams) {
let router = get(this, 'router');
if (!router._routerMicrolib) { return; }

let visibleQueryParams = {};
if (queryParams) {
assign(visibleQueryParams, queryParams);
this.normalizeQueryParams(routeName, models, visibleQueryParams);
}

return get(this, 'router').generate(routeName, ...models, { queryParams: visibleQueryParams });
return router.generate(routeName, ...models, { queryParams: visibleQueryParams });
},

isActiveForRoute(contexts, queryParams, routeName, routerState, isCurrentWhenSpecified) {
Expand Down

0 comments on commit 6f47b09

Please sign in to comment.