Fix tests

Author: fabioh8010

tests/unit/onyxUtilsTest.ts

@@ -271,7 +271,6 @@ describe('OnyxUtils', () => {
                 key: ONYXKEYS.COLLECTION.TEST_KEY,
                 callback: collectionCallback,
                 waitForCollectionCallback: true,
-                initWithStoredValues: false,
             });
 
             await waitForPromisesToResolve();
@@ -299,9 +298,9 @@ describe('OnyxUtils', () => {
             const spy2 = jest.fn();
             const spy3 = jest.fn();
 
-            const conn1 = Onyx.connect({key: `${ONYXKEYS.COLLECTION.TEST_KEY}1`, callback: spy1, initWithStoredValues: false});
-            const conn2 = Onyx.connect({key: `${ONYXKEYS.COLLECTION.TEST_KEY}2`, callback: spy2, initWithStoredValues: false});
-            const conn3 = Onyx.connect({key: `${ONYXKEYS.COLLECTION.TEST_KEY}3`, callback: spy3, initWithStoredValues: false});
+            const conn1 = Onyx.connect({key: `${ONYXKEYS.COLLECTION.TEST_KEY}1`, callback: spy1});
+            const conn2 = Onyx.connect({key: `${ONYXKEYS.COLLECTION.TEST_KEY}2`, callback: spy2});
+            const conn3 = Onyx.connect({key: `${ONYXKEYS.COLLECTION.TEST_KEY}3`, callback: spy3});
             await waitForPromisesToResolve();
             spy1.mockClear();
             spy2.mockClear();
@@ -333,12 +332,10 @@ describe('OnyxUtils', () => {
                 key: ONYXKEYS.COLLECTION.TEST_KEY,
                 callback: collectionCallback,
                 waitForCollectionCallback: true,
-                initWithStoredValues: false,
             });
             const connSingle = Onyx.connect({
                 key: ONYXKEYS.TEST_KEY,
                 callback: singleKeyCallback,
-                initWithStoredValues: false,
             });
             await waitForPromisesToResolve();
             collectionCallback.mockClear();
@@ -369,13 +366,11 @@ describe('OnyxUtils', () => {
                 key: ONYXKEYS.COLLECTION.TEST_KEY,
                 callback: testCallback,
                 waitForCollectionCallback: true,
-                initWithStoredValues: false,
             });
             const connRoutes = Onyx.connect({
                 key: ONYXKEYS.COLLECTION.ROUTES,
                 callback: routesCallback,
                 waitForCollectionCallback: true,
-                initWithStoredValues: false,
             });
             await waitForPromisesToResolve();
             testCallback.mockClear();
@@ -408,8 +403,8 @@ describe('OnyxUtils', () => {
 
             const spy1 = jest.fn();
             const spy2 = jest.fn();
-            const conn1 = Onyx.connect({key: `${ONYXKEYS.COLLECTION.TEST_KEY}1`, callback: spy1, initWithStoredValues: false});
-            const conn2 = Onyx.connect({key: `${ONYXKEYS.COLLECTION.TEST_KEY}2`, callback: spy2, initWithStoredValues: false});
+            const conn1 = Onyx.connect({key: `${ONYXKEYS.COLLECTION.TEST_KEY}1`, callback: spy1});
+            const conn2 = Onyx.connect({key: `${ONYXKEYS.COLLECTION.TEST_KEY}2`, callback: spy2});
             await waitForPromisesToResolve();
             spy1.mockClear();
             spy2.mockClear();
@@ -437,24 +432,16 @@ describe('OnyxUtils', () => {
             // it receives the first member. Subsequent changed members in the same batch must NOT
             // trigger further callbacks for this subscriber.
             const callback = jest.fn();
-            let connection: ReturnType<typeof Onyx.connect>;
-
-            callback.mockImplementation(() => {
-                if (!connection) {
-                    return;
-                }
-
-                Onyx.disconnect(connection);
-            });
-
-            connection = Onyx.connect({
+            const connection = Onyx.connect({
                 key: ONYXKEYS.COLLECTION.TEST_KEY,
                 callback,
                 waitForCollectionCallback: false,
-                initWithStoredValues: false,
             });
             await waitForPromisesToResolve();
-            callback.mockClear();
+            callback.mockReset();
+            callback.mockImplementation(() => {
+                Onyx.disconnect(connection);
+            });
 
             await Onyx.multiSet({
                 [`${ONYXKEYS.COLLECTION.TEST_KEY}1`]: {id: 1},
@@ -486,12 +473,10 @@ describe('OnyxUtils', () => {
             const connA = Onyx.connect({
                 key: ONYXKEYS.TEST_KEY,
                 callback: callbackA,
-                initWithStoredValues: false,
             });
             const connB = Onyx.connect({
                 key: ONYXKEYS.TEST_KEY_2,
                 callback: callbackB,
-                initWithStoredValues: false,
             });
             await waitForPromisesToResolve();
             callbackA.mockClear();