Merge pull request #95 from simonihmig/fix-dom-service

Fix getDOM for Ember 2.6/2.7 in integration tests

Author: lukemelia

.travis.yml

@@ -12,7 +12,10 @@ env:
   # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
   - EMBER_TRY_SCENARIO=ember-1.13
   - EMBER_TRY_SCENARIO=ember-lts-2.4
+  - EMBER_TRY_SCENARIO=2.6
+  - EMBER_TRY_SCENARIO=2.7
   - EMBER_TRY_SCENARIO=ember-lts-2.8
+  - EMBER_TRY_SCENARIO=2.12
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary

addon/utils/dom.js

@@ -46,12 +46,15 @@ export function findElementById(doc, id) {
 // Private Ember API usage. Get the dom implementation used by the current
 // renderer, be it native browser DOM or Fastboot SimpleDOM
 export function getDOM(context) {
-  let container = getOwner ? getOwner(context) : context.container;
-  let documentService = container.lookup('service:-document');
+  let { renderer } = context;
+  if (!renderer._dom) { // pre glimmer2
+    let container = getOwner ? getOwner(context) : context.container;
+    let documentService = container.lookup('service:-document');
 
-  if (documentService) { return documentService; }
+    if (documentService) { return documentService; }
 
-  let renderer = container.lookup('renderer:-dom');
+    renderer = container.lookup('renderer:-dom');
+  }
 
   if (renderer._dom && renderer._dom.document) { // pre Ember 2.6
     return renderer._dom.document;

config/ember-try.js

@@ -23,6 +23,18 @@ module.exports = {
         }
       }
     },
+    {
+      name: '2.6',
+      dependencies: {
+        'ember': '~2.6.0'
+      }
+    },
+    {
+      name: '2.7',
+      dependencies: {
+        'ember': '~2.7.0'
+      }
+    },
     {
       name: 'ember-lts-2.8',
       bower: {
@@ -39,6 +51,18 @@ module.exports = {
         }
       }
     },
+    {
+      name: '2.12',
+      dependencies: {
+        'ember': '~2.12.0'
+      }
+    },
+    {
+      name: '2.12',
+      dependencies: {
+        'ember': '~2.12.0'
+      }
+    },
     {
       name: 'ember-release',
       bower: {

tests/integration/components/ember-wormhole-test.js

@@ -0,0 +1,21 @@
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+
+moduleForComponent('ember-wormhole', 'Integration | Component | ember wormhole', {
+  integration: true
+});
+
+test('it renders', function(assert) {
+  // Set any properties with this.set('myProperty', 'value');
+  // Handle any actions with this.on('myAction', function(val) { ... });
+
+  // Template block usage:
+  this.render(hbs`
+    <div id="wormhole"></div>
+    {{#ember-wormhole to="wormhole"}}
+      template block text
+    {{/ember-wormhole}}
+  `);
+
+  assert.equal(this.$('#wormhole').text().trim(), 'template block text');
+});