#172 - refactor request table (#233)

beer-garden · Nov 14, 2022 · b8d422d · b8d422d
1 parent 2ff510d
commit b8d422d
Show file tree

Hide file tree

Showing 17 changed files with 249 additions and 606 deletions.
diff --git a/src/components/Routes/Routes.test.tsx b/src/components/Routes/Routes.test.tsx
@@ -16,14 +16,9 @@ jest.mock('react-router-dom', () => ({
   useParams: jest.fn(),
 }))
 
-jest.mock('pages/JobIndex/jobIndexHelpers', () => ({
-  getFormattedTable: jest.fn(),
-}))
-
 describe('Routes', () => {
   afterAll(() => {
     jest.unmock('react-router-dom')
-    jest.unmock('pages/JobIndex/jobIndexHelpers')
     jest.clearAllMocks()
   })
 

diff --git a/src/components/SyncUserModal.test.tsx b/src/components/SyncUserModal.test.tsx
@@ -53,7 +53,7 @@ describe('SyncUser Modal', () => {
     )
     await waitFor(() => {
       expect(
-        screen.getByText('ERROR: Error: Request failed with status code 404'),
+        screen.getByText('ERROR: Failure to return gardens'),
       ).toBeInTheDocument()
     })
     mockAxios.onGet('/api/v1/gardens').reply(200, [TGarden])
@@ -71,7 +71,7 @@ describe('SyncUser Modal', () => {
     fireEvent.click(screen.getByRole('button', { name: 'Submit' }))
     await waitFor(() => {
       expect(
-        screen.getByText('ERROR: Error: Request failed with status code 404'),
+        screen.getByText('ERROR: Failure to sync users'),
       ).toBeInTheDocument()
     })
   })

diff --git a/src/components/SyncUserModal.tsx b/src/components/SyncUserModal.tsx
@@ -115,7 +115,7 @@ const SyncUserModal = ({ open, setOpen }: ModalProps) => {
       .catch((e) => {
         setAlert({
           severity: 'error',
-          message: e,
+          message: e.response.data.message || e,
           doNotAutoDismiss: true,
         })
       })
@@ -146,7 +146,7 @@ const SyncUserModal = ({ open, setOpen }: ModalProps) => {
             .catch((e) => {
               setAlert({
                 severity: 'error',
-                message: e,
+                message: e.response.data.message || e,
                 doNotAutoDismiss: true,
               })
             })