From 34e97d0d3a216cc0d2bbf764affc6e71a56f487d Mon Sep 17 00:00:00 2001
From: Manuel Wiedenmann <manuel@funkensturm.de>
Date: Tue, 10 Nov 2015 10:30:39 +0100
Subject: [PATCH] [BUGFIX release] Fix for breaking RESTSerializer test

---
 packages/ember-data/lib/serializers/json-serializer.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/ember-data/lib/serializers/json-serializer.js b/packages/ember-data/lib/serializers/json-serializer.js
index ea207f95fdb..533c21eb143 100644
--- 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];