diff --git a/addon/-private/system/record-arrays/adapter-populated-record-array.js b/addon/-private/system/record-arrays/adapter-populated-record-array.js index fb28d6e8c43..cc8545891b0 100644 --- a/addon/-private/system/record-arrays/adapter-populated-record-array.js +++ b/addon/-private/system/record-arrays/adapter-populated-record-array.js @@ -52,9 +52,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 index 607aa00310d..4bbc510cd77 100644 --- 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 index ca185142a1e..c3f70d10b61 100644 --- a/tests/unit/adapter-populated-record-array-test.js +++ b/tests/unit/adapter-populated-record-array-test.js @@ -104,43 +104,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