[BUGFIX release] Move check into assert

emberjs · Nov 11, 2015 · 3a84960 · 3a84960
1 parent 34e97d0
commit 3a84960
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/packages/ember-data/lib/serializers/json-serializer.js b/packages/ember-data/lib/serializers/json-serializer.js
@@ -760,10 +760,7 @@ export default Serializer.extend({
     @return {String} key
   */
   _getMappedKey: function(key, modelClass) {
-    const hasAttributeKey = get(modelClass, 'attributes').has(key);
-    const hasRelationshipKey = get(modelClass, 'relationshipsByName').has(key);
-
-    Ember.assert('There is no attribute or relationship with the name `' + key + '` on `' + modelClass.modelName + '`. Check your serializers attrs hash.', hasAttributeKey || hasRelationshipKey);
+    Ember.assert('There is no attribute or relationship with the name `' + key + '` on `' + modelClass.modelName + '`. Check your serializers attrs hash.', get(modelClass, 'attributes').has(key) || get(modelClass, 'relationshipsByName').has(key));
 
     var attrs = get(this, 'attrs');
     var mappedKey;