From 6f47b0958bbd90596617a2cc8280f8f9809ebbc1 Mon Sep 17 00:00:00 2001 From: simonihmig Date: Thu, 30 Nov 2017 23:58:59 +0100 Subject: [PATCH] [BUGFIX beta] Fix link-to throwing in integration tests Fixes #15831 Fixes a regression introduced by #15788 by returning early again from `routing.generateURL()` when `router._routerMicrolib` is not present. --- packages/ember-routing/lib/services/routing.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/ember-routing/lib/services/routing.js b/packages/ember-routing/lib/services/routing.js index 53628afa91b..e1588aca57b 100644 --- a/packages/ember-routing/lib/services/routing.js +++ b/packages/ember-routing/lib/services/routing.js @@ -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) {