refactor: streamline test implementations by updating imports, enhanc…

…ing element queries, and improving asynchronous handling across multiple test files

src/react/account/iamAttachment/__tests__/Attachments.test.tsx

@@ -216,7 +216,7 @@ describe('Policy Attachments', () => {
     expect(screen.getByRole('tab', { name: /roles/i })).toBeInTheDocument();
   });
 
-  it('should render the attached Users in Users Tab', async () => {
+  it.only('should render the attached Users in Users Tab', async () => {
     // S
     setupPolicyRender();
     //E

src/react/locations/__tests__/LocationEditor.test.tsx

@@ -35,11 +35,7 @@ describe('LocationEditor', () => {
   it('should display storageOptions expect hidden options', async () => {
     const {
       component: { container },
-    } = reduxRender(
-      <MemoryRouter>
-        <LocationEditor />
-      </MemoryRouter>,
-    );
+    } = reduxRender(<LocationEditor />);
 
     await waitForElementToBeRemoved(() =>
       screen.getByText('Loading location...'),
@@ -117,11 +113,7 @@ describe('LocationEditor', () => {
   });
 
   it(`test if each location display correctly`, async () => {
-    reduxRender(
-      <MemoryRouter>
-        <LocationEditor />
-      </MemoryRouter>,
-    );
+    reduxRender(<LocationEditor />);
 
     await waitForElementToBeRemoved(() =>
       screen.getByText('Loading location...'),

src/react/ui-elements/__tests__/Activity.test.tsx

@@ -1,7 +1,7 @@
 import Activity, { DEFAULT_MESSAGE } from '../Activity';
 import { List } from 'immutable';
 import { reduxMount, renderWithRouterMatch } from '../../utils/testUtil';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 
 describe('Activity', () => {
   const TEST_MESSAGE = 'This is a test message';
@@ -26,8 +26,7 @@ describe('Activity', () => {
     expect(screen.getByText(DEFAULT_MESSAGE)).toBeInTheDocument();
   });
   it('Activity should not render', () => {
-    render(<Activity />, {
-      // @ts-expect-error
+    reduxMount(<Activity />, {
       networkActivity: {
         counter: 0,
         messages: List(),

src/react/workflow/__tests__/ExpirationForm.test.tsx

@@ -7,7 +7,13 @@ import {
   TEST_API_BASE_URL,
   zenkoUITestConfig,
 } from '../../utils/testUtil';
-import { act, fireEvent, screen, waitFor } from '@testing-library/react';
+import {
+  act,
+  fireEvent,
+  screen,
+  waitFor,
+  waitForElementToBeRemoved,
+} from '@testing-library/react';
 import React from 'react';
 import ExpirationForm from '../ExpirationForm';
 import { FormProvider, useForm } from 'react-hook-form';
@@ -28,6 +34,7 @@ import {
   INSTANCE_ID,
   waitForSelectOptionToBeEnabled,
 } from '../../actions/__tests__/utils/testUtil';
+import { debug } from 'jest-preview';
 
 const instanceId = 'instanceId';
 const accountName = 'pat';
@@ -124,6 +131,12 @@ describe('ExpirationForm', () => {
     );
 
     await waitFor(() => screen.getByText(/General/i));
+
+    await waitForElementToBeRemoved(
+      () => [...screen.queryAllByText(/Loading/i)],
+      { timeout: 8000 },
+    );
+
     expect(screen.getByText(/State/i)).toBeInTheDocument();
     expect(screen.getAllByText(/Source/i)[0]).toBeInTheDocument();
     expect(screen.getByText(/Bucket Name/i)).toBeInTheDocument();

src/react/workflow/__tests__/Workflows.test.tsx

@@ -1,4 +1,8 @@
-import { screen, waitFor } from '@testing-library/react';
+import {
+  screen,
+  waitFor,
+  waitForElementToBeRemoved,
+} from '@testing-library/react';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import {
@@ -168,6 +172,11 @@ describe('Workflows', () => {
     //E
     await waitFor(() => screen.getByText(TEST_ACCOUNT));
     await waitFor(() => screen.queryAllByText(/expiration/i));
+
+    await waitForElementToBeRemoved(
+      () => [...screen.queryAllByText(/Loading/i)],
+      { timeout: 8000 },
+    );
     //V
     expect(
       screen.getByRole('checkbox', {