From 2e52475b68a7e25eef59efcf93c233ec56950acb Mon Sep 17 00:00:00 2001 From: Shailesh Parmar Date: Tue, 14 May 2024 14:24:49 +0530 Subject: [PATCH] cypress: fixed AUT cypress failure part 2 (#16243) * cypress: fixed AUT cypress failure part 2 * fixed query cypress * reverting logs --- .../cypress/e2e/Features/QueryEntity.spec.ts | 41 +++++++++++++------ .../ui/cypress/e2e/Pages/DataInsight.spec.ts | 4 +- .../e2e/Pages/DataInsightSettings.spec.ts | 4 +- .../ui/cypress/e2e/Pages/Users.spec.ts | 8 ++-- 4 files changed, 37 insertions(+), 20 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/QueryEntity.spec.ts b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/QueryEntity.spec.ts index 3db8ca137c5..21e39184548 100644 --- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/QueryEntity.spec.ts +++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/QueryEntity.spec.ts @@ -209,16 +209,6 @@ describe('Query Entity', { tags: 'DataAssets' }, () => { }); it('Verify query filter', () => { - interceptURL( - 'GET', - '/api/v1/search/query?*index=user_search_index,team_search_index*', - 'searchOwner' - ); - interceptURL( - 'GET', - '/api/v1/search/query?*index=tag_search_index*', - 'searchTag' - ); visitEntityDetailsPage({ term: DATA.term, serviceName: DATA.serviceName, @@ -226,27 +216,52 @@ describe('Query Entity', { tags: 'DataAssets' }, () => { }); cy.get('[data-testid="table_queries"]').click(); verifyResponseStatusCode('@fetchQuery', 200); + const userName = `${user.firstName}${user.lastName}`; + interceptURL( + 'GET', + `/api/v1/search/query?*${encodeURI( + userName + )}*index=user_search_index,team_search_index*`, + 'searchUserName' + ); queryFilters({ filter: `${user.firstName}${user.lastName}`, - apiKey: '@searchOwner', + apiKey: '@searchUserName', key: 'Owner', }); + interceptURL( + 'GET', + `/api/v1/search/query?*${encodeURI( + DATA.owner + )}*index=user_search_index,team_search_index*`, + 'searchOwner' + ); cy.get('[data-testid="no-data-placeholder"]').should('be.visible'); queryFilters({ filter: DATA.owner, apiKey: '@searchOwner', key: 'Owner', }); + interceptURL( + 'GET', + '/api/v1/search/query?*None*index=tag_search_index*', + 'noneTagSearch' + ); cy.get('[data-testid="query-card"]').should('have.length.above', 0); queryFilters({ filter: 'None', - apiKey: '@searchTag', + apiKey: '@noneTagSearch', key: 'Tag', }); + interceptURL( + 'GET', + `/api/v1/search/query?*${DATA.tag}*index=tag_search_index*`, + 'personalTagSearch' + ); cy.get('[data-testid="no-data-placeholder"]').should('be.visible'); queryFilters({ filter: DATA.tag, - apiKey: '@searchTag', + apiKey: '@personalTagSearch', key: 'Tag', }); cy.get('[data-testid="query-card"]').should('have.length.above', 0); diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/DataInsight.spec.ts b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/DataInsight.spec.ts index 4cfce953727..69cb20d9f5c 100644 --- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/DataInsight.spec.ts +++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/DataInsight.spec.ts @@ -145,7 +145,7 @@ describe('Data Insight feature', { tags: 'Observability' }, () => { // Adding a manual wait to allow some time between deploying the pipeline and triggering it // eslint-disable-next-line cypress/no-unnecessary-waiting - cy.wait(1000); + cy.wait(2000); cy.get('[data-testid="run-now-button"]').click(); verifyResponseStatusCode('@triggerPipeline', 200); cy.reload(); @@ -260,7 +260,7 @@ describe('Data Insight feature', { tags: 'Observability' }, () => { cy.sidebarClick(SidebarItem.DATA_INSIGHT); verifyResponseStatusCode('@dataInsightsChart', 200); cy.get('[data-menu-id*="kpi"]').click(); - verifyResponseStatusCode('@dataInsightsChart', 200); + verifyResponseStatusCode('@getKpi', 200); KPI_DATA.map((data) => { cy.get(`[data-testid="edit-action-${data.displayName}"]`).click(); verifyResponseStatusCode('@fetchKpiByName', 200); diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/DataInsightSettings.spec.ts b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/DataInsightSettings.spec.ts index 8a3903a3be7..611d5b4db85 100644 --- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/DataInsightSettings.spec.ts +++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/DataInsightSettings.spec.ts @@ -44,7 +44,9 @@ describe( cy.get('[data-testid="cron-type"]').click(); cy.get('.rc-virtual-list [title="Day"]').click(); cy.get('[data-testid="hour-options"]').click(); - cy.get('[title="06"]').click(); + cy.get('.ant-select-dropdown [title="06"]').click(); + cy.get('[data-testid="minute-options"]').click(); + cy.get('.ant-select-dropdown [title="00"]').click(); cy.get('.ant-modal-body [data-testid="deploy-button"]').click(); verifyResponseStatusCode('@updateApplication', 200); cy.get('[data-testid="cron-string"]').should('contain', 'At 06:00 AM'); diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Users.spec.ts b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Users.spec.ts index eb9d368ae7a..6aabc91337f 100644 --- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Users.spec.ts +++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Users.spec.ts @@ -11,6 +11,7 @@ * limitations under the License. */ // eslint-disable-next-line spaced-comment +import { interceptURL, verifyResponseStatusCode } from '../../common/common'; import UsersTestClass from '../../common/Entities/UserClass'; import { visitEntityDetailsPage } from '../../common/Utils/Entity'; import { getToken } from '../../common/Utils/LocalStorage'; @@ -20,10 +21,10 @@ import { removeOwner, } from '../../common/Utils/Owner'; import { - DATA_CONSUMER_ROLE, - DATA_STEWARD_ROLE, cleanupPolicies, createRoleViaREST, + DATA_CONSUMER_ROLE, + DATA_STEWARD_ROLE, } from '../../common/Utils/Policy'; import { addUser, @@ -35,8 +36,6 @@ import { updateExpiration, visitUserListPage, } from '../../common/Utils/Users'; -import { interceptURL, verifyResponseStatusCode } from '../../common/common'; -import { EntityType, SidebarItem } from '../../constants/Entity.interface'; import { BASE_URL, DELETE_ENTITY, @@ -44,6 +43,7 @@ import { ID, uuid, } from '../../constants/constants'; +import { EntityType, SidebarItem } from '../../constants/Entity.interface'; import { GlobalSettingOptions, SETTINGS_OPTIONS_PATH,