Merge pull request #14487 from trentmwillis/qp-engines

[BUGFIX] Use routeName instead of fullRouteName in QP meta

Author: rwjblue

packages/ember-glimmer/tests/integration/application/engine-test.js

@@ -22,7 +22,11 @@ moduleFor('Application test: engine rendering', class extends ApplicationTest {
     this.registerEngine('blog', Engine.extend({
       init() {
         this._super(...arguments);
-        this.register('template:application', compile('Engine{{outlet}}'));
+        this.register('controller:application', Controller.extend({
+          queryParams: ['lang'],
+          lang: ''
+        }));
+        this.register('template:application', compile('Engine{{lang}}{{outlet}}'));
         this.register('route:application', Route.extend({
           model() {
             hooks.push('engine - application');
@@ -274,4 +278,12 @@ moduleFor('Application test: engine rendering', class extends ApplicationTest {
       this.assertText('ApplicationEngine');
     });
   }
+
+  ['@test engine should lookup and use correct controller'](assert) {
+    this.setupAppAndRoutableEngine();
+
+    return this.visit('/blog?lang=English').then(() => {
+      this.assertText('ApplicationEngineEnglish');
+    });
+  }
 });

packages/ember-routing/lib/system/route.js

@@ -172,7 +172,7 @@ let Route = EmberObject.extend(ActionHandler, Evented, {
   _qp: computed(function() {
     let controllerProto, combinedQueryParameterConfiguration;
 
-    let controllerName = this.controllerName || this.fullRouteName;
+    let controllerName = this.controllerName || this.routeName;
     let definedControllerClass = getOwner(this)._lookupFactory(`controller:${controllerName}`);
     let queryParameterConfiguraton = get(this, 'queryParams');
     let hasRouterDefinedQueryParams = !!Object.keys(queryParameterConfiguraton).length;