✅ Update tests that were failing

equinor · Dec 11, 2024 · 4ed0493 · 4ed0493
1 parent 28d1312
commit 4ed0493
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 59 deletions.
diff --git a/src/molecules/InfoElement/CopyText.test.tsx b/src/molecules/InfoElement/CopyText.test.tsx
@@ -1,5 +1,3 @@
-import { waitForElementToBeRemoved } from '@testing-library/dom';
-
 import CopyText from 'src/molecules/InfoElement/CopyText';
 import {
   render,
@@ -9,7 +7,12 @@ import {
 } from 'src/tests/browsertest-utils';
 
 test('Renders label on hover', async () => {
-  render(<CopyText textToCopy="Test">testing text</CopyText>);
+  render(
+    <div>
+      <CopyText textToCopy="Test">testing text</CopyText>
+      <p>other</p>
+    </div>
+  );
   const user = userEvent.setup();
 
   const wrapper = screen.getByText('testing text');
@@ -20,8 +23,8 @@ test('Renders label on hover', async () => {
   const copyText = screen.getByText(/copy/i);
   expect(copyText).toBeInTheDocument();
 
-  await user.unhover(wrapper);
-  await waitForElementToBeRemoved(() => copyText);
+  await user.hover(screen.getByText('other'));
+
   expect(screen.queryByText(/copy/i)).not.toBeInTheDocument();
 });
 

diff --git a/src/organisms/TopBar/Account/ImpersonateMenu/DeleteUser/DeleteUser.test.tsx b/src/organisms/TopBar/Account/ImpersonateMenu/DeleteUser/DeleteUser.test.tsx
@@ -56,66 +56,56 @@ test(
   { timeout: 6000 }
 );
 
-describe('Not able to delete user impersonation with activeUsers', () => {
-  beforeAll(() => {
-    worker.resetHandlers(
-      http.get('*/api/v1/Token/AmplifyPortal/*', async () => {
+test('Not able to delete user impersonation with activeUsers', async () => {
+  worker.resetHandlers(
+    http.get('*/api/v1/Token/AmplifyPortal/*', async () => {
+      await delay('real');
+      return HttpResponse.text(faker.string.nanoid());
+    }),
+    http.get('*/api/v1/ImpersonateUser/CanImpersonate', async () => {
+      await delay('real');
+      return HttpResponse.text('true');
+    }),
+    http.get('*/api/v1/ImpersonateUser/ActiveUser', async () => {
+      await delay('real');
+      return HttpResponse.json(undefined, { status: 204 });
+    }),
+    http.get(
+      '*/api/v1/ImpersonateUser/GetImpersonateUserForApp/:appName',
+      async () => {
         await delay('real');
-        return HttpResponse.text(faker.string.nanoid());
-      }),
-      http.get('*/api/v1/ImpersonateUser/CanImpersonate', async () => {
-        await delay('real');
-        return HttpResponse.text('true');
-      }),
-      http.get('*/api/v1/ImpersonateUser/ActiveUser', async () => {
-        await delay('real');
-        return HttpResponse.json(undefined, { status: 204 });
-      }),
-      http.get(
-        '*/api/v1/ImpersonateUser/GetImpersonateUserForApp/:appName',
-        async () => {
-          await delay('real');
-          const copy = structuredClone(fakeImpersonateUsers);
-          copy[0].activeUsers.push(faker.internet.username());
-          return HttpResponse.json(copy);
+        const copy = structuredClone(fakeImpersonateUsers);
+        for (const item of copy) {
+          item.activeUsers = [faker.internet.username()];
         }
-      )
-    );
-  });
-
-  afterAll(() => {
-    worker.resetHandlers();
-  });
+        return HttpResponse.json(copy);
+      }
+    )
+  );
 
-  test(
-    'Not able to delete user impersonation with activeUsers',
-    async () => {
-      renderWithProviders(<Account />);
-      const user = userEvent.setup();
-      const button = screen.getByRole('button');
+  renderWithProviders(<Account />);
+  const user = userEvent.setup();
+  const button = screen.getByRole('button');
 
-      await user.click(button);
+  await user.click(button);
 
-      const impersonateButton = await screen.findByRole('button', {
-        name: /impersonate/i,
-      });
+  const impersonateButton = await screen.findByRole('button', {
+    name: /impersonate/i,
+  });
 
-      await user.click(impersonateButton);
+  await user.click(impersonateButton);
 
-      const menuItems = await screen.findAllByTestId('impersonation-user');
-      expect(menuItems.length).toBeGreaterThan(0);
+  const menuItems = await screen.findAllByTestId('impersonation-user');
+  expect(menuItems.length).toBeGreaterThan(0);
 
-      // Click edit on the first one
-      await user.click(within(menuItems[0]).getByRole('button'));
+  // Click edit on the first one
+  await user.click(within(menuItems[0]).getByRole('button'));
 
-      await waitFor(
-        () =>
-          expect(
-            screen.getByRole('button', { name: /delete user/i })
-          ).toBeDisabled(),
-        { timeout: 3000 }
-      );
-    },
-    { concurrent: false }
+  await waitFor(
+    () =>
+      expect(
+        screen.getByRole('button', { name: /delete user/i })
+      ).toBeDisabled(),
+    { timeout: 3000 }
   );
 });
diff --git a/src/organisms/TopBar/Resources/Feedback/tests/ReportABug.test.tsx b/src/organisms/TopBar/Resources/Feedback/tests/ReportABug.test.tsx
@@ -134,6 +134,10 @@ const MOCK_SLACK_FILE_ERROR = 'slack file error';
 describe('Show expected error message when requests fail', () => {
   beforeEach(() => {
     worker.resetHandlers(
+      http.get('*/api/v1/ReleaseNotes*', async () => {
+        await delay('real');
+        return HttpResponse.json([]);
+      }),
       http.get('*/api/v1/Token/AmplifyPortal/*', async () => {
         await delay('real');
         return HttpResponse.text(faker.string.nanoid());
@@ -186,15 +190,15 @@ describe('Show expected error message when requests fail', () => {
 
     await user.click(sendButton);
 
-    expect(await screen.findAllByText(/sending/i)).toHaveLength(1);
+    expect(await screen.findAllByText(/sending/i)).toHaveLength(2);
 
     expect(
       await screen.findByText(`Posting ${image.name}`, undefined, {
         timeout: 5000,
       })
     ).toBeInTheDocument();
 
-    expect(await screen.findAllByText(/not found/i)).toHaveLength(2);
+    expect(await screen.findAllByText(/not found/i)).toHaveLength(3);
 
     await user.click(screen.getByRole('button', { name: /retry/i }));
   });