Merge pull request #4587 from emberjs/links-in-record

Remove ds-links-in-record-array feature flag
emberjs · Oct 18, 2016 · 88e909c · 88e909c
2 parents 0cd85e7 + e27e29e
commit 88e909c
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 41 deletions.
diff --git a/addon/-private/system/record-arrays/adapter-populated-record-array.js b/addon/-private/system/record-arrays/adapter-populated-record-array.js
@@ -1,7 +1,6 @@
 import Ember from 'ember';
 import RecordArray from "ember-data/-private/system/record-arrays/record-array";
 import cloneNull from "ember-data/-private/system/clone-null";
-import isEnabled from 'ember-data/-private/features';
 
 /**
   @module ember-data
@@ -52,9 +51,7 @@ export default RecordArray.extend({
       meta: cloneNull(payload.meta)
     });
 
-    if (isEnabled('ds-links-in-record-array')) {
-      this.set('links', cloneNull(payload.links));
-    }
+    this.set('links', cloneNull(payload.links));
 
     internalModels.forEach((record) => {
       this.manager.recordArraysForRecord(record).add(this);

diff --git a/config/features.json b/config/features.json
@@ -3,7 +3,6 @@
   "ds-improved-ajax": true,
   "ds-pushpayload-return": null,
   "ds-extended-errors": null,
-  "ds-links-in-record-array": true,
   "ds-overhaul-references": null,
   "ds-payload-type-hooks": null,
   "ds-check-should-serialize-relationships": null,

diff --git a/tests/unit/adapter-populated-record-array-test.js b/tests/unit/adapter-populated-record-array-test.js
@@ -5,8 +5,6 @@ import {module, test} from 'qunit';
 
 import DS from 'ember-data';
 
-import isEnabled from 'ember-data/-private/features';
-
 var Person, store;
 var run = Ember.run;
 
@@ -104,43 +102,41 @@ test("stores the metadata off the payload", function(assert) {
   assert.equal(recordArray.get('meta.foo'), 'bar', 'expected meta.foo to be bar from payload');
 });
 
-if (isEnabled('ds-links-in-record-array')) {
-  test('stores the links off the payload', function(assert) {
-    var recordArray = store.recordArrayManager
-    .createAdapterPopulatedRecordArray(store.modelFor('person'), null);
-    var payload = {
-      data: [{
-        type: 'person',
-        id: '1',
-        attributes: {
-          name: 'Scumbag Dale'
-        }
-      }, {
-        type: 'person',
-        id: '2',
-        attributes: {
-          name: 'Scumbag Katz'
-        }
-      }, {
-        type: 'person',
-        id: '3',
-        attributes: {
-          name: 'Scumbag Bryn'
-        }
-      }],
-      links: {
-        first: '/foo?page=1'
+test('stores the links off the payload', function(assert) {
+  var recordArray = store.recordArrayManager
+      .createAdapterPopulatedRecordArray(store.modelFor('person'), null);
+  var payload = {
+    data: [{
+      type: 'person',
+      id: '1',
+      attributes: {
+        name: 'Scumbag Dale'
       }
-    };
-
-    run(function() {
-      var records = store.push(payload);
-      recordArray.loadRecords(records, payload);
-    });
+    }, {
+      type: 'person',
+      id: '2',
+      attributes: {
+        name: 'Scumbag Katz'
+      }
+    }, {
+      type: 'person',
+      id: '3',
+      attributes: {
+        name: 'Scumbag Bryn'
+      }
+    }],
+    links: {
+      first: '/foo?page=1'
+    }
+  };
 
-    assert.equal(recordArray.get('links.first'), '/foo?page=1', 'expected links.first to be "/foo?page=1" from payload');
+  run(function() {
+    var records = store.push(payload);
+    recordArray.loadRecords(records, payload);
   });
-}
+
+  assert.equal(recordArray.get('links.first'), '/foo?page=1', 'expected links.first to be "/foo?page=1" from payload');
+});
 
 test('recordArray.replace() throws error', function(assert) {
   var recordArray = store.recordArrayManager