Merge pull request #11722 from jamesarosen/injected-property-assert

[BUGFIX beta] improve errors when InjectedProperty is misused
emberjs · Jul 12, 2015 · 5146427 · 5146427
2 parents 5b8e925 + 7a3e967
commit 5146427
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/ember-metal/lib/injected_property.js b/packages/ember-metal/lib/injected_property.js
@@ -23,9 +23,9 @@ function InjectedProperty(type, name) {
 }
 
 function injectedPropertyGet(keyName) {
-  var possibleDesc = this[keyName];
-  var desc = (possibleDesc !== null && typeof possibleDesc === 'object' && possibleDesc.isDescriptor) ? possibleDesc : undefined;
+  var desc = this[keyName];
 
+  Ember.assert(`InjectedProperties should be defined with the Ember.inject computed property macros.`, desc && desc.isDescriptor && desc.type);
   Ember.assert(`Attempting to lookup an injected property on an object without a container, ensure that the object was instantiated via a container.`, this.container);
 
   return this.container.lookup(desc.type + ':' + (desc.name || keyName));