Apply last feedback

emberjs · Feb 7, 2018 · 13859d3 · 13859d3
1 parent 0c3d175
commit 13859d3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -44,6 +44,7 @@ jobs:
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
+    - env: EMBER_TRY_SCENARIO=ember-canary-without-application-wrapper
 
     # runs deploy if running on a specific tag
     - stage: deploy

diff --git a/addon-test-support/@ember/test-helpers/setup-application-context.js b/addon-test-support/@ember/test-helpers/setup-application-context.js
@@ -20,10 +20,10 @@ export function visit() {
     })
     .then(() => {
       // eslint-disable-next-line
-      if (EmberENV.FEATURES['ember-glimmer-remove-application-template-wrapper']) {
-        context.element = document.querySelector('#ember-testing');
-      } else {
+      if (EmberENV._APPLICATION_TEMPLATE_WRAPPER) {
         context.element = document.querySelector('#ember-testing > .ember-view');
+      } else {
+        context.element = document.querySelector('#ember-testing');
       }
     })
     .then(settled);

diff --git a/addon-test-support/@ember/test-helpers/setup-rendering-context.js b/addon-test-support/@ember/test-helpers/setup-rendering-context.js
@@ -197,10 +197,10 @@ export default function setupRenderingContext(context) {
       // and therefore we cannot update the `this.element` until after the
       // rendering is completed
       // eslint-disable-next-line
-      if (EmberENV.FEATURES['ember-glimmer-remove-application-template-wrapper']) {
-        context.element = getRootElement();
-      } else {
+      if (EmberENV._APPLICATION_TEMPLATE_WRAPPER) {
         context.element = getRootElement().querySelector('.ember-view');
+      } else {
+        context.element = getRootElement();
       }
 
       return context;

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -104,6 +104,14 @@ module.exports = function() {
             },
           },
         },
+        {
+          name: 'ember-canary-without-application-wrapper',
+          npm: {
+            devDependencies: {
+              'ember-source': urls[2],
+            },
+          },
+        },
         {
           name: 'ember-default-with-jquery',
           npm: {

diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -1,5 +1,7 @@
 /* eslint-env node */
 'use strict';
+let wrapperProp =
+  process.env.EMBER_TRY_CURRENT_SCENARIO !== 'ember-canary-without-application-wrapper';
 
 module.exports = function(environment) {
   let ENV = {
@@ -8,10 +10,10 @@ module.exports = function(environment) {
     rootURL: '/',
     locationType: 'auto',
     EmberENV: {
+      _APPLICATION_TEMPLATE_WRAPPER: wrapperProp,
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
         // e.g. 'with-controller': true
-        'ember-glimmer-remove-application-template-wrapper': true,
       },
       EXTEND_PROTOTYPES: {
         // Prevent Ember Data from overriding Date.parse.