[BUGFIX beta] Ensure factoryFor does validation.

emberjs · Apr 30, 2017 · 077eace · 077eace
1 parent 3e16dce
commit 077eace
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/packages/container/lib/container.js b/packages/container/lib/container.js
@@ -167,6 +167,10 @@ Container.prototype = {
       return;
     }
 
+    if (DEBUG && factory && typeof factory._onLookup === 'function') {
+      factory._onLookup(fullName);
+    }
+
     let manager = new FactoryManager(this, factory, fullName, normalizedName);
 
     if (DEBUG) {

diff --git a/packages/ember-runtime/tests/controllers/controller_test.js b/packages/ember-runtime/tests/controllers/controller_test.js
@@ -159,12 +159,10 @@ if (!EmberDev.runningProdBuild) {
         foo: inject.controller('bar')
       });
 
+      owner.register('controller:bar', EmberObject.extend());
       owner.register('foo:main', AnObject);
 
-      expectDeprecation(() => {
-        owner._lookupFactory('foo:main');
-      }, /Using "_lookupFactory" is deprecated. Please use container.factoryFor instead./);
-
+      owner.lookup('foo:main');
     }, /Defining an injected controller property on a non-controller is not allowed./);
   });
 }

diff --git a/packages/ember-runtime/tests/inject_test.js b/packages/ember-runtime/tests/inject_test.js
@@ -32,11 +32,11 @@ if (!EmberDev.runningProdBuild) {
     });
 
     owner.register('foo:main', AnObject);
+    owner.register('foo:bar', EmberObject.extend());
+    owner.register('foo:baz', EmberObject.extend());
 
-    expect(2);
-    expectDeprecation(() => {
-      owner._lookupFactory('foo:main');
-    }, /Using "_lookupFactory" is deprecated. Please use container.factoryFor instead./);
+    expect(1);
+    owner.lookup('foo:main');
   });
 
   QUnit.test('attempting to inject a nonexistent container key should error', function() {