Revert "Only extract embedded objects from payload if there is a payl…

…oad" This reverts commit 98e2863.
wagenet · Sep 26, 2013 · 39e999a · 39e999a
1 parent 42d966e
commit 39e999a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/packages/activemodel-adapter/lib/system/active_model_serializer.js b/packages/activemodel-adapter/lib/system/active_model_serializer.js
@@ -154,11 +154,10 @@ DS.ActiveModelSerializer = DS.RESTSerializer.extend({
   },
 
   extractSingle: function(store, primaryType, payload, recordId, requestType) {
-    if (payload) {
-      var root = this.keyForAttribute(primaryType.typeKey),
-          partial = payload[root];
-          updatePayloadWithEmbedded(store, this, primaryType, partial, payload);
-    }
+    var root = this.keyForAttribute(primaryType.typeKey),
+        partial = payload[root];
+
+    updatePayloadWithEmbedded(store, this, primaryType, partial, payload);
 
     return this._super(store, primaryType, payload, recordId, requestType);
   },

diff --git a/packages/activemodel-adapter/tests/integration/active_model_serializer_test.js b/packages/activemodel-adapter/tests/integration/active_model_serializer_test.js
@@ -162,20 +162,6 @@ test("extractSingle with embedded objects", function() {
   }));
 });
 
-test("extractSingle handles undefined payloads. i.e. 204 responses", function() {
-  env.container.register('adapter:superVillain', DS.ActiveModelAdapter);
-  env.container.register('serializer:homePlanet', DS.ActiveModelSerializer.extend({
-    attrs: {
-      villains: {embedded: 'always'}
-    }
-  }));
-
-  var serializer = env.container.lookup("serializer:homePlanet");
-  var json = serializer.extractSingle(env.store, HomePlanet, undefined);
-
-  equal(json, undefined);
-});
-
 test("extractSingle with embedded objects of same type", function() {
   env.container.register('adapter:comment', DS.ActiveModelAdapter);
   env.container.register('serializer:comment', DS.ActiveModelSerializer.extend({