From 3a84960611f80e5d085a2fac4059777d5ad36043 Mon Sep 17 00:00:00 2001 From: Manuel Wiedenmann Date: Wed, 11 Nov 2015 22:23:23 +0100 Subject: [PATCH] [BUGFIX release] Move check into assert --- packages/ember-data/lib/serializers/json-serializer.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/ember-data/lib/serializers/json-serializer.js b/packages/ember-data/lib/serializers/json-serializer.js index 533c21eb143..0143a7fab83 100644 --- 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;