Merge pull request #13335 from rwjblue/fix-regression-in-injected-pro…

…perties

[BUGFIX release] Ensure injected property assertion checks `container`.

packages/ember-metal/lib/injected_property.js

@@ -25,7 +25,7 @@ function InjectedProperty(type, name) {
 
 function injectedPropertyGet(keyName) {
   var desc = this[keyName];
-  let owner = getOwner(this);
+  let owner = getOwner(this) || this.container; // fallback to `container` for backwards compat
 
   assert(`InjectedProperties should be defined with the Ember.inject computed property macros.`, desc && desc.isDescriptor && desc.type);
   assert(`Attempting to lookup an injected property on an object without a container, ensure that the object was instantiated via a container.`, owner);

packages/ember-metal/tests/injected_property_test.js

@@ -22,7 +22,7 @@ QUnit.test('injected properties should be overridable', function() {
   equal(get(obj, 'foo'), 'bar', 'should return the overriden value');
 });
 
-QUnit.test('getting on an object without a container should fail assertion', function() {
+QUnit.test('getting on an object without an owner or container should fail assertion', function() {
   var obj = {};
   defineProperty(obj, 'foo', new InjectedProperty('type', 'name'));
 
@@ -31,6 +31,21 @@ QUnit.test('getting on an object without a container should fail assertion', fun
   }, /Attempting to lookup an injected property on an object without a container, ensure that the object was instantiated via a container./);
 });
 
+QUnit.test('getting on an object without an owner but with a container should not fail', function() {
+  var obj = {
+    container: {
+      lookup(key) {
+        ok(true, 'should call container.lookup');
+        return key;
+      }
+    }
+  };
+
+  defineProperty(obj, 'foo', new InjectedProperty('type', 'name'));
+
+  equal(get(obj, 'foo'), 'type:name', 'should return the value of container.lookup');
+});
+
 QUnit.test('getting should return a lookup on the container', function() {
   expect(2);