Fixes _lookupFactory deprecation for Ember canary

(cherry picked from commit 7ef8273)
emberjs · Jan 26, 2017 · 5d11fd3 · 5d11fd3
1 parent 43c7183
commit 5d11fd3
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/addon/-private/system/store.js b/addon/-private/system/store.js
@@ -2033,8 +2033,15 @@ Store = Service.extend({
     // container._registry = 1.11 - 2.0
     // container = < 1.11
     let owner = getOwner(this);
+    let mixin;
+
+    if (owner.factoryFor) {
+      let MaybeMixin = owner.factoryFor(`mixin:${normalizedModelName}`);
+      mixin = MaybeMixin && MaybeMixin.class;
+    } else {
+      mixin = owner._lookupFactory(`mixin:${normalizedModelName}`);
+    }
 
-    let mixin = owner._lookupFactory('mixin:' + normalizedModelName);
     if (mixin) {
       //Cache the class as a model
       owner.register('model:' + normalizedModelName, Model.extend(mixin));
@@ -2107,7 +2114,14 @@ Store = Service.extend({
     let trueModelName = this._classKeyFor(modelName);
     let owner = getOwner(this);
 
-    return owner._lookupFactory(`model:${trueModelName}`);
+    if (owner.factoryFor) {
+      let MaybeModel = owner.factoryFor(`model:${trueModelName}`);
+      let MaybeModelFactory = MaybeModel && MaybeModel.class;
+
+      return MaybeModelFactory;
+    } else {
+      return owner._lookupFactory(`model:${trueModelName}`);
+    }
   },
 
   /**
@@ -2326,7 +2340,13 @@ Store = Service.extend({
   },
 
   _hasModelFor(modelName) {
-    return !!getOwner(this)._lookupFactory(`model:${modelName}`);
+    let owner = getOwner(this);
+
+    if (owner.factoryFor) {
+      return !!owner.factoryFor(`model:${modelName}`);
+    } else {
+      return !!owner._lookupFactory(`model:${modelName}`);
+    }
   },
 
   _pushInternalModel(data) {

diff --git a/addon/-private/utils.js b/addon/-private/utils.js
@@ -16,7 +16,7 @@ function modelHasAttributeOrRelationshipNamedType(modelClass) {
   ember-container-inject-owner is a new feature in Ember 2.3 that finally provides a public
   API for looking items up.  This function serves as a super simple polyfill to avoid
   triggering deprecations.
-*/
+ */
 function getOwner(context) {
   var owner;
 

diff --git a/tests/integration/debug-adapter-test.js b/tests/integration/debug-adapter-test.js
@@ -33,9 +33,17 @@ module("DS.DebugAdapter", {
     store = App.__container__.lookup('service:store');
     debugAdapter = App.__container__.lookup('data-adapter:main');
 
+    let klass;
+
+    if (App.__container__.factoryFor) {
+      klass = App.__container__.factoryFor('model:post').class;
+    } else {
+      klass = App.__container__.lookupFactory('model:post');
+    }
+
     debugAdapter.reopen({
       getModelTypes() {
-        return Ember.A([{ klass: App.__container__.lookupFactory('model:post'), name: 'post' }]);
+        return Ember.A([{ klass, name: 'post' }]);
       }
     });
   },