From 51ad8597474bd7a097824df0354b0b2ee0d8d314 Mon Sep 17 00:00:00 2001
From: regexowl <ksimicko@redhat.com>
Date: Tue, 10 Oct 2023 14:45:45 +0200
Subject: [PATCH] test: Improve stability of the ImagesTable tests

This should help with tests flaking on the `act()` error.
---
 .../CreateImageWizard.compliance.test.js      |  2 +-
 .../ImagesTable/ImagesTable.test.js           | 21 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/test/Components/CreateImageWizard/CreateImageWizard.compliance.test.js b/src/test/Components/CreateImageWizard/CreateImageWizard.compliance.test.js
index c7609e13..29080e48 100644
--- a/src/test/Components/CreateImageWizard/CreateImageWizard.compliance.test.js
+++ b/src/test/Components/CreateImageWizard/CreateImageWizard.compliance.test.js
@@ -129,7 +129,7 @@ describe('On Recreate', () => {
     await waitFor(() => expect(createImageButton).toBeEnabled());
 
     // check that the FSC contains a /tmp partition
-    const navigation = screen.getByRole('navigation');
+    const navigation = await screen.findByRole('navigation');
     await user.click(
       await within(navigation).findByRole('button', {
         name: /file system configuration/i,
diff --git a/src/test/Components/ImagesTable/ImagesTable.test.js b/src/test/Components/ImagesTable/ImagesTable.test.js
index e83b14b2..cb600d0f 100644
--- a/src/test/Components/ImagesTable/ImagesTable.test.js
+++ b/src/test/Components/ImagesTable/ImagesTable.test.js
@@ -123,18 +123,14 @@ describe('Images Table', () => {
       name: 'Actions',
     });
 
-    await waitFor(() => {
-      expect(actionsButton).toBeEnabled();
-    });
+    expect(actionsButton).toBeEnabled();
 
-    user.click(actionsButton);
+    await user.click(actionsButton);
     const recreateButton = await screen.findByRole('menuitem', {
       name: 'Recreate image',
     });
 
-    act(() => {
-      user.click(recreateButton);
-    });
+    await user.click(recreateButton);
 
     await waitFor(() =>
       expect(router.state.location.pathname).toBe(
@@ -157,7 +153,7 @@ describe('Images Table', () => {
     const actionsButton = await within(rows[1]).findByRole('button', {
       name: 'Actions',
     });
-    user.click(actionsButton);
+    await user.click(actionsButton);
 
     const downloadButton = await screen.findByRole('menuitem', {
       name: 'Download compose request (.json)',
@@ -165,7 +161,7 @@ describe('Images Table', () => {
 
     // No actual clicking because downloading is hard to test.
     // Instead, we just check href and download properties of the <a> element.
-    const downloadLink = within(downloadButton).getByRole('link');
+    const downloadLink = await within(downloadButton).findByRole('link');
     expect(downloadLink.download).toBe(
       'request-1579d95b-8f1d-4982-8c53-8c2afa4ab04c.json'
     );
@@ -174,8 +170,11 @@ describe('Images Table', () => {
     expect(hrefParts.length).toBe(2);
     const [header, encodedRequest] = hrefParts;
     expect(header).toBe('data:text/plain;charset=utf-8');
-    expect(encodedRequest).toBe(
-      encodeURIComponent(JSON.stringify(expectedRequest, null, '  '))
+
+    await waitFor(() =>
+      expect(encodedRequest).toBe(
+        encodeURIComponent(JSON.stringify(expectedRequest, null, '  '))
+      )
     );
   });