[BUGFIX release] Fix for breaking RESTSerializer test

emberjs · Nov 10, 2015 · 34e97d0 · 34e97d0
1 parent 7ea8251
commit 34e97d0
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/packages/ember-data/lib/serializers/json-serializer.js b/packages/ember-data/lib/serializers/json-serializer.js
@@ -721,7 +721,13 @@ export default Serializer.extend({
         if (!hash.hasOwnProperty(payloadKey)) { continue; }
 
         // we need to normalize for JSONAPISerializer
-        normalizedKey = this.keyForAttribute(key);
+        if (get(modelClass, 'attributes').has(key)) {
+          normalizedKey = this.keyForAttribute(key);
+        }
+
+        if (get(modelClass, 'relationshipsByName').has(key)) {
+          normalizedKey = this.keyForRelationship(key);
+        }
 
         if (payloadKey !== normalizedKey) {
           hash[normalizedKey] = hash[payloadKey];