From d7076236edf15c91480fd73673d278a24192f3ff Mon Sep 17 00:00:00 2001
From: Mike North <northm@yahoo-inc.com>
Date: Wed, 20 May 2015 10:47:49 -0700
Subject: [PATCH] Tests passing against all framework channels

---
 .travis.yml                     |  6 ++----
 addon/mixins/route.js           |  2 +-
 config/ember-try.js             | 14 +++++++++++++-
 tests/unit/mixins/route-test.js |  4 +++-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8503eb43..6f884725 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,16 +11,14 @@ cache:
 
 env:
   - EMBER_TRY_SCENARIO=default
+  - EMBER_TRY_SCENARIO=ember-1.10
+  - EMBER_TRY_SCENARIO=ember-1.11
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - env: EMBER_TRY_SCENARIO=ember-release
-    - env: EMBER_TRY_SCENARIO=ember-beta
-    - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
   - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
diff --git a/addon/mixins/route.js b/addon/mixins/route.js
index c443ec44..9431bfa8 100644
--- a/addon/mixins/route.js
+++ b/addon/mixins/route.js
@@ -92,7 +92,7 @@ export default Ember.Mixin.create({
   infinityModel: function(modelName, options) {
     var _this = this;
 
-    if (this.store === undefined){
+    if (Ember.isEmpty(this.store) || Ember.isEmpty(this.store.find)){
       throw new Ember.Error("Ember Data store is not available to infinityModel");
     } else if (modelName === undefined) {
       throw new Ember.Error("You must pass a Model Name to infinityModel");
diff --git a/config/ember-try.js b/config/ember-try.js
index 83dab0f1..009c2403 100644
--- a/config/ember-try.js
+++ b/config/ember-try.js
@@ -2,7 +2,19 @@ module.exports = {
   scenarios: [
     {
       name: 'default',
-      dependencies: { }
+      dependencies: {}
+    },
+    {
+      name: 'ember-1.10',
+      dependencies: {
+        'ember': '~1.10.0'
+      }
+    },
+    {
+      name: 'ember-1.11',
+      dependencies: {
+        'ember': '~1.11.3'
+      }
     },
     {
       name: 'ember-release',
diff --git a/tests/unit/mixins/route-test.js b/tests/unit/mixins/route-test.js
index 9b9f8900..6816f7c7 100644
--- a/tests/unit/mixins/route-test.js
+++ b/tests/unit/mixins/route-test.js
@@ -36,7 +36,9 @@ test('it can not use infinityModel without a Model Name', function(assert) {
     }
   });
   var route = RouteObject.create();
-  route.store = {};
+  route.store = {
+    find() {}
+  };
 
   var infinityError;
   try {