Browse Source

[ui] makes tests assertion more specific by removing expect.objectContaining (#4218)

Ram Prasad Agarwal 3 months ago
parent
commit
2a373cb918

+ 19 - 1
desktop/core/src/desktop/js/apps/newimporter/FileImportTabs/FileImportTabs.test.tsx

@@ -113,8 +113,26 @@ describe('FileImportTabs', () => {
     const finishButton = screen.getByText('Finish Import');
     const finishButton = screen.getByText('Finish Import');
     fireEvent.click(finishButton);
     fireEvent.click(finishButton);
 
 
+    const expectedFormData = new FormData();
+    expectedFormData.append(
+      'source',
+      JSON.stringify({
+        inputFormat: 'local',
+        path: '/test/path/file.csv',
+        sourceType: 'hive'
+      })
+    );
+    expectedFormData.append(
+      'destination',
+      JSON.stringify({
+        outputFormat: 'table',
+        nonDefaultLocation: '/test/path/file.csv',
+        name: 'default.file',
+        sourceType: 'hive'
+      })
+    );
     await waitFor(() => {
     await waitFor(() => {
-      expect(mockSave).toHaveBeenCalledWith(expect.any(FormData));
+      expect(mockSave).toHaveBeenCalledWith(expectedFormData);
     });
     });
   });
   });
 
 

+ 1 - 1
desktop/core/src/desktop/js/apps/newimporter/FilePreviewTab/DestinationSettings/DestinationSettings.tsx

@@ -149,7 +149,7 @@ const DestinationSettings = ({
       if (selectedDatabase) {
       if (selectedDatabase) {
         setDatabase(selectedDatabase);
         setDatabase(selectedDatabase);
       }
       }
-    } else if (!database) {
+    } else if (!defaultValues?.database) {
       setDatabase(databases[0]);
       setDatabase(databases[0]);
       onChange('database', databases[0]);
       onChange('database', databases[0]);
     }
     }

+ 5 - 1
desktop/core/src/desktop/js/apps/storageBrowser/StorageDirectoryPage/StorageDirectoryActions/FileAndFolder/ChangeOwnerAndGroupModal/ChangeOwnerAndGroupModal.test.tsx

@@ -181,8 +181,12 @@ describe('ChangeOwnerAndGroupModal Component', () => {
     fireEvent.click(getByText('Submit'));
     fireEvent.click(getByText('Submit'));
 
 
     await waitFor(() => {
     await waitFor(() => {
+      const expectedFormData = new FormData();
+      expectedFormData.append('user', 'user1');
+      expectedFormData.append('group', 'group1');
+      expectedFormData.append('path', 'test/path/file1.txt');
       expect(mockSave).toHaveBeenCalledTimes(1);
       expect(mockSave).toHaveBeenCalledTimes(1);
-      expect(mockSave).toHaveBeenCalledWith(expect.any(FormData));
+      expect(mockSave).toHaveBeenCalledWith(expectedFormData);
     });
     });
   });
   });
 
 

+ 7 - 8
desktop/core/src/desktop/js/apps/storageBrowser/StorageDirectoryPage/StorageDirectoryActions/FileAndFolder/ChangePermissionModal/ChangePermissionModal.test.tsx

@@ -57,7 +57,6 @@ describe('ChangePermissionModal Component', () => {
       <ChangePermissionModal
       <ChangePermissionModal
         isOpen={true}
         isOpen={true}
         files={mockFiles}
         files={mockFiles}
-        setLoading={jest.fn()}
         onSuccess={mockOnSuccess}
         onSuccess={mockOnSuccess}
         onError={mockOnError}
         onError={mockOnError}
         onClose={mockOnClose}
         onClose={mockOnClose}
@@ -81,7 +80,6 @@ describe('ChangePermissionModal Component', () => {
       <ChangePermissionModal
       <ChangePermissionModal
         isOpen={true}
         isOpen={true}
         files={mockFiles}
         files={mockFiles}
-        setLoading={jest.fn()}
         onSuccess={mockOnSuccess}
         onSuccess={mockOnSuccess}
         onError={mockOnError}
         onError={mockOnError}
         onClose={mockOnClose}
         onClose={mockOnClose}
@@ -105,7 +103,6 @@ describe('ChangePermissionModal Component', () => {
       <ChangePermissionModal
       <ChangePermissionModal
         isOpen={true}
         isOpen={true}
         files={mockFiles}
         files={mockFiles}
-        setLoading={jest.fn()}
         onSuccess={mockOnSuccess}
         onSuccess={mockOnSuccess}
         onError={mockOnError}
         onError={mockOnError}
         onClose={mockOnClose}
         onClose={mockOnClose}
@@ -115,8 +112,14 @@ describe('ChangePermissionModal Component', () => {
     fireEvent.click(getByText('Submit'));
     fireEvent.click(getByText('Submit'));
 
 
     waitFor(() => {
     waitFor(() => {
+      const expectedFormData = new FormData();
+      expectedFormData.append(
+        'permission',
+        '{"user_read":true,"user_write":true,"user_execute":true,"group_read":true,"group_write":true,"group_execute":true,"other_read":true,"other_write":true,"other_execute":true}'
+      );
+      expectedFormData.append('path', 'test/path/file1.txt');
       expect(mockSave).toHaveBeenCalledTimes(1);
       expect(mockSave).toHaveBeenCalledTimes(1);
-      expect(mockSave).toHaveBeenCalledWith(expect.any(FormData));
+      expect(mockSave).toHaveBeenCalledWith(expectedFormData);
     });
     });
   });
   });
 
 
@@ -129,7 +132,6 @@ describe('ChangePermissionModal Component', () => {
       <ChangePermissionModal
       <ChangePermissionModal
         isOpen={true}
         isOpen={true}
         files={mockFiles}
         files={mockFiles}
-        setLoading={jest.fn()}
         onSuccess={mockOnSuccess}
         onSuccess={mockOnSuccess}
         onError={mockOnError}
         onError={mockOnError}
         onClose={mockOnClose}
         onClose={mockOnClose}
@@ -150,7 +152,6 @@ describe('ChangePermissionModal Component', () => {
       <ChangePermissionModal
       <ChangePermissionModal
         isOpen={true}
         isOpen={true}
         files={mockFiles}
         files={mockFiles}
-        setLoading={jest.fn()}
         onSuccess={mockOnSuccess}
         onSuccess={mockOnSuccess}
         onError={mockOnError}
         onError={mockOnError}
         onClose={mockOnClose}
         onClose={mockOnClose}
@@ -167,7 +168,6 @@ describe('ChangePermissionModal Component', () => {
       <ChangePermissionModal
       <ChangePermissionModal
         isOpen={true}
         isOpen={true}
         files={mockFiles}
         files={mockFiles}
-        setLoading={jest.fn()}
         onSuccess={mockOnSuccess}
         onSuccess={mockOnSuccess}
         onError={mockOnError}
         onError={mockOnError}
         onClose={mockOnClose}
         onClose={mockOnClose}
@@ -183,7 +183,6 @@ describe('ChangePermissionModal Component', () => {
       <ChangePermissionModal
       <ChangePermissionModal
         isOpen={true}
         isOpen={true}
         files={mockFiles}
         files={mockFiles}
-        setLoading={jest.fn()}
         onSuccess={mockOnSuccess}
         onSuccess={mockOnSuccess}
         onError={mockOnError}
         onError={mockOnError}
         onClose={mockOnClose}
         onClose={mockOnClose}

+ 0 - 7
desktop/core/src/desktop/js/apps/storageBrowser/StorageDirectoryPage/StorageDirectoryActions/FileAndFolder/CompressionModal/CompressionModal.test.tsx

@@ -58,7 +58,6 @@ describe('CompressionModal Component', () => {
   const mockOnSuccess = jest.fn();
   const mockOnSuccess = jest.fn();
   const mockOnError = jest.fn();
   const mockOnError = jest.fn();
   const mockOnClose = jest.fn();
   const mockOnClose = jest.fn();
-  const setLoading = jest.fn();
 
 
   beforeEach(() => {
   beforeEach(() => {
     jest.clearAllMocks();
     jest.clearAllMocks();
@@ -69,7 +68,6 @@ describe('CompressionModal Component', () => {
       <CompressionModal
       <CompressionModal
         isOpen={true}
         isOpen={true}
         files={mockFiles}
         files={mockFiles}
-        setLoading={setLoading}
         onSuccess={mockOnSuccess}
         onSuccess={mockOnSuccess}
         onError={mockOnError}
         onError={mockOnError}
         onClose={mockOnClose}
         onClose={mockOnClose}
@@ -88,7 +86,6 @@ describe('CompressionModal Component', () => {
       <CompressionModal
       <CompressionModal
         isOpen={true}
         isOpen={true}
         files={mockFiles}
         files={mockFiles}
-        setLoading={setLoading}
         onSuccess={mockOnSuccess}
         onSuccess={mockOnSuccess}
         onError={mockOnError}
         onError={mockOnError}
         onClose={mockOnClose}
         onClose={mockOnClose}
@@ -106,7 +103,6 @@ describe('CompressionModal Component', () => {
       <CompressionModal
       <CompressionModal
         isOpen={true}
         isOpen={true}
         files={mockFiles}
         files={mockFiles}
-        setLoading={setLoading}
         onSuccess={mockOnSuccess}
         onSuccess={mockOnSuccess}
         onError={mockOnError}
         onError={mockOnError}
         onClose={mockOnClose}
         onClose={mockOnClose}
@@ -131,7 +127,6 @@ describe('CompressionModal Component', () => {
       <CompressionModal
       <CompressionModal
         isOpen={true}
         isOpen={true}
         files={mockFiles}
         files={mockFiles}
-        setLoading={setLoading}
         onSuccess={mockOnSuccess}
         onSuccess={mockOnSuccess}
         onError={mockOnError}
         onError={mockOnError}
         onClose={mockOnClose}
         onClose={mockOnClose}
@@ -150,7 +145,6 @@ describe('CompressionModal Component', () => {
       <CompressionModal
       <CompressionModal
         isOpen={true}
         isOpen={true}
         files={mockFiles}
         files={mockFiles}
-        setLoading={setLoading}
         onSuccess={mockOnSuccess}
         onSuccess={mockOnSuccess}
         onError={mockOnError}
         onError={mockOnError}
         onClose={mockOnClose}
         onClose={mockOnClose}
@@ -171,7 +165,6 @@ describe('CompressionModal Component', () => {
       <CompressionModal
       <CompressionModal
         isOpen={true}
         isOpen={true}
         files={mockFiles}
         files={mockFiles}
-        setLoading={setLoading}
         onSuccess={mockOnSuccess}
         onSuccess={mockOnSuccess}
         onError={mockOnError}
         onError={mockOnError}
         onClose={mockOnClose}
         onClose={mockOnClose}

+ 21 - 35
desktop/core/src/desktop/js/utils/hooks/useFileUpload/useChunkUpload.test.tsx

@@ -292,18 +292,13 @@ describe('useChunkUpload', () => {
     mockQueueCallback(mockChunk);
     mockQueueCallback(mockChunk);
 
 
     await waitFor(() => {
     await waitFor(() => {
-      expect(mockUpdateFileVariables.mock.calls).toEqual(
-        expect.arrayContaining([
-          [mockFile.uuid, { status: FileStatus.Uploading }],
-          [
-            mockFile.uuid,
-            {
-              status: FileStatus.Failed,
-              error: new Error('Upload server ran out of space. Try again later.')
-            }
-          ]
-        ])
-      );
+      expect(mockUpdateFileVariables).toHaveBeenCalledWith(mockFile.uuid, {
+        status: FileStatus.Uploading
+      });
+      expect(mockUpdateFileVariables).toHaveBeenCalledWith(mockFile.uuid, {
+        status: FileStatus.Failed,
+        error: new Error('Upload server ran out of space. Try again later.')
+      });
     });
     });
     expect(mockSave).not.toHaveBeenCalled();
     expect(mockSave).not.toHaveBeenCalled();
   });
   });
@@ -379,14 +374,11 @@ describe('useChunkUpload', () => {
       })
       })
     );
     );
 
 
-    expect(mockLoadData).toHaveBeenCalledWith(
-      GET_TASKS_URL,
-      expect.objectContaining({
-        pollInterval: 5000,
-        skip: true,
-        onSuccess: expect.any(Function)
-      })
-    );
+    expect(mockLoadData).toHaveBeenCalledWith(GET_TASKS_URL, {
+      pollInterval: 5000,
+      skip: true,
+      onSuccess: expect.any(Function)
+    });
 
 
     mockIsAllChunksOfFileUploaded.mockReturnValue(true);
     mockIsAllChunksOfFileUploaded.mockReturnValue(true);
     mockSave
     mockSave
@@ -399,14 +391,11 @@ describe('useChunkUpload', () => {
     });
     });
 
 
     await waitFor(() => {
     await waitFor(() => {
-      expect(mockLoadData).toHaveBeenCalledWith(
-        GET_TASKS_URL,
-        expect.objectContaining({
-          pollInterval: 5000,
-          skip: false,
-          onSuccess: expect.any(Function)
-        })
-      );
+      expect(mockLoadData).toHaveBeenCalledWith(GET_TASKS_URL, {
+        pollInterval: 5000,
+        skip: false,
+        onSuccess: expect.any(Function)
+      });
     });
     });
   });
   });
 
 
@@ -561,7 +550,7 @@ describe('useChunkUpload', () => {
       })
       })
     );
     );
 
 
-    expect(useQueueProcessor).toHaveBeenCalledWith(expect.any(Function), {
+    expect(useQueueProcessor).toHaveBeenCalledWith(mockQueueCallback, {
       concurrentProcess: DEFAULT_CONCURRENT_MAX_CONNECTIONS
       concurrentProcess: DEFAULT_CONCURRENT_MAX_CONNECTIONS
     });
     });
   });
   });
@@ -593,12 +582,9 @@ describe('useChunkUpload', () => {
       expect(mockUpdateFileVariables).toHaveBeenCalledWith(mockFile.uuid, {
       expect(mockUpdateFileVariables).toHaveBeenCalledWith(mockFile.uuid, {
         status: FileStatus.Uploading
         status: FileStatus.Uploading
       });
       });
-      expect(mockUpdateFileVariables).toHaveBeenCalledWith(
-        mockFile.uuid,
-        expect.objectContaining({
-          progress: 75
-        })
-      );
+      expect(mockUpdateFileVariables).toHaveBeenCalledWith(mockFile.uuid, {
+        progress: 75
+      });
     });
     });
   });
   });
 
 

+ 20 - 15
desktop/core/src/desktop/js/utils/hooks/useLoadData/useLoadData.test.tsx

@@ -33,6 +33,11 @@ const mockOptions = {
   params: { id: 1 }
   params: { id: 1 }
 };
 };
 
 
+const mockRequestOptions = {
+  silenceErrors: true,
+  ignoreSuccessErrors: true
+};
+
 describe('useLoadData', () => {
 describe('useLoadData', () => {
   beforeAll(() => {
   beforeAll(() => {
     jest.clearAllMocks();
     jest.clearAllMocks();
@@ -54,7 +59,7 @@ describe('useLoadData', () => {
     expect(result.current.loading).toBe(true);
     expect(result.current.loading).toBe(true);
 
 
     await waitFor(() => {
     await waitFor(() => {
-      expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, expect.any(Object));
+      expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, mockRequestOptions);
       expect(result.current.data).toEqual(mockDataResponse);
       expect(result.current.data).toEqual(mockDataResponse);
       expect(result.current.error).toBeUndefined();
       expect(result.current.error).toBeUndefined();
       expect(result.current.loading).toBe(false);
       expect(result.current.loading).toBe(false);
@@ -69,7 +74,7 @@ describe('useLoadData', () => {
     expect(result.current.loading).toBe(true);
     expect(result.current.loading).toBe(true);
 
 
     await waitFor(() => {
     await waitFor(() => {
-      expect(mockGet).toHaveBeenCalledWith(mockUrl, mockOptions.params, expect.any(Object));
+      expect(mockGet).toHaveBeenCalledWith(mockUrl, mockOptions.params, mockRequestOptions);
       expect(result.current.data).toEqual(mockDataResponse);
       expect(result.current.data).toEqual(mockDataResponse);
       expect(result.current.error).toBeUndefined();
       expect(result.current.error).toBeUndefined();
       expect(result.current.loading).toBe(false);
       expect(result.current.loading).toBe(false);
@@ -87,7 +92,7 @@ describe('useLoadData', () => {
     expect(result.current.loading).toBe(true);
     expect(result.current.loading).toBe(true);
 
 
     await waitFor(() => {
     await waitFor(() => {
-      expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, expect.any(Object));
+      expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, mockRequestOptions);
       expect(result.current.data).toBeUndefined();
       expect(result.current.data).toBeUndefined();
       expect(result.current.error).toEqual(mockError);
       expect(result.current.error).toEqual(mockError);
       expect(result.current.loading).toBe(false);
       expect(result.current.loading).toBe(false);
@@ -111,7 +116,7 @@ describe('useLoadData', () => {
     expect(result.current.loading).toBe(true);
     expect(result.current.loading).toBe(true);
 
 
     await waitFor(() => {
     await waitFor(() => {
-      expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, expect.any(Object));
+      expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, mockRequestOptions);
       expect(result.current.data).toEqual(mockDataResponse);
       expect(result.current.data).toEqual(mockDataResponse);
       expect(result.current.error).toBeUndefined();
       expect(result.current.error).toBeUndefined();
       expect(result.current.loading).toBe(false);
       expect(result.current.loading).toBe(false);
@@ -127,7 +132,7 @@ describe('useLoadData', () => {
 
 
     await waitFor(() => {
     await waitFor(() => {
       expect(mockGet).toHaveBeenCalledTimes(2);
       expect(mockGet).toHaveBeenCalledTimes(2);
-      expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, expect.any(Object));
+      expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, mockRequestOptions);
       expect(result.current.data).toEqual(updatedMockResult);
       expect(result.current.data).toEqual(updatedMockResult);
       expect(result.current.error).toBeUndefined();
       expect(result.current.error).toBeUndefined();
       expect(result.current.loading).toBe(false);
       expect(result.current.loading).toBe(false);
@@ -147,7 +152,7 @@ describe('useLoadData', () => {
     expect(result.current.loading).toBe(true);
     expect(result.current.loading).toBe(true);
 
 
     await waitFor(() => {
     await waitFor(() => {
-      expect(mockGet).toHaveBeenCalledWith(mockUrl, mockOptions.params, expect.any(Object));
+      expect(mockGet).toHaveBeenCalledWith(mockUrl, mockOptions.params, mockRequestOptions);
       expect(result.current.data).toEqual(mockDataResponse);
       expect(result.current.data).toEqual(mockDataResponse);
       expect(result.current.error).toBeUndefined();
       expect(result.current.error).toBeUndefined();
       expect(result.current.loading).toBe(false);
       expect(result.current.loading).toBe(false);
@@ -162,7 +167,7 @@ describe('useLoadData', () => {
     rerender({ url: mockUrl, options: newOptions });
     rerender({ url: mockUrl, options: newOptions });
 
 
     await waitFor(() => {
     await waitFor(() => {
-      expect(mockGet).toHaveBeenCalledWith(mockUrl, newOptions.params, expect.any(Object));
+      expect(mockGet).toHaveBeenCalledWith(mockUrl, newOptions.params, mockRequestOptions);
       expect(result.current.data).toEqual(newMockData);
       expect(result.current.data).toEqual(newMockData);
       expect(result.current.error).toBeUndefined();
       expect(result.current.error).toBeUndefined();
       expect(result.current.loading).toBe(false);
       expect(result.current.loading).toBe(false);
@@ -184,7 +189,7 @@ describe('useLoadData', () => {
     expect(result.current.loading).toBe(true);
     expect(result.current.loading).toBe(true);
 
 
     await waitFor(() => {
     await waitFor(() => {
-      expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, expect.any(Object));
+      expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, mockRequestOptions);
       expect(result.current.data).toEqual(mockDataResponse);
       expect(result.current.data).toEqual(mockDataResponse);
       expect(result.current.error).toBeUndefined();
       expect(result.current.error).toBeUndefined();
       expect(result.current.loading).toBe(false);
       expect(result.current.loading).toBe(false);
@@ -211,7 +216,7 @@ describe('useLoadData', () => {
     expect(result.current.loading).toBe(true);
     expect(result.current.loading).toBe(true);
 
 
     await waitFor(() => {
     await waitFor(() => {
-      expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, expect.any(Object));
+      expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, mockRequestOptions);
       expect(result.current.data).toBeUndefined();
       expect(result.current.data).toBeUndefined();
       expect(result.current.error).toEqual(mockError);
       expect(result.current.error).toEqual(mockError);
       expect(result.current.loading).toBe(false);
       expect(result.current.loading).toBe(false);
@@ -233,7 +238,7 @@ describe('useLoadData', () => {
     });
     });
 
 
     await waitFor(() => {
     await waitFor(() => {
-      expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, expect.any(Object));
+      expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, mockRequestOptions);
       expect(result.current.data).toEqual(mockDataResponse);
       expect(result.current.data).toEqual(mockDataResponse);
       expect(result.current.loading).toBe(false);
       expect(result.current.loading).toBe(false);
     });
     });
@@ -336,7 +341,7 @@ describe('useLoadData', () => {
       expect(result.current.loading).toBe(true);
       expect(result.current.loading).toBe(true);
 
 
       await waitFor(() => {
       await waitFor(() => {
-        expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, expect.any(Object));
+        expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, mockRequestOptions);
         expect(result.current.data).toEqual({ productId: 1, productName: 'Hue' });
         expect(result.current.data).toEqual({ productId: 1, productName: 'Hue' });
         expect(result.current.error).toBeUndefined();
         expect(result.current.error).toBeUndefined();
         expect(result.current.loading).toBe(false);
         expect(result.current.loading).toBe(false);
@@ -355,7 +360,7 @@ describe('useLoadData', () => {
       expect(result.current.loading).toBe(true);
       expect(result.current.loading).toBe(true);
 
 
       await waitFor(() => {
       await waitFor(() => {
-        expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, expect.any(Object));
+        expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, mockRequestOptions);
         expect(result.current.data).toEqual(mockData);
         expect(result.current.data).toEqual(mockData);
         expect(result.current.error).toBeUndefined();
         expect(result.current.error).toBeUndefined();
         expect(result.current.loading).toBe(false);
         expect(result.current.loading).toBe(false);
@@ -370,7 +375,7 @@ describe('useLoadData', () => {
       expect(result.current.loading).toBe(true);
       expect(result.current.loading).toBe(true);
 
 
       await waitFor(() => {
       await waitFor(() => {
-        expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, expect.any(Object));
+        expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, mockRequestOptions);
         expect(result.current.data).toEqual({ productId: 1, productName: 'Hue' });
         expect(result.current.data).toEqual({ productId: 1, productName: 'Hue' });
         expect(result.current.error).toBeUndefined();
         expect(result.current.error).toBeUndefined();
         expect(result.current.loading).toBe(false);
         expect(result.current.loading).toBe(false);
@@ -396,7 +401,7 @@ describe('useLoadData', () => {
       expect(result.current.loading).toBe(true);
       expect(result.current.loading).toBe(true);
 
 
       await waitFor(() => {
       await waitFor(() => {
-        expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, expect.any(Object));
+        expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, mockRequestOptions);
         expect(result.current.data).toEqual({
         expect(result.current.data).toEqual({
           productDetails: {
           productDetails: {
             productId: 1,
             productId: 1,
@@ -427,7 +432,7 @@ describe('useLoadData', () => {
       expect(result.current.loading).toBe(true);
       expect(result.current.loading).toBe(true);
 
 
       await waitFor(() => {
       await waitFor(() => {
-        expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, expect.any(Object));
+        expect(mockGet).toHaveBeenCalledWith(mockUrl, undefined, mockRequestOptions);
         expect(result.current.data).toEqual(mockData);
         expect(result.current.data).toEqual(mockData);
         expect(result.current.error).toBeUndefined();
         expect(result.current.error).toBeUndefined();
         expect(result.current.loading).toBe(false);
         expect(result.current.loading).toBe(false);

+ 17 - 19
desktop/core/src/desktop/js/utils/hooks/useSaveData/useSaveData.test.tsx

@@ -253,7 +253,11 @@ describe('useSaveData', () => {
         HttpMethod.POST,
         HttpMethod.POST,
         mockUrl,
         mockUrl,
         'hue data',
         'hue data',
-        expect.objectContaining({ qsEncodeData: true })
+        expect.objectContaining({
+          qsEncodeData: true,
+          silenceErrors: true,
+          ignoreSuccessErrors: true
+        })
       );
       );
       expect(result.current.data).toEqual(mockData);
       expect(result.current.data).toEqual(mockData);
       expect(result.current.error).toBeUndefined();
       expect(result.current.error).toBeUndefined();
@@ -271,12 +275,10 @@ describe('useSaveData', () => {
     });
     });
 
 
     await waitFor(() => {
     await waitFor(() => {
-      expect(mockSendApiRequest).toHaveBeenCalledWith(
-        HttpMethod.POST,
-        mockUrl,
-        payload,
-        expect.objectContaining({ qsEncodeData: false })
-      );
+      expect(mockSendApiRequest).toHaveBeenCalledWith(HttpMethod.POST, mockUrl, payload, {
+        ...mockRequestOptions,
+        qsEncodeData: false
+      });
       expect(result.current.data).toEqual(mockData);
       expect(result.current.data).toEqual(mockData);
       expect(result.current.error).toBeUndefined();
       expect(result.current.error).toBeUndefined();
       expect(result.current.loading).toBe(false);
       expect(result.current.loading).toBe(false);
@@ -293,12 +295,10 @@ describe('useSaveData', () => {
     });
     });
 
 
     await waitFor(() => {
     await waitFor(() => {
-      expect(mockSendApiRequest).toHaveBeenCalledWith(
-        HttpMethod.POST,
-        mockUrl,
-        payload,
-        expect.objectContaining({ qsEncodeData: false })
-      );
+      expect(mockSendApiRequest).toHaveBeenCalledWith(HttpMethod.POST, mockUrl, payload, {
+        ...mockRequestOptions,
+        qsEncodeData: false
+      });
       expect(result.current.data).toEqual(mockData);
       expect(result.current.data).toEqual(mockData);
       expect(result.current.error).toBeUndefined();
       expect(result.current.error).toBeUndefined();
       expect(result.current.loading).toBe(false);
       expect(result.current.loading).toBe(false);
@@ -319,12 +319,10 @@ describe('useSaveData', () => {
     });
     });
 
 
     await waitFor(() => {
     await waitFor(() => {
-      expect(mockSendApiRequest).toHaveBeenCalledWith(
-        HttpMethod.POST,
-        mockUrl,
-        payload,
-        expect.objectContaining({ qsEncodeData: true })
-      );
+      expect(mockSendApiRequest).toHaveBeenCalledWith(HttpMethod.POST, mockUrl, payload, {
+        ...mockRequestOptions,
+        qsEncodeData: true
+      });
       expect(result.current.data).toEqual(mockData);
       expect(result.current.data).toEqual(mockData);
       expect(result.current.error).toBeUndefined();
       expect(result.current.error).toBeUndefined();
       expect(result.current.loading).toBe(false);
       expect(result.current.loading).toBe(false);