Bugfix: coalesceFindRequests should work with non native Adapter classes

packages/-ember-data/testem.js

@@ -4,7 +4,7 @@ const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem
 console.log(`\n\nLaunching with ${process.env.TESTEM_CI_LAUNCHER || 'Chrome'}\n\n`);
 
 module.exports = {
- test_page: 'tests/index.html?hidepassed',
+ test_page: 'tests/index.html?hidepassed&nocontainer',
  disable_watching: true,
  reporter: customDotReporter,
  launch_in_ci: [process.env.TESTEM_CI_LAUNCHER || 'Chrome'],

packages/-ember-data/tests/unit/adapters/json-api-adapter/json-api-test.js

@@ -0,0 +1,39 @@
+import { module, test } from 'qunit';
+
+import JSONAPIAdapter from '@ember-data/adapter/json-api';
+
+module('unit/adapters/json-api-test', function() {
+ test('coalesceFindRequests default', function(assert) {
+ const adapter = JSONAPIAdapter.extend();
+ assert.deepEqual(adapter.create().coalesceFindRequests, false, 'default result is false');
+ });
+
+ test('coalesceFindRequests true', function(assert) {
+ const adapter = JSONAPIAdapter.extend({ coalesceFindRequests: true });
+ assert.deepEqual(adapter.create().coalesceFindRequests, true, 'result is true');
+ });
+
+ test('coalesceFindRequests false', function(assert) {
+ const adapter = JSONAPIAdapter.extend({ coalesceFindRequests: false });
+ assert.deepEqual(adapter.create().coalesceFindRequests, false, 'result is false');
+ });
+
+ test('coalesceFindRequests class default', function(assert) {
+ class MyClass extends JSONAPIAdapter {}
+ assert.deepEqual(MyClass.create().coalesceFindRequests, false, 'default result is false');
+ });
+
+ test('coalesceFindRequests class true', function(assert) {
+ class MyClass extends JSONAPIAdapter {
+ coalesceFindRequests = true;
+ }
+ assert.deepEqual(MyClass.create().coalesceFindRequests, true, 'result is true');
+ });
+
+ test('coalesceFindRequests class false', function(assert) {
+ class MyClass extends JSONAPIAdapter {
+ coalesceFindRequests = false;
+ }
+ assert.deepEqual(MyClass.create().coalesceFindRequests, false, 'result is false');
+ });
+});

packages/-ember-data/tests/unit/adapters/rest-adapter/rest-test.js

@@ -0,0 +1,39 @@
+import { module, test } from 'qunit';
+
+import RESTAdapter from '@ember-data/adapter/rest';
+
+module('unit/adapters/rest-test', function() {
+ test('coalesceFindRequests default', function(assert) {
+ const adapter = RESTAdapter.extend();
+ assert.deepEqual(adapter.create().coalesceFindRequests, false, 'default result is false');
+ });
+
+ test('coalesceFindRequests true', function(assert) {
+ const adapter = RESTAdapter.extend({ coalesceFindRequests: true });
+ assert.deepEqual(adapter.create().coalesceFindRequests, true, 'result is true');
+ });
+
+ test('coalesceFindRequests false', function(assert) {
+ const adapter = RESTAdapter.extend({ coalesceFindRequests: false });
+ assert.deepEqual(adapter.create().coalesceFindRequests, false, 'result is false');
+ });
+
+ test('coalesceFindRequests class default', function(assert) {
+ class MyClass extends RESTAdapter {}
+ assert.deepEqual(MyClass.create().coalesceFindRequests, false, 'default result is false');
+ });
+
+ test('coalesceFindRequests class true', function(assert) {
+ class MyClass extends RESTAdapter {
+ coalesceFindRequests = true;
+ }
+ assert.deepEqual(MyClass.create().coalesceFindRequests, true, 'result is true');
+ });
+
+ test('coalesceFindRequests class false', function(assert) {
+ class MyClass extends RESTAdapter {
+ coalesceFindRequests = false;
+ }
+ assert.deepEqual(MyClass.create().coalesceFindRequests, false, 'result is false');
+ });
+});

packages/adapter/addon/index.ts

@@ -66,6 +66,8 @@ type SnapshotRecordArray = import('@ember-data/store/-private/system/snapshot-re
  @extends EmberObject
 */
 export default class Adapter extends EmberObject implements MinimumAdapterInterface {
+ declare _coalesceFindRequests: boolean;
+
  /**
  If you would like your adapter to use a custom serializer you can
  set the `defaultSerializer` property to be the name of the custom
@@ -479,7 +481,17 @@ export default class Adapter extends EmberObject implements MinimumAdapterInterf
  @property coalesceFindRequests
  @type {boolean}
  */
- coalesceFindRequests = true;
+ get coalesceFindRequests() {
+ let coalesceFindRequests = this._coalesceFindRequests;
+ if (typeof coalesceFindRequests === 'boolean') {
+ return coalesceFindRequests;
+ }
+ return (this._coalesceFindRequests = true);
+ }
+
+ set coalesceFindRequests(value: boolean) {
+ this._coalesceFindRequests = value;
+ }
 
  /**
  The store will call `findMany` instead of multiple `findRecord`

packages/adapter/addon/json-api.ts

@@ -231,7 +231,17 @@ class JSONAPIAdapter extends RESTAdapter {
  @property coalesceFindRequests
  @type {boolean}
  */
- coalesceFindRequests: boolean = false;
+ get coalesceFindRequests() {
+ let coalesceFindRequests = this._coalesceFindRequests;
+ if (typeof coalesceFindRequests === 'boolean') {
+ return coalesceFindRequests;
+ }
+ return (this._coalesceFindRequests = false);
+ }
+
+ set coalesceFindRequests(value: boolean) {
+ this._coalesceFindRequests = value;
+ }
 
  findMany(store: Store, type: ShimModelClass, ids: string[], snapshots: Snapshot[]): Promise<unknown> {
  let url = this.buildURL(type.modelName, ids, snapshots, 'findMany');

packages/adapter/addon/rest.ts

@@ -471,7 +471,17 @@ class RESTAdapter extends Adapter.extend(BuildURLMixin) {
  @property coalesceFindRequests
  @type {boolean}
  */
- coalesceFindRequests: boolean = false;
+ get coalesceFindRequests() {
+ let coalesceFindRequests = this._coalesceFindRequests;
+ if (typeof coalesceFindRequests === 'boolean') {
+ return coalesceFindRequests;
+ }
+ return (this._coalesceFindRequests = false);
+ }
+
+ set coalesceFindRequests(value: boolean) {
+ this._coalesceFindRequests = value;
+ }
 
  /**
  Endpoint paths can be prefixed with a `namespace` by setting the namespace

packages/unpublished-adapter-encapsulation-test-app/testem.js

@@ -5,7 +5,7 @@ const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem
 console.log(`\n\nLaunching with ${process.env.TESTEM_CI_LAUNCHER || 'Chrome'}\n\n`);
 
 module.exports = {
- test_page: 'tests/index.html?hidepassed',
+ test_page: 'tests/index.html?hidepassed&nocontainer',
  disable_watching: true,
  reporter: customDotReporter,
  launch_in_ci: [process.env.TESTEM_CI_LAUNCHER || 'Chrome'],

packages/unpublished-debug-encapsulation-test-app/testem.js

@@ -5,7 +5,7 @@ const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem
 console.log(`\n\nLaunching with ${process.env.TESTEM_CI_LAUNCHER || 'Chrome'}\n\n`);
 
 module.exports = {
- test_page: 'tests/index.html?hidepassed',
+ test_page: 'tests/index.html?hidepassed&nocontainer',
  disable_watching: true,
  reporter: customDotReporter,
  launch_in_ci: [process.env.TESTEM_CI_LAUNCHER || 'Chrome'],

packages/unpublished-fastboot-test-app/testem.js

@@ -5,7 +5,7 @@ const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem
 console.log(`\n\nLaunching with ${process.env.TESTEM_CI_LAUNCHER || 'Chrome'}\n\n`);
 
 module.exports = {
- test_page: 'tests/index.html?hidepassed',
+ test_page: 'tests/index.html?hidepassed&nocontainer',
  disable_watching: true,
  reporter: customDotReporter,
  launch_in_ci: [process.env.TESTEM_CI_LAUNCHER || 'Chrome'],

packages/unpublished-model-encapsulation-test-app/testem.js

@@ -9,7 +9,7 @@ if (TestIE) {
 }
 
 module.exports = {
- test_page: 'tests/index.html?hidepassed',
+ test_page: 'tests/index.html?hidepassed&nocontainer',
  disable_watching: true,
  reporter: customDotReporter,
  launch_in_ci: TestIE ? ['IE'] : ['Chrome'],

packages/unpublished-record-data-encapsulation-test-app/testem.js

@@ -5,7 +5,7 @@ const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem
 console.log(`\n\nLaunching with ${process.env.TESTEM_CI_LAUNCHER || 'Chrome'}\n\n`);
 
 module.exports = {
- test_page: 'tests/index.html?hidepassed',
+ test_page: 'tests/index.html?hidepassed&nocontainer',
  disable_watching: true,
  reporter: customDotReporter,
  launch_in_ci: [process.env.TESTEM_CI_LAUNCHER || 'Chrome'],

packages/unpublished-relationship-performance-test-app/testem.js

@@ -5,7 +5,7 @@ const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem
 console.log(`\n\nLaunching with ${process.env.TESTEM_CI_LAUNCHER || 'Chrome'}\n\n`);
 
 module.exports = {
- test_page: 'tests/index.html?hidepassed',
+ test_page: 'tests/index.html?hidepassed&nocontainer',
  disable_watching: true,
  reporter: customDotReporter,
  launch_in_ci: [process.env.TESTEM_CI_LAUNCHER || 'Chrome'],

packages/unpublished-serializer-encapsulation-test-app/testem.js

@@ -5,7 +5,7 @@ const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem
 console.log(`\n\nLaunching with ${process.env.TESTEM_CI_LAUNCHER || 'Chrome'}\n\n`);
 
 module.exports = {
- test_page: 'tests/index.html?hidepassed',
+ test_page: 'tests/index.html?hidepassed&nocontainer',
  disable_watching: true,
  reporter: customDotReporter,
  launch_in_ci: [process.env.TESTEM_CI_LAUNCHER || 'Chrome'],

packages/unpublished-test-infra/testem.js

@@ -1,5 +1,5 @@
 module.exports = {
- test_page: 'tests/index.html?hidepassed',
+ test_page: 'tests/index.html?hidepassed&nocontainer',
  disable_watching: true,
  launch_in_ci: ['Chrome'],
  launch_in_dev: ['Chrome'],