Merge pull request #3270 from wecc/save-embedded-fix

Pass store to inverseFor in removeEmbeddedForeignKey
emberjs · Jun 9, 2015 · 19fa1d0 · 19fa1d0
2 parents b4b35a1 + e01fb16
commit 19fa1d0
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/packages/ember-data/lib/serializers/embedded-records-mixin.js b/packages/ember-data/lib/serializers/embedded-records-mixin.js
@@ -346,7 +346,7 @@ var EmbeddedRecordsMixin = Ember.Mixin.create({
     if (relationship.kind === 'hasMany') {
       return;
     } else if (relationship.kind === 'belongsTo') {
-      var parentRecord = snapshot.type.inverseFor(relationship.key);
+      var parentRecord = snapshot.type.inverseFor(relationship.key, this.store);
       if (parentRecord) {
         var name = parentRecord.name;
         var embeddedSerializer = this.store.serializerFor(embeddedSnapshot.modelName);

diff --git a/packages/ember-data/tests/integration/serializers/embedded-records-mixin-test.js b/packages/ember-data/tests/integration/serializers/embedded-records-mixin-test.js
@@ -1537,3 +1537,38 @@ test("serializing relationships with an embedded and without calls super when no
   ok(calledSerializeBelongsTo);
   ok(calledSerializeHasMany);
 });
+
+test("serializing belongsTo correctly removes embedded foreign key", function() {
+  SecretWeapon.reopen({
+    superVillain: null
+  });
+  EvilMinion.reopen({
+    secretWeapon: DS.belongsTo('secret-weapon'),
+    superVillain: null
+  });
+
+  run(function() {
+    secretWeapon = env.store.createRecord('secret-weapon', { name: "Secret Weapon" });
+    evilMinion = env.store.createRecord('evil-minion', { name: "Evil Minion", secretWeapon: secretWeapon });
+  });
+
+  env.registry.register('serializer:evil-minion', DS.RESTSerializer.extend(DS.EmbeddedRecordsMixin, {
+    attrs: {
+      secretWeapon: { embedded: 'always' }
+    }
+  }));
+
+  var serializer = env.container.lookup("serializer:evil-minion");
+  var json;
+
+  run(function() {
+    json = serializer.serialize(evilMinion._createSnapshot());
+  });
+
+  deepEqual(json, {
+    name: "Evil Minion",
+    secretWeapon: {
+      name: "Secret Weapon"
+    }
+  });
+});