From 3a5f6e186e01231f36ce386344bbc2ceb487dca2 Mon Sep 17 00:00:00 2001
From: Dhruv Parmar <83108871+dhruvjsx@users.noreply.github.com>
Date: Tue, 27 May 2025 14:16:51 +0530
Subject: [PATCH] Fix(ui): flaky entity test (#21387)

* fixed flaky entity test

* removed unwanted code
---
 .../main/resources/ui/playwright/e2e/Pages/Entity.spec.ts  | 2 ++
 .../src/main/resources/ui/playwright/utils/entity.ts       | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Entity.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Entity.spec.ts
index 5873f18fcf1..bcf5ccaf428 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Entity.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Entity.spec.ts
@@ -276,6 +276,8 @@ entities.forEach((EntityClass) => {
     });
 
     test(`Follow & Un-follow entity`, async ({ page }) => {
+      test.slow(true);
+
       const entityName = entity.entityResponseData?.['displayName'];
       await entity.followUnfollowEntity(page, entityName);
     });
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/entity.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/entity.ts
index dc17f351c31..3fd700b2b72 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/entity.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/entity.ts
@@ -1273,7 +1273,8 @@ export const softDeleteEntity = async (
   );
 
   await page.reload();
-
+  await page.waitForLoadState('networkidle');
+  await page.waitForSelector('[data-testid="loader"]', { state: 'detached' });
   const deletedBadge = page.locator('[data-testid="deleted-badge"]');
 
   await expect(deletedBadge).toHaveText('Deleted');
@@ -1304,7 +1305,8 @@ export const softDeleteEntity = async (
 
   await restoreEntity(page);
   await page.reload();
-
+  await page.waitForLoadState('networkidle');
+  await page.waitForSelector('[data-testid="loader"]', { state: 'detached' });
   await deletedEntityCommonChecks({
     page,
     endPoint,
@@ -1317,6 +1319,7 @@ export const hardDeleteEntity = async (
   entityName: string,
   endPoint: EntityTypeEndpoint
 ) => {
+  await clickOutside(page);
   await page.click('[data-testid="manage-button"]');
   await page.waitForSelector('[data-testid="delete-button"]');
   await page.click('[data-testid="delete-button"]');