Improve Frontend Tests

frontend/package.json

@@ -7,6 +7,7 @@
     "webpack": "webpack",
     "start": "NODE_OPTIONS=--openssl-legacy-provider node index.js",
     "test": "jest",
+    "test-coverage": "jest --coverage",
     "lint": "eslint src",
     "dbg": "node --inspect-brk node_modules/.bin/jest --runInBand --no-cache",
     "extract": "lingui extract",

frontend/src/admin/AdminPage.js

@@ -155,14 +155,14 @@ export default function AdminPage({ isLoginRequired }) {
   )
 
   let adminPanel
-  if (activeMenu === 'organizations') {
-    adminPanel = orgPanel
-  } else if (activeMenu === 'users' && data?.isUserSuperAdmin) {
+  if (activeMenu === 'users' && data?.isUserSuperAdmin) {
     adminPanel = (
       <SuperAdminUserList
         permission={data?.isUserSuperAdmin ? 'SUPER_ADMIN' : 'ADMIN'}
       />
     )
+  } else {
+    adminPanel = orgPanel
   }
 
   return (

frontend/src/admin/SuperAdminUserList.js

@@ -150,7 +150,6 @@ export function SuperAdminUserList({ permission }) {
                         onClick={() => {
                           setMutation('remove')
                           onOpen()
-                          console.log(`Removed user from org ${orgName}`)
                         }}
                         p={2}
                         m={0}
@@ -162,7 +161,6 @@ export function SuperAdminUserList({ permission }) {
                         onClick={() => {
                           setMutation('update')
                           onOpen()
-                          console.log(`Edit user in org ${orgName}`)
                         }}
                         p={2}
                         m={0}

frontend/src/admin/UserListModal.js

@@ -87,7 +87,6 @@ export function UserListModal({
             isClosable: true,
             position: 'top-left',
           })
-          console.log('Incorrect inviteUserToOrg.result typename.')
         }
       },
     },
@@ -134,7 +133,6 @@ export function UserListModal({
             isClosable: true,
             position: 'top-left',
           })
-          console.log('Incorrect updateUserRole.result typename.')
         }
       },
     })

frontend/src/admin/__tests__/AdminPage.test.js

@@ -4,7 +4,7 @@ import { I18nProvider } from '@lingui/react'
 import { setupI18n } from '@lingui/core'
 import { MockedProvider } from '@apollo/client/testing'
 import AdminPage from '../AdminPage'
-import { waitFor, render, fireEvent } from '@testing-library/react'
+import { waitFor, render } from '@testing-library/react'
 import { MemoryRouter } from 'react-router-dom'
 import { makeVar } from '@apollo/client'
 import { en } from 'make-plural/plurals'
@@ -29,8 +29,8 @@ const i18n = setupI18n({
 })
 
 describe('<AdminPage />', () => {
-  it.skip('shows a list of the users organizations', async () => {
-    const { getByText, getByLabelText } = render(
+  it('shows a list of the users organizations', async () => {
+    const { getByText } = render(
       <MockedProvider mocks={mocks()} addTypename={false}>
         <UserVarProvider
           userVar={makeVar({ jwt: null, tfaSendMethod: null, userName: null })}
@@ -49,18 +49,13 @@ describe('<AdminPage />', () => {
       </MockedProvider>,
     )
 
-    await waitFor(() => {
-      const saMenu = getByLabelText(/Menu/i)
-      fireEvent.change(saMenu, { target: { value: 'organizations' } })
-    })
-
     await waitFor(() => {
       const welcome = getByText(/Select an organization to view admin options/i)
       expect(welcome).toBeInTheDocument()
     })
   })
 
-  it.skip('displays info for admin', async () => {
+  it('displays info for admin', async () => {
     const { getByText, findByRole } = render(
       <MockedProvider mocks={mocks()} addTypename={false}>
         <UserVarProvider
@@ -97,7 +92,7 @@ describe('<AdminPage />', () => {
     })
   })
 
-  it.skip('filters organization list', async () => {
+  it('filters organization list', async () => {
     const { getByText, queryByText, findByRole } = render(
       <MockedProvider mocks={mocks()} addTypename={false}>
         <UserVarProvider

frontend/src/admin/__tests__/SuperAdminUserList.test.js

@@ -282,8 +282,8 @@ describe('<SuperAdminUserList />', () => {
         })
 
         describe('admin abilities', () => {
-          it.skip("edit user's role in org", async () => {
-            const { queryByText, getByRole } = render(
+          it("edit user's role in org", async () => {
+            const { queryByText, getByRole, queryAllByText } = render(
               <MockedProvider mocks={successMocks} cache={createCache()}>
                 <UserVarProvider
                   userVar={makeVar({
@@ -318,10 +318,10 @@ describe('<SuperAdminUserList />', () => {
               name: 'Edit Raegan.Ritchie50@yahoo.com in Kreiger - Schamberger',
             })
             fireEvent.click(editBtn)
-            await waitFor(() => expect(queryByText(/Edit User/i)))
+            await waitFor(() => expect(queryAllByText(/Edit User/i)))
           })
-          it.skip('remove user from org', async () => {
-            const { queryByText, getByRole } = render(
+          it('remove user from org', async () => {
+            const { queryByText, getByRole, queryAllByText } = render(
               <MockedProvider mocks={successMocks} cache={createCache()}>
                 <UserVarProvider
                   userVar={makeVar({
@@ -356,7 +356,7 @@ describe('<SuperAdminUserList />', () => {
               name: 'Remove Raegan.Ritchie50@yahoo.com from Kreiger - Schamberger',
             })
             fireEvent.click(removeBtn)
-            await waitFor(() => expect(queryByText(/Remove User/i)))
+            await waitFor(() => expect(queryAllByText(/Remove User/i)))
           })
         })
       })