CYPRESS: fix announcement cypress (#16536)

* fix announcement cypress * changes as per comments * fix the cypress failure
open-metadata · Jun 5, 2024 · fcb87b5 · fcb87b5
1 parent d374e48
commit fcb87b5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/openmetadata-ui/src/main/resources/ui/cypress/common/Entities/EntityClass.ts b/openmetadata-ui/src/main/resources/ui/cypress/common/Entities/EntityClass.ts
@@ -449,10 +449,14 @@ class EntityClass {
   // Announcement
 
   createAnnouncement() {
-    createAnnouncementUtil({
-      title: 'Cypress announcement',
-      description: 'Cypress announcement description',
-    });
+    createAnnouncementUtil(
+      {
+        title: 'Cypress announcement',
+        description: 'Cypress announcement description',
+      },
+      this.entityName,
+      this.name
+    );
   }
 
   replyAnnouncement() {

diff --git a/openmetadata-ui/src/main/resources/ui/cypress/common/Utils/Annoucement.ts b/openmetadata-ui/src/main/resources/ui/cypress/common/Utils/Annoucement.ts
@@ -36,7 +36,7 @@ const announcementForm = ({ title, description, startDate, endDate }) => {
   cy.get('[id="announcement-submit"]').scrollIntoView().click();
 };
 
-export const createAnnouncement = (announcement) => {
+export const createAnnouncement = (announcement, entityName, updatedName) => {
   interceptURL(
     'GET',
     '/api/v1/feed?entityLink=*type=Announcement',
@@ -75,6 +75,15 @@ export const createAnnouncement = (announcement) => {
     announcement.title
   );
   cy.goToHomePage();
+
+  cy.get('[data-testid="announcement-container"]')
+    .find(`a[href*="${encodeURIComponent(entityName)}"]`)
+    .click();
+
+  cy.get('[data-testid="entity-header-display-name"]').should(
+    'contain',
+    `Cypress ${updatedName} updated`
+  );
 };
 
 export const deleteAnnouncement = () => {
@@ -113,10 +122,6 @@ export const replyAnnouncementUtil = () => {
   interceptURL('GET', '/api/v1/feed/*', 'allAnnouncementFeed');
   interceptURL('POST', '/api/v1/feed/*/posts', 'addAnnouncementReply');
 
-  cy.get('[data-testid="announcement-container"] [data-testid="entity-link"]')
-    .first()
-    .click();
-
   cy.get('[data-testid="announcement-card"]').click();
 
   cy.get(

diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Entity.spec.ts b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Entity.spec.ts
@@ -106,6 +106,10 @@ describe('Entity detail page', { tags: 'DataAssets' }, () => {
         entity.removeGlossary();
       });
 
+      it(`Update displayName`, () => {
+        entity.renameEntity();
+      });
+
       it(`Announcement create & delete`, () => {
         entity.createAnnouncement();
         entity.replyAnnouncement();
@@ -145,10 +149,6 @@ describe('Entity detail page', { tags: 'DataAssets' }, () => {
         });
       }
 
-      it(`Update displayName`, () => {
-        entity.renameEntity();
-      });
-
       it(`follow unfollow entity`, () => {
         entity.followUnfollowEntity();
       });