Merge pull request #4348 from pangratz/cleanup-ds-finder-include

[CLEANUP ds-finder-include]

FEATURES.md

@@ -17,12 +17,6 @@ entry in `config/features.json`.
 
   Note that this feature only works when `ds-transform-pass-options` is enabled too.
 
-- `ds-finder-include`
-
-  Allows an `include` query parameter to be specified with using
-  `store.findRecord()` and `store.findAll()` as described in [RFC
-  99](https://github.com/emberjs/rfcs/pull/99)
-
 - `ds-improved-ajax`
 
   This feature allows to customize how a request is formed by overwriting

addon/-private/system/snapshot-record-array.js

@@ -52,9 +52,7 @@ export default function SnapshotRecordArray(recordArray, meta, options = {}) {
   */
   this.adapterOptions = options.adapterOptions;
 
-  if (isEnabled('ds-finder-include')) {
-    this.include = options.include;
-  }
+  this.include = options.include;
 }
 
 /**

addon/-private/system/snapshot.js

@@ -38,9 +38,7 @@ export default function Snapshot(internalModel, options = {}) {
   */
   this.adapterOptions = options.adapterOptions;
 
-  if (isEnabled('ds-finder-include')) {
-    this.include = options.include;
-  }
+  this.include = options.include;
 
   this._changedAttributes = record.changedAttributes();
 }

addon/adapters/rest.js

@@ -1154,13 +1154,11 @@ var RESTAdapter = Adapter.extend(BuildURLMixin, {
   buildQuery(snapshot) {
     let query = {};
 
-    if (isEnabled('ds-finder-include')) {
-      if (snapshot) {
-        const { include } = snapshot;
+    if (snapshot) {
+      const { include } = snapshot;
 
-        if (include) {
-          query.include = include;
-        }
+      if (include) {
+        query.include = include;
       }
     }
 

config/features.json

@@ -1,6 +1,5 @@
 {
   "ds-boolean-transform-allow-null": null,
-  "ds-finder-include": true,
   "ds-improved-ajax": null,
   "ds-transform-pass-options": true,
   "ds-pushpayload-return": null,

tests/integration/adapter/rest-adapter-test.js

@@ -185,17 +185,15 @@ test("findRecord - payload with a serializer-specified attribute mapping", funct
   }));
 });
 
-if (isEnabled('ds-finder-include')) {
-  test("findRecord - passes `include` as a query parameter to ajax", function(assert) {
-    ajaxResponse({
-      post: { id: 1, name: 'Rails is very expensive sushi' }
-    });
-
-    run(store, 'findRecord', 'post', 1, { include: 'comments' }).then(assert.wait(function() {
-      assert.deepEqual(passedHash.data, { include: 'comments' }, '`include` parameter sent to adapter.ajax');
-    }));
+test("findRecord - passes `include` as a query parameter to ajax", function(assert) {
+  ajaxResponse({
+    post: { id: 1, name: 'Rails is very expensive sushi' }
   });
-}
+
+  run(store, 'findRecord', 'post', 1, { include: 'comments' }).then(assert.wait(function() {
+    assert.deepEqual(passedHash.data, { include: 'comments' }, '`include` parameter sent to adapter.ajax');
+  }));
+});
 
 test("createRecord - an empty payload is a basic success if an id was specified", function(assert) {
   ajaxResponse();
@@ -1053,17 +1051,15 @@ test("findAll - passes buildURL the requestType and snapshot", function(assert)
   }));
 });
 
-if (isEnabled('ds-finder-include')) {
-  test("findAll - passed `include` as a query parameter to ajax", function(assert) {
-    ajaxResponse({
-      posts: [{ id: 1, name: 'Rails is very expensive sushi' }]
-    });
-
-    run(store, 'findAll', 'post', { include: 'comments' }).then(assert.wait(function() {
-      assert.deepEqual(passedHash.data, { include: 'comments' }, '`include` params sent to adapter.ajax');
-    }));
+test("findAll - passed `include` as a query parameter to ajax", function(assert) {
+  ajaxResponse({
+    posts: [{ id: 1, name: 'Rails is very expensive sushi' }]
   });
-}
+
+  run(store, 'findAll', 'post', { include: 'comments' }).then(assert.wait(function() {
+    assert.deepEqual(passedHash.data, { include: 'comments' }, '`include` params sent to adapter.ajax');
+  }));
+});
 
 test("findAll - returning sideloaded data loads the data", function(assert) {
   ajaxResponse({

tests/integration/adapter/store-adapter-test.js

@@ -4,7 +4,6 @@ import Ember from 'ember';
 import {module, test} from 'qunit';
 
 import DS from 'ember-data';
-import isEnabled from 'ember-data/-private/features';
 
 /*
  This is an integration test that tests the communication between a store
@@ -1319,18 +1318,16 @@ test("store.findRecord should pass adapterOptions to adapter.findRecord", functi
   });
 });
 
-if (isEnabled('ds-finder-include')) {
-  test("store.findRecord should pass 'include' to adapter.findRecord", function(assert) {
-    assert.expect(1);
-
-    env.adapter.findRecord = assert.wait((store, type, id, snapshot) => {
-      assert.equal(snapshot.include,  'books', 'include passed to adapter.findRecord');
-      return Ember.RSVP.resolve({ id: 1 });
-    });
+test("store.findRecord should pass 'include' to adapter.findRecord", function(assert) {
+  assert.expect(1);
 
-    run(() => store.findRecord('person', 1, { include: 'books' }));
+  env.adapter.findRecord = assert.wait((store, type, id, snapshot) => {
+    assert.equal(snapshot.include,  'books', 'include passed to adapter.findRecord');
+    return Ember.RSVP.resolve({ id: 1 });
   });
-}
+
+  run(() => store.findRecord('person', 1, { include: 'books' }));
+});
 
 test("store.findAll should pass adapterOptions to the adapter.findAll method", function(assert) {
   assert.expect(1);
@@ -1346,18 +1343,16 @@ test("store.findAll should pass adapterOptions to the adapter.findAll method", f
   });
 });
 
-if (isEnabled('ds-finder-include')) {
-  test("store.findAll should pass 'include' to adapter.findAll", function(assert) {
-    assert.expect(1);
-
-    env.adapter.findAll = assert.wait((store, type, sinceToken, arraySnapshot) => {
-      assert.equal(arraySnapshot.include, 'books', 'include passed to adapter.findAll');
-      return Ember.RSVP.resolve([{ id: 1 }]);
-    });
+test("store.findAll should pass 'include' to adapter.findAll", function(assert) {
+  assert.expect(1);
 
-    run(() => store.findAll('person', { include: 'books' }));
+  env.adapter.findAll = assert.wait((store, type, sinceToken, arraySnapshot) => {
+    assert.equal(arraySnapshot.include, 'books', 'include passed to adapter.findAll');
+    return Ember.RSVP.resolve([{ id: 1 }]);
   });
-}
+
+  run(() => store.findAll('person', { include: 'books' }));
+});
 
 test("An async hasMany relationship with links should not trigger shouldBackgroundReloadRecord", function(assert) {
   var Post = DS.Model.extend({

tests/unit/adapters/rest-adapter/build-query-test.js

@@ -1,6 +1,5 @@
 import { module, test } from 'qunit';
 import DS from 'ember-data';
-import isEnabled from 'ember-data/-private/features';
 
 module("unit/adapters/rest-adapter/build-query - building queries");
 
@@ -20,13 +19,11 @@ test("buildQuery - doesn't fail without a snapshot", function(assert) {
   assert.deepEqual(query, {}, 'returns an empty query');
 });
 
-if (isEnabled('ds-finder-include')) {
-  test("buildQuery() returns query with `include` from snapshot", function(assert) {
-    const adapter = DS.RESTAdapter.create();
-    const snapshotStub = { include: 'comments' };
+test("buildQuery() returns query with `include` from snapshot", function(assert) {
+  const adapter = DS.RESTAdapter.create();
+  const snapshotStub = { include: 'comments' };
 
-    const query = adapter.buildQuery(snapshotStub);
+  const query = adapter.buildQuery(snapshotStub);
 
-    assert.deepEqual(query, { include: 'comments' }, 'query includes `include`');
-  });
-}
+  assert.deepEqual(query, { include: 'comments' }, 'query includes `include`');
+});