Auto merge of #165 - martndemus:test-recent-ember-versions, r=martndemus

Test on recent ember versions None
DockYard · May 27, 2016 · 103ad0a · 103ad0a
2 parents 80cfb88 + 78937c8
commit 103ad0a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,6 +24,8 @@ env:
   - EMBER_TRY_SCENARIO=ember-2.1
   - EMBER_TRY_SCENARIO=ember-2.2
   - EMBER_TRY_SCENARIO=ember-2.3
+  - EMBER_TRY_SCENARIO=ember-2.4
+  - EMBER_TRY_SCENARIO=ember-2.5
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -50,6 +50,24 @@ module.exports = {
         'ember': '~2.3.0'
       }
     },
+    {
+      name: 'ember-2.4',
+      dependencies: {
+        'ember': '~2.4.0'
+      },
+      resolutions: {
+        'ember': '~2.4.0'
+      }
+    },
+    {
+      name: 'ember-2.5',
+      dependencies: {
+        'ember': '~2.5.0'
+      },
+      resolutions: {
+        'ember': '~2.5.0'
+      }
+    },
     {
       name: 'ember-release',
       dependencies: {