Failing test for ember data model. (#406)

addon/utils/merge-deep.ts

@@ -39,8 +39,19 @@ function propertyIsOnObject(object: any, property: any) {
   }
 }
 
+// Ember Data models don't respond as expected to foo.hasOwnProperty, so we do a special check
+function hasEmberDataProperty(target: any, key: string, options: Options): Boolean {
+  let fields: Map<string, any> | null = options.safeGet(target, 'constructor.fields');
+
+  return fields instanceof Map && fields.has(key);
+}
+
 // Protects from prototype poisoning and unexpected merging up the prototype chain.
-function propertyIsUnsafe(target: any, key: string): Boolean {
+function propertyIsUnsafe(target: any, key: string, options: Options): Boolean {
+  if(hasEmberDataProperty(target, key, options)) {
+    return false;
+  }
+
   return propertyIsOnObject(target, key) // Properties are safe to merge if they don't exist in the target yet,
     && !(Object.hasOwnProperty.call(target, key) // unsafe if they exist up the prototype chain,
       && Object.propertyIsEnumerable.call(target, key)); // and also unsafe if they're nonenumerable.
@@ -78,7 +89,7 @@ function buildPathToValue(source: any, options: Options, kv: Record<string, any>
 function mergeTargetAndSource(target: any, source: any, options: Options): any {
   getKeys(source).forEach(key => {
     // proto poisoning.  So can set by nested key path 'person.name'
-    if (propertyIsUnsafe(target, key)) {
+    if (propertyIsUnsafe(target, key, options)) {
       // if safeSet, we will find keys leading up to value and set
       if (options.safeSet) {
         const kv: Record<string, any> = buildPathToValue(source, options, {}, []);

tests/dummy/app/models/profile.js

@@ -1,7 +1,11 @@
 import DS from 'ember-data';
 import attr from 'ember-data/attr';
+import { belongsTo } from 'ember-data/relationships';
+
 
 export default DS.Model.extend({
   firstName: attr('string', { defaultValue: 'Bob' }),
   lastName: attr('string', { defaultValue: 'Ross' }),
+
+  pet: belongsTo('dog'),
 });

tests/integration/main-test.js

@@ -156,4 +156,21 @@ module('Integration | main', function(hooks) {
     dogs = changeset.get('dogs');
     assert.equal(dogs.length, 2, 'changeset has 2 dogs');
   });
+
+  test("can save ember data model with multiple attributes", async function (assert) {
+    assert.expect(1);
+
+    let save = () => {
+      assert.ok(true, "user save was called");
+    };
+    let profile = this.store.createRecord("profile", { save });
+    let pet = this.store.createRecord('dog')
+    let profileChangeset = new Changeset(profile);
+
+    profileChangeset.set("firstName", "bo");
+    profileChangeset.set("lastName", "jackson");
+    profileChangeset.set('pet', pet)
+
+    profileChangeset.save();
+  });
 });