Merge pull request #2953 from bmac/bug-2948

Do not assert reserved properties for static properties.
emberjs · Mar 27, 2015 · 6990154 · 6990154
2 parents 060f2d3 + d90a64e
commit 6990154
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/packages/ember-data/lib/system/model/model.js b/packages/ember-data/lib/system/model/model.js
@@ -17,9 +17,7 @@ var forEach = Ember.ArrayPolyfills.forEach;
 var map = Ember.ArrayPolyfills.map;
 var intersection = Ember.EnumerableUtils.intersection;
 var RESERVED_MODEL_PROPS = [
-  'attributes', 'currentState', 'data',
-  'relatedTypes', 'relationshipNames', 'relationships',
-  'relationshipsByName', 'transformedAttributes', 'store'
+  'currentState', 'data', 'store'
 ];
 
 var retrieveFromCurrentState = Ember.computed('currentState', function(key, value) {

diff --git a/packages/ember-data/tests/unit/model-test.js b/packages/ember-data/tests/unit/model-test.js
@@ -725,11 +725,9 @@ test("A subclass of DS.Model can not use the `store` property", function() {
 });
 
 test("A subclass of DS.Model can not use reserved properties", function() {
-  expect(9);
+  expect(3);
   [
-    'attributes', 'currentState', 'data',
-    'relatedTypes', 'relationshipNames', 'relationships',
-    'relationshipsByName', 'transformedAttributes', 'store'
+    'currentState', 'data', 'store'
   ].forEach(function(reservedProperty) {
     var invalidExtendObject = {};
     invalidExtendObject[reservedProperty] = DS.attr();