singleton record-data only

emberjs · Aug 29, 2022 · bc7f252 · bc7f252
1 parent f8ed916
commit bc7f252
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 720 deletions.
diff --git a/packages/-ember-data/tests/integration/records/load-test.js b/packages/-ember-data/tests/integration/records/load-test.js
@@ -6,7 +6,6 @@ import { reject, resolve } from 'rsvp';
 import { setupTest } from 'ember-qunit';
 
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
-import { V2CACHE_SINGLETON_RECORD_DATA } from '@ember-data/canary-features';
 import Model, { attr, belongsTo } from '@ember-data/model';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
 import Store from '@ember-data/store';
@@ -223,13 +222,8 @@ module('integration/load - Loading Records', function (hooks) {
 
     // test that after the reload-due-to-unload our state is correct
     newRecordData = cache.peek({ identifier, bucket: 'recordData' });
-    if (V2CACHE_SINGLETON_RECORD_DATA) {
-      // this first assertion changes based on activation of singleton cache because its a simple mapping of identifier
-      // to state and we now have state
-      assert.false(recordData.isEmpty(identifier), 'after second find: Our original recordData is no longer empty');
-    } else {
-      assert.true(recordData.isEmpty(identifier), 'after second find: Our original recordData is still empty');
-    }
+    assert.false(recordData.isEmpty(identifier), 'after second find: Our original recordData is no longer empty');
+
     assert.false(newRecordData.isEmpty(identifier), 'after second find: We are no longer empty');
     assert.false(_isLoading(cache, identifier), 'after second find: We have loaded');
     assert.false(record.isReloading, 'after second find: We are not reloading');

diff --git a/packages/canary-features/addon/default-features.ts b/packages/canary-features/addon/default-features.ts
@@ -171,5 +171,4 @@
 */
 export default {
   SAMPLE_FEATURE_FLAG: null,
-  V2CACHE_SINGLETON_RECORD_DATA: true,
 };
diff --git a/packages/canary-features/addon/index.ts b/packages/canary-features/addon/index.ts
@@ -26,4 +26,3 @@ function featureValue(value: boolean | null): boolean | null {
 
 export const FEATURES: FeatureList = Object.assign({}, DEFAULT_FEATURES, ENV.FEATURES);
 export const SAMPLE_FEATURE_FLAG = featureValue(FEATURES.SAMPLE_FEATURE_FLAG);
-export const V2CACHE_SINGLETON_RECORD_DATA = featureValue(FEATURES.V2CACHE_SINGLETON_RECORD_DATA);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,4 +26,3 @@ function featureValue(value: boolean \| null): boolean \| null {

		export const FEATURES: FeatureList = Object.assign({}, DEFAULT_FEATURES, ENV.FEATURES);
		export const SAMPLE_FEATURE_FLAG = featureValue(FEATURES.SAMPLE_FEATURE_FLAG);
		export const V2CACHE_SINGLETON_RECORD_DATA = featureValue(FEATURES.V2CACHE_SINGLETON_RECORD_DATA);