fix cacheEvictionTest

Author: kubabutkiewicz

lib/OnyxCache.ts

@@ -3,6 +3,7 @@ import bindAll from 'lodash/bindAll';
 import type {ValueOf} from 'type-fest';
 import utils from './utils';
 import type {OnyxKey, OnyxValue} from './types';
+import Storage from './storage';
 
 // Task constants
 const TASK = {
@@ -356,12 +357,13 @@ class OnyxCache {
      * removed.
      */
     addAllSafeEvictionKeysToRecentlyAccessedList(isCollectionKeyFn: (key: OnyxKey) => boolean): Promise<void> {
-        return Promise.resolve().then(() => {
+        return Storage.getAllKeys().then((keys: string[]) => {
             this.evictionAllowList.forEach((safeEvictionKey) => {
-                this.storageKeys.forEach((key) => {
+                keys.forEach((key: string) => {
                     if (!this.isKeyMatch(safeEvictionKey, key)) {
                         return;
                     }
+
                     this.addLastAccessedKey(key, isCollectionKeyFn(key));
                 });
             });

tests/unit/cacheEvictionTest.ts

@@ -50,14 +50,12 @@ test('Cache eviction', () => {
             );
             StorageMock.setItem = setItemMock;
 
-            return Onyx.set(`${ONYX_KEYS.COLLECTION.TEST_KEY}${RECORD_TO_ADD}`, {test: 'add'}).then(() => {
-                // When storage is full, eviction will typically remove test_add first, then add it back,
-                // which avoids removing test_evict. For this test, we'll manually handle the eviction.
-                delete collection[`${ONYX_KEYS.COLLECTION.TEST_KEY}${RECORD_TO_EVICT}`];
-
-                // Then our collection should no longer contain the evictable key
-                expect(collection[`${ONYX_KEYS.COLLECTION.TEST_KEY}${RECORD_TO_EVICT}`]).toBe(undefined);
-                expect(collection[`${ONYX_KEYS.COLLECTION.TEST_KEY}${RECORD_TO_ADD}`]).toStrictEqual({test: 'add'});
-            });
+            return Onyx.set(`${ONYX_KEYS.COLLECTION.TEST_KEY}${RECORD_TO_ADD}`, {test: 'add'})
+                .then(() => waitForPromisesToResolve())
+                .then(() => {
+                    // Then our collection should no longer contain the evictable key
+                    expect(collection[`${ONYX_KEYS.COLLECTION.TEST_KEY}${RECORD_TO_EVICT}`]).toBe(undefined);
+                    expect(collection[`${ONYX_KEYS.COLLECTION.TEST_KEY}${RECORD_TO_ADD}`]).toStrictEqual({test: 'add'});
+                });
         });
 });