Cover setWithRetry and mergeCollection for empty array coercion behavior

Author: chuckdries

tests/unit/onyxTest.ts

@@ -182,7 +182,7 @@ describe('Onyx', () => {
             });
     });
 
-    it('should merge an object into an empty array (treating [] as {})', () => {
+    it('should merge an object into an empty array (treating [] as {})', async () => {
         let testKeyValue: unknown;
 
         connection = Onyx.connect({
@@ -193,17 +193,13 @@ describe('Onyx', () => {
             },
         });
 
-        return Onyx.set(ONYX_KEYS.TEST_KEY, [])
-            .then(() => {
-                expect(testKeyValue).toStrictEqual([]);
-                return Onyx.merge(ONYX_KEYS.TEST_KEY, {test: 'value'});
-            })
-            .then(() => {
-                expect(testKeyValue).toStrictEqual({test: 'value'});
-            });
+        await Onyx.set(ONYX_KEYS.TEST_KEY, []);
+        expect(testKeyValue).toStrictEqual([]);
+        await Onyx.merge(ONYX_KEYS.TEST_KEY, {test: 'value'});
+        expect(testKeyValue).toStrictEqual({test: 'value'});
     });
 
-    it('should still reject merging an object into a non-empty array', () => {
+    it('should still reject merging an object into a non-empty array', async () => {
         let testKeyValue: unknown;
 
         connection = Onyx.connect({
@@ -214,14 +210,46 @@ describe('Onyx', () => {
             },
         });
 
-        return Onyx.merge(ONYX_KEYS.TEST_KEY, ['existing'])
-            .then(() => {
-                expect(testKeyValue).toStrictEqual(['existing']);
-                return Onyx.merge(ONYX_KEYS.TEST_KEY, {test: 'value'});
-            })
-            .then(() => {
-                expect(testKeyValue).toStrictEqual(['existing']);
-            });
+        await Onyx.merge(ONYX_KEYS.TEST_KEY, ['existing']);
+        expect(testKeyValue).toStrictEqual(['existing']);
+        await Onyx.merge(ONYX_KEYS.TEST_KEY, {test: 'value'});
+        expect(testKeyValue).toStrictEqual(['existing']);
+    });
+
+    it('should mergeCollection an object into an empty array (treating [] as {})', async () => {
+        const collectionKey = `${ONYX_KEYS.COLLECTION.TEST_KEY}1`;
+        let testKeyValue: unknown;
+
+        connection = Onyx.connect({
+            key: ONYX_KEYS.COLLECTION.TEST_KEY,
+            initWithStoredValues: false,
+            waitForCollectionCallback: true,
+            callback: (value) => {
+                testKeyValue = value;
+            },
+        });
+
+        await Onyx.set(collectionKey, []);
+        expect((testKeyValue as Record<string, unknown>)?.[collectionKey]).toStrictEqual([]);
+        await Onyx.mergeCollection(ONYX_KEYS.COLLECTION.TEST_KEY, {[collectionKey]: {test: 'value'}});
+        expect((testKeyValue as Record<string, unknown>)?.[collectionKey]).toStrictEqual({test: 'value'});
+    });
+
+    it('should set an object over an empty array (treating [] as {})', async () => {
+        let testKeyValue: unknown;
+
+        connection = Onyx.connect({
+            key: ONYX_KEYS.TEST_KEY,
+            initWithStoredValues: false,
+            callback: (value) => {
+                testKeyValue = value;
+            },
+        });
+
+        await Onyx.set(ONYX_KEYS.TEST_KEY, []);
+        expect(testKeyValue).toStrictEqual([]);
+        await Onyx.set(ONYX_KEYS.TEST_KEY, {test: 'value'});
+        expect(testKeyValue).toStrictEqual({test: 'value'});
     });
 
     it('should notify subscribers when data has been cleared', () => {