From e0a436137610f0094de121674faf604fa2048a4f Mon Sep 17 00:00:00 2001
From: Shailesh Parmar <shailesh.parmar.webdev@gmail.com>
Date: Wed, 10 May 2023 18:29:52 +0530
Subject: [PATCH] cypress: worked on flaky cypress in main (#11506)

* cypress: worked on flaky cypress in main

* adding glossary remove owner failure fix

* reverting change of cypress.config
---
 .../resources/ui/cypress/common/common.js     | 19 +++++++++++--------
 .../e2e/Flow/AddAndRemoveTierAndOwner.js      |  2 ++
 .../e2e/Flow/EntityAnnouncement.spec.js       |  6 ++++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/cypress/common/common.js b/openmetadata-ui/src/main/resources/ui/cypress/common/common.js
index f51b5e5960a..0f121b1d234 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/common/common.js
+++ b/openmetadata-ui/src/main/resources/ui/cypress/common/common.js
@@ -117,6 +117,7 @@ export const handleIngestionRetry = (
     '/api/v1/services/ingestionPipelines/status',
     'getIngestionPipelineStatus'
   );
+  interceptURL('GET', '/api/v1/permissions?limit=100', 'allPermissions');
 
   // ingestions page
   let retryCount = count;
@@ -141,15 +142,17 @@ export const handleIngestionRetry = (
     testIngestionsTab();
 
     if (retryCount !== 0) {
-      verifyResponseStatusCode('@getIngestionPipelineStatus', 200);
-      verifyResponseStatusCode('@serviceDetailsPermission', 200);
-      verifyResponseStatusCode('@serviceDetails', 200);
-      verifyResponseStatusCode('@ingestionPipelines', 200);
-      verifyResponseStatusCode('@airflow', 200);
-      verifyResponseStatusCode('@pipelineStatuses', 200, {
-        responseTimeout: 50000,
+      cy.wait('@allPermissions').then(() => {
+        verifyResponseStatusCode('@getIngestionPipelineStatus', 200);
+        verifyResponseStatusCode('@serviceDetailsPermission', 200);
+        verifyResponseStatusCode('@serviceDetails', 200);
+        verifyResponseStatusCode('@ingestionPipelines', 200);
+        verifyResponseStatusCode('@airflow', 200);
+        verifyResponseStatusCode('@pipelineStatuses', 200, {
+          responseTimeout: 50000,
+        });
+        verifyResponseStatusCode('@ingestionPermissions', 200);
       });
-      verifyResponseStatusCode('@ingestionPermissions', 200);
     }
 
     retryCount++;
diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Flow/AddAndRemoveTierAndOwner.js b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Flow/AddAndRemoveTierAndOwner.js
index 33b56c787be..07d2bf37005 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Flow/AddAndRemoveTierAndOwner.js
+++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Flow/AddAndRemoveTierAndOwner.js
@@ -251,6 +251,7 @@ describe('Add and Remove Owner and Tier', () => {
       .should('be.visible')
       .click();
     verifyResponseStatusCode('@getUsers', 200);
+    cy.wait('@userProfile');
     cy.get(`[title="${OWNER}"]`).should('be.visible').click();
     verifyResponseStatusCode('@patchOwner', 200);
     cy.get('[data-testid="glossary-owner-name"]')
@@ -312,6 +313,7 @@ describe('Add and Remove Owner and Tier', () => {
       .should('be.visible')
       .click();
     verifyResponseStatusCode('@getUsers', 200);
+    cy.wait('@userProfile');
     cy.get(`[title="${OWNER}"]`).should('be.visible').click();
     verifyResponseStatusCode('@patchOwner', 200);
     cy.get('[data-testid="glossary-owner-name"]')
diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Flow/EntityAnnouncement.spec.js b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Flow/EntityAnnouncement.spec.js
index 3ecd45e5a28..11e4bf4f452 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Flow/EntityAnnouncement.spec.js
+++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Flow/EntityAnnouncement.spec.js
@@ -47,6 +47,9 @@ describe('Entity Announcement', () => {
   };
 
   const addAnnouncement = (value) => {
+    interceptURL('GET', '/api/v1/permissions/*/name/*', 'entityPermission');
+    interceptURL('GET', '/api/v1/feed/count?entityLink=*', 'entityFeed');
+    interceptURL('GET', `/api/v1/${value.entity}/name/*`, 'getEntityDetails');
     const startDate = getCurrentLocaleDate();
     const endDate = getFutureLocaleDateFromCurrentDate(5);
     visitEntityDetailsPage(value.term, value.serviceName, value.entity);
@@ -91,6 +94,9 @@ describe('Entity Announcement', () => {
 
     // reload page to get the active announcement card
     cy.reload();
+    verifyResponseStatusCode('@entityPermission', 200);
+    verifyResponseStatusCode('@getEntityDetails', 200);
+    verifyResponseStatusCode('@entityFeed', 200);
 
     // check for announcement card on entity page
     cy.get('[data-testid="announcement-card"]').should('be.visible');