From 2fceaf2cf48de72090f27783435f9144294fa9a8 Mon Sep 17 00:00:00 2001
From: QAComet <lucas@qacomet.com>
Date: Wed, 25 Oct 2023 03:04:04 -0600
Subject: [PATCH] test: fix flakiness in GH connection test case (#1383)

---
 packages/e2e-tests/fixtures/applications-modal.js         | 6 +++---
 packages/e2e-tests/tests/app-integrations/github.spec.js  | 8 ++++----
 packages/web/src/components/AddNewAppConnection/index.tsx | 7 ++++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/e2e-tests/fixtures/applications-modal.js b/packages/e2e-tests/fixtures/applications-modal.js
index 3a0d1de8..8833087f 100644
--- a/packages/e2e-tests/fixtures/applications-modal.js
+++ b/packages/e2e-tests/fixtures/applications-modal.js
@@ -13,9 +13,9 @@ export class ApplicationsModal extends BasePage {
   constructor (page) {
     super(page);
     this.modal = page.getByTestId('add-app-connection-dialog');
-    this.searchInput = page.getByTestId('search-for-app-text-field');
-    this.appListItem = page.getByTestId('app-list-item');
-    this.appLoader = page.getByTestId('search-for-app-loader');
+    this.searchInput = this.modal.getByTestId('search-for-app-text-field');
+    this.appListItem = this.modal.getByTestId('app-list-item');
+    this.appLoader = this.modal.getByTestId('search-for-app-loader');
   }
 
   /**
diff --git a/packages/e2e-tests/tests/app-integrations/github.spec.js b/packages/e2e-tests/tests/app-integrations/github.spec.js
index 8627f633..f2348862 100644
--- a/packages/e2e-tests/tests/app-integrations/github.spec.js
+++ b/packages/e2e-tests/tests/app-integrations/github.spec.js
@@ -9,7 +9,7 @@ test('Github OAuth integration', async ({ page, applicationsPage }) => {
         await page.waitForURL('/apps');
       }
       const connectionModal = await applicationsPage.openAddConnectionModal();
-      expect(connectionModal.modal).toBeVisible();
+      await expect(connectionModal.modal).toBeVisible();
       return await connectionModal.selectLink('github');
     }
   );
@@ -18,7 +18,7 @@ test('Github OAuth integration', async ({ page, applicationsPage }) => {
     'Ensure the github connection modal is visible',
     async () => {
       const connectionModal = githubConnectionPage.addConnectionModal;
-      expect(connectionModal.modal).toBeVisible();
+      await expect(connectionModal.modal).toBeVisible();
       return connectionModal;
     }
   );
@@ -35,9 +35,9 @@ test('Github OAuth integration', async ({ page, applicationsPage }) => {
   );
 
   await test.step('Ensure github popup is not a 404', async () => {
-    // expect(githubPopup).toBeVisible();
+    // await expect(githubPopup).toBeVisible();
     const title = await githubPopup.title();
-    expect(title).not.toMatch(/^Page not found/);
+    await expect(title).not.toMatch(/^Page not found/);
   });
 
   /* Skip these in CI
diff --git a/packages/web/src/components/AddNewAppConnection/index.tsx b/packages/web/src/components/AddNewAppConnection/index.tsx
index 694c80a1..35eecfa0 100644
--- a/packages/web/src/components/AddNewAppConnection/index.tsx
+++ b/packages/web/src/components/AddNewAppConnection/index.tsx
@@ -74,7 +74,12 @@ export default function AddNewAppConnection(
   }, []);
 
   return (
-    <Dialog open={true} onClose={onClose} maxWidth="sm" fullWidth>
+    <Dialog
+      open={true}
+      onClose={onClose}
+      maxWidth="sm"
+      fullWidth
+      data-test="add-app-connection-dialog">
       <DialogTitle>{formatMessage('apps.addNewAppConnection')}</DialogTitle>
 
       <Box px={3}>