Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ds-links-in-record-array feature flag #4587

Merged
merged 1 commit into from
Oct 18, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion config/features.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
68 changes: 32 additions & 36 deletions tests/unit/adapter-populated-record-array-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down