fix tests

Expensify · Jul 12, 2023 · ad1a66d · ad1a66d
1 parent 69ec6e9
commit ad1a66d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/lib/Onyx.js b/lib/Onyx.js
@@ -1135,7 +1135,7 @@ function mergeCollection(collectionKey, collection) {
  return;
  }
  hasCollectionKeyCheckFailed = true;
- Logger.logError(`Provided collection doesn't have all its data belonging to the same parent. CollectionKey: ${collectionKey}, DataKey: ${dataKey}`);
+ Logger.logAlert(`Provided collection doesn't have all its data belonging to the same parent. CollectionKey: ${collectionKey}, DataKey: ${dataKey}`);
  });
 
  // Gracefully handle bad mergeCollection updates so it doesn't block the merge queue

diff --git a/tests/unit/onyxTest.js b/tests/unit/onyxTest.js
@@ -306,12 +306,18 @@ describe('Onyx', () => {
  });
  });
 
- it('should throw error when a key not belonging to collection key is present in mergeCollection', () => {
- try {
- Onyx.mergeCollection(ONYX_KEYS.COLLECTION.TEST_KEY, {test_1: {ID: 123}, notMyTest: {beep: 'boop'}});
- } catch (error) {
- expect(error.message).toEqual(`Provided collection doesn't have all its data belonging to the same parent. CollectionKey: ${ONYX_KEYS.COLLECTION.TEST_KEY}, DataKey: notMyTest`);
- }
+ it('should skip the update when a key not belonging to collection key is present in mergeCollection', () => {
+ const valuesReceived = {};
+ connectionID = Onyx.connect({
+ key: ONYX_KEYS.COLLECTION.TEST_KEY,
+ initWithStoredValues: false,
+ callback: (data, key) => valuesReceived[key] = data,
+ });
+
+ return Onyx.mergeCollection(ONYX_KEYS.COLLECTION.TEST_KEY, {test_1: {ID: 123}, notMyTest: {beep: 'boop'}})
+ .then(() => {
+ expect(valuesReceived).toEqual({});
+ });
  });
 
  it('should return full object to callback when calling mergeCollection()', () => {