[BUGFIX beta] Pass environment options forward to Engines

This fixes a failing test introduced in the previous test where Engines rendered even though shouldRender was set to false.
asakusuma · Aug 4, 2016 · d2d6e27 · d2d6e27
1 parent 47c6a6f
commit d2d6e27
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/packages/ember-application/lib/system/engine-instance.js b/packages/ember-application/lib/system/engine-instance.js
@@ -179,8 +179,12 @@ if (isEnabled('ember-application-engines')) {
       [
         'router:main',
         P`-bucket-cache:main`,
-        '-view-registry:main'
+        '-view-registry:main',
+        '-environment:main'
       ].forEach(key => this.register(key, parent.lookup(key), { instantiate: false }));
+
+      this.inject('view', '_environment', '-environment:main');
+      this.inject('route', '_environment', '-environment:main');
     }
   });
 }

diff --git a/packages/ember-application/tests/system/application_instance_test.js b/packages/ember-application/tests/system/application_instance_test.js
@@ -141,7 +141,7 @@ QUnit.test('unregistering a factory clears all cached instances of that factory'
 
 if (isEnabled('ember-application-engines')) {
   QUnit.test('can build and boot a registered engine', function(assert) {
-    assert.expect(7);
+    assert.expect(8);
 
     let ChatEngine = Engine.extend();
     let chatEngineInstance;
@@ -150,6 +150,7 @@ if (isEnabled('ember-application-engines')) {
 
     run(() => {
       appInstance = ApplicationInstance.create({ application });
+      appInstance.setupRegistry();
       chatEngineInstance = appInstance.buildChildEngineInstance('chat');
     });
 
@@ -171,7 +172,8 @@ if (isEnabled('ember-application-engines')) {
         [
           'router:main',
           P`-bucket-cache:main`,
-          '-view-registry:main'
+          '-view-registry:main',
+          '-environment:main'
         ].forEach(key => {
           assert.strictEqual(
             chatEngineInstance.lookup(key),

diff --git a/packages/ember-htmlbars/tests/integration/mount_test.js b/packages/ember-htmlbars/tests/integration/mount_test.js
@@ -40,6 +40,7 @@ function commonSetup() {
     app.register('component-lookup:main', ComponentLookup);
 
     appInstance = app.buildInstance();
+    appInstance.setupRegistry();
   });
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,6 +40,7 @@ function commonSetup() { @@
         app.register('component-lookup:main', ComponentLookup);
         appInstance = app.buildInstance();
+        appInstance.setupRegistry();
       });
     }
@@ Expand Down @@