From d90a64e080843dc470caeb712e509eb0537c1852 Mon Sep 17 00:00:00 2001
From: bmac <bmac325@GMail.com>
Date: Fri, 27 Mar 2015 14:42:39 -0400
Subject: [PATCH] Do not assert reserved properties for static properties.

---
 packages/ember-data/lib/system/model/model.js | 4 +---
 packages/ember-data/tests/unit/model-test.js  | 6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/ember-data/lib/system/model/model.js b/packages/ember-data/lib/system/model/model.js
index 7cb352ddc80..dc811468e0c 100644
--- 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
index 3240fec1100..35b8dc40b9e 100644
--- 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();