From 075b4ea6d69b4ca937c350f632058df84f94a3aa Mon Sep 17 00:00:00 2001
From: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com>
Date: Thu, 18 Sep 2025 14:59:57 +0530
Subject: [PATCH] chore(test): fix ingestion bot tests (#23439)

---
 .../playwright/e2e/Flow/IngestionBot.spec.ts  | 29 +++++++++----------
 .../resources/ui/playwright/e2e/auth.setup.ts |  4 +++
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/IngestionBot.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/IngestionBot.spec.ts
index b8c1c86cb4a..c63526e30f4 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/IngestionBot.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/IngestionBot.spec.ts
@@ -13,9 +13,8 @@
 import { test as base, expect, Page } from '@playwright/test';
 import { SidebarItem } from '../../constant/sidebar';
 import { Domain } from '../../support/domain/Domain';
-import { AdminClass } from '../../support/user/AdminClass';
 import { performAdminLogin } from '../../utils/admin';
-import { getApiContext, redirectToHomePage } from '../../utils/common';
+import { redirectToHomePage } from '../../utils/common';
 import {
   addAssetsToDomain,
   addServicesToDomain,
@@ -31,21 +30,16 @@ const test = base.extend<{
   ingestionBotPage: Page;
 }>({
   page: async ({ browser }, use) => {
-    const adminUser = new AdminClass();
-    const adminPage = await browser.newPage();
-    await adminUser.login(adminPage);
-    await use(adminPage);
-    await adminPage.close();
+    const { afterAction, page } = await performAdminLogin(browser);
+
+    await use(page);
+    await afterAction();
   },
   ingestionBotPage: async ({ browser }, use) => {
-    const admin = new AdminClass();
+    const { apiContext, afterAction } = await performAdminLogin(browser);
+
     const page = await browser.newPage();
-
-    // login with admin user
-    await admin.login(page);
-    await page.waitForURL('**/my-data');
-
-    const { apiContext } = await getApiContext(page);
+    await page.goto('/');
 
     const bot = await apiContext
       .get('/api/v1/bots/name/ingestion-bot')
@@ -55,10 +49,15 @@ const test = base.extend<{
       .then((response) => response.json());
 
     await setToken(page, tokenData.config.JWTToken);
+    await redirectToHomePage(page);
+    await page.waitForLoadState('networkidle');
+    await page.waitForSelector('loader', { state: 'hidden' });
+
+    await expect(page.getByTestId('nav-user-name')).toHaveText('ingestion-bot');
 
-    // await afterAction();
     await use(page);
     await page.close();
+    await afterAction();
   },
 });
 
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/auth.setup.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/auth.setup.ts
index 44e622bac50..77f45796345 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/auth.setup.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/auth.setup.ts
@@ -186,6 +186,10 @@ setup('authenticate all users', async ({ browser }) => {
       .storageState({ path: ownerFile, indexedDB: true });
 
     await afterAction();
+
+    if (newAdminPage) {
+      await newAdminPage.close();
+    }
   } catch (error) {
     // eslint-disable-next-line no-console
     console.error('Error during authentication setup:', error);