Merge pull request #13031 from Panman8201/fix-create-mergedProperties…

…-proto [BUGFIX release] Fix mergedProperties at create time modifying proto
emberjs · Mar 2, 2016 · c7ddfb4 · c7ddfb4
2 parents 9578667 + fa87517
commit c7ddfb4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/packages/ember-metal/tests/mixin/merged_properties_test.js b/packages/ember-metal/tests/mixin/merged_properties_test.js
@@ -105,6 +105,29 @@ QUnit.test('mergedProperties should exist even if not explicitly set on create',
   equal(get(obj, 'options').b.c, 'ccc');
 });
 
+QUnit.test('defining mergedProperties at create time should not modify the prototype', function() {
+  var AnObj = EmberObject.extend({
+    mergedProperties: ['options'],
+    options: {
+      a: 1
+    }
+  });
+
+  var objA = AnObj.create({
+    options: {
+      a: 2
+    }
+  });
+  var objB = AnObj.create({
+    options: {
+      a: 3
+    }
+  });
+
+  equal(get(objA, 'options').a, 2);
+  equal(get(objB, 'options').a, 3);
+});
+
 QUnit.test('mergedProperties\' overwriting methods can call _super', function() {
   expect(4);
 

diff --git a/packages/ember-runtime/lib/system/core_object.js b/packages/ember-runtime/lib/system/core_object.js
@@ -147,7 +147,7 @@ function makeCtor() {
               mergedProperties.indexOf(keyName) >= 0) {
             var originalValue = this[keyName];
 
-            value = assign(originalValue, value);
+            value = assign({}, originalValue, value);
           }
 
           if (desc) {