fix test loading and add 2.2 explicitly as a 2.0 that doesn't have co…

…ntextual component support
adopted-ember-addons · Mar 11, 2016 · 2ba64d2 · 2ba64d2
1 parent 95e9d47
commit 2ba64d2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -14,14 +14,24 @@ module.exports = {
       }
     },
     {
-      name: 'ember-2-before-contextual-components',
+      // ember 2 before contextual components
+      name: 'ember-2-2',
       dependencies: {
         "ember": "~2.2.0",
       },
       resolutions: {
         "ember": "~2.2.0"
       }
     },
+    {
+      name: 'ember-2-3',
+      dependencies: {
+        "ember": "~2.3.0",
+      },
+      resolutions: {
+        "ember": "~2.3.0"
+      }
+    },
     {
       name: 'ember-release',
       dependencies: {

diff --git a/tests/index.html b/tests/index.html
@@ -26,6 +26,7 @@
     <script src="assets/dummy.js"></script>
     <script src="testem.js"></script>
     <script src="assets/test-loader.js"></script>
+    <script src="assets/tests.js"></script>
 
     {{content-for 'body-footer'}}
     {{content-for 'test-body-footer'}}

diff --git a/tests/integration/with-contextual-components/contextual-component-test.js b/tests/integration/with-contextual-components/contextual-component-test.js
@@ -5,7 +5,7 @@ import Ember from 'ember';
 const integration = true;
 
 function hasContextualComponents() {
-  return !Ember.VERSION.match(/^2\.[0-3]/) && !Ember.VERSION.match(/^1/);
+  return !Ember.VERSION.match(/^2\.[0-2]\./) && !Ember.VERSION.match(/^1/);
 }
 
 describeComponent('x-select', 'X-Select - Contextual Component', {integration}, function() {