DHFPROD-9663: Fix E2E tests on 11.0-Nightly-linux-On-Prem

Author: [email protected]

marklogic-data-hub-central/ui/e2e/cypress/integration/curation/curate/custom.spec.tsx

@@ -16,6 +16,8 @@ describe("Custom step settings: ", () => {
     cy.contains(Application.title);
     cy.loginAsTestUserWithRoles("hub-central-flow-writer", "hub-central-match-merge-writer", "hub-central-mapping-writer", "hub-central-load-writer", "hub-central-custom-writer").withRequest();
     LoginPage.postLogin();
+    toolbar.getCurateToolbarIcon().click();
+    curatePage.getEntityTypePanel("Customer").should("be.visible");
     //Saving Local Storage to preserve session
     cy.saveLocalStorage();
   });
@@ -30,14 +32,9 @@ describe("Custom step settings: ", () => {
     cy.saveLocalStorage();
   });
 
-  it("Navigate to Curate tile -> Customer entity -> custom tab", () => {
-    cy.waitUntil(() => toolbar.getCurateToolbarIcon()).click();
-    cy.waitUntil(() => curatePage.getEntityTypePanel("Customer").should("be.visible"));
+  it("Validate step name is disabled, changes are discarded on cancel", () => {
     curatePage.toggleEntityTypeId("Customer");
     curatePage.selectCustomTab("Customer");
-  });
-
-  it("Validate step name is disabled, changes are discarded on cancel", () => {
     curatePage.editStep(stepName).click();
     createEditStepDialog.stepNameInput().should("be.disabled");
     createEditStepDialog.stepDescriptionInput().should("be.enabled");

marklogic-data-hub-central/ui/e2e/cypress/integration/curation/curate/mappingWithInterceptorsAndCustomHook.spec.tsx

@@ -43,7 +43,7 @@ describe("Create and verify load steps, map step and flows with interceptors & c
   });
   it("Create and Edit load step", () => {
     toolbar.getLoadToolbarIcon().click();
-    cy.waitUntil(() => loadPage.stepName("ingestion-step").should("be.visible"));
+    loadPage.stepName("ingestion-step").should("be.visible");
     loadPage.addNewButton("card").click();
     loadPage.saveButton().should("be.enabled");
     loadPage.stepNameInput().type(loadStep);
@@ -104,9 +104,10 @@ describe("Create and verify load steps, map step and flows with interceptors & c
   });
   it("Create mapping step", () => {
     toolbar.getCurateToolbarIcon().click();
-    cy.waitUntil(() => curatePage.getEntityTypePanel("Customer").should("be.visible"));
+    cy.waitForAsyncRequest();
+    curatePage.getEntityTypePanel("Customer").should("be.visible");
     curatePage.toggleEntityTypeId("Order");
-    cy.waitUntil(() => curatePage.addNewStep("Order").click());
+    curatePage.addNewStep("Order").click();
     createEditMappingDialog.setMappingName(mapStep);
     createEditMappingDialog.setMappingDescription("An order mapping with custom interceptors");
     createEditMappingDialog.setSourceRadio("Query");
@@ -117,7 +118,7 @@ describe("Create and verify load steps, map step and flows with interceptors & c
     advancedSettingsDialog.setStepInterceptor("curateTile/orderDateInterceptor");
     createEditMappingDialog.saveButton().click({force: true});
     cy.waitForAsyncRequest();
-    cy.waitUntil(() => curatePage.dataPresent().should("exist"));
+    curatePage.dataPresent().should("exist");
     //verify that step details automatically opens after step creation
     curatePage.verifyStepDetailsOpen(mapStep);
     browsePage.waitForSpinnerToDisappear();
@@ -149,9 +150,9 @@ describe("Create and verify load steps, map step and flows with interceptors & c
     mappingStepDetail.setXpathExpressionInput("shipRegion", "ShipRegion");
     mappingStepDetail.setXpathExpressionInput("shippedDate", "ShippedDate");
     cy.findByTestId("shippedDate-mapexpression").blur();
-    cy.waitUntil(() => curatePage.dataPresent().should("exist"));
+    curatePage.dataPresent().should("exist");
     // Test the mappings
-    cy.waitUntil(() => mappingStepDetail.testMap().should("be.enabled"));
+    mappingStepDetail.testMap().should("be.enabled");
     mappingStepDetail.testMap().click({force: true});
     mappingStepDetail.validateMapValue("Order", "orderId", "10259");
     mappingStepDetail.validateMapValue("Order", "address", "");
@@ -170,9 +171,9 @@ describe("Create and verify load steps, map step and flows with interceptors & c
     mappingStepDetail.setEntitySearch("city");
     mappingStepDetail.validateMapValue("Order", "city", "Houston");
     mappingStepDetail.submitEntitySearch().click();
-    cy.waitUntil(() => mappingStepDetail.moreLink()).should("be.visible");
+    mappingStepDetail.moreLink().should("be.visible");
     mappingStepDetail.moreLink().click();
-    cy.waitUntil(() => mappingStepDetail.lessLink()).should("be.visible");
+    mappingStepDetail.lessLink().should("be.visible");
     mappingStepDetail.validateMapValue("Order", "city", "Houston");
     mappingStepDetail.validateMapValue("Order", "state", "100 Main Street");
     mappingStepDetail.lessLink().click();
@@ -187,7 +188,7 @@ describe("Create and verify load steps, map step and flows with interceptors & c
     curatePage.toggleEntityTypeId("Order");
     // Open step details and switch to Advanced tab in step settings
     curatePage.openStepDetails(mapStep);
-    cy.waitUntil(() => curatePage.dataPresent().should("exist"));
+    curatePage.dataPresent().should("exist");
     mappingStepDetail.testMap().click({force: true});
     mappingStepDetail.validateMapValue("Order", "orderId", "10259");
     mappingStepDetail.stepSettingsLink().click();
@@ -201,7 +202,7 @@ describe("Create and verify load steps, map step and flows with interceptors & c
     advancedSettingsDialog.saveSettings(mapStep).should("not.exist");
 
     //verify that step details page remains opens when step settings was opened from within the step details page
-    cy.waitUntil(() => curatePage.dataPresent().should("exist"));
+    curatePage.dataPresent().should("exist");
     curatePage.verifyStepDetailsOpen(mapStep);
     cy.wait(2000);
   });
@@ -233,7 +234,7 @@ describe("Create and verify load steps, map step and flows with interceptors & c
     advancedSettingsDialog.saveSettings(mapStep).click();
     advancedSettingsDialog.saveSettings(mapStep).should("not.exist");
     //Step source data is present now.
-    cy.waitUntil(() => curatePage.dataPresent().should("exist"));
+    curatePage.dataPresent().should("exist");
     curatePage.verifyStepDetailsOpen(mapStep);
 
     mappingStepDetail.entitySettingsLink().scrollIntoView().should("be.visible").click({force: true});

marklogic-data-hub-central/ui/e2e/cypress/integration/curation/curate/relatedEntityMapping.spec.tsx

@@ -49,10 +49,10 @@ describe("Mapping", () => {
     cy.waitForAsyncRequest();
   });
   it("Define new entity, add relationship property", {defaultCommandTimeout: 120000}, () => {
-    cy.waitUntil(() => toolbar.getModelToolbarIcon()).click();
+    toolbar.getModelToolbarIcon().should("be.visible").click();
     modelPage.selectView("table");
     entityTypeTable.waitForTableToLoad();
-    cy.waitUntil(() => modelPage.getAddButton()).click({force: true});
+    modelPage.getAddButton().should("be.visible").click({force: true});
     modelPage.getAddEntityTypeOption().should("be.visible").click({force: true});
     entityTypeModal.newEntityName("Relation");
     entityTypeModal.getAddButton().click();
@@ -89,18 +89,18 @@ describe("Mapping", () => {
     cy.contains("This functionality is not implemented yet.").should("not.exist");
   });
   it("Create new mapping in Curate", {defaultCommandTimeout: 120000}, () => {
-    cy.waitUntil(() => toolbar.getCurateToolbarIcon()).click();
-    cy.waitUntil(() => curatePage.getEntityTypePanel("Person")).should("be.visible");
+    toolbar.getCurateToolbarIcon().should("be.visible").click();
+    curatePage.getEntityTypePanel("Person").should("be.visible");
     curatePage.getEntityTypePanel("Person").should("exist");
     curatePage.toggleEntityTypeId("Person");
-    cy.waitUntil(() => curatePage.addNewStep("Person")).click();
+    curatePage.addNewStep("Person").should("be.visible").click();
     createEditMappingDialog.setMappingName("mapRelation");
     createEditMappingDialog.setSourceRadio("Query");
     createEditMappingDialog.setQueryInput(`cts.collectionQuery(['loadPersonJSON'])`);
     createEditMappingDialog.saveButton().click({force: true});
     curatePage.verifyStepDetailsOpen("mapRelation");
     browsePage.waitForSpinnerToDisappear();
-    cy.waitUntil(() => mappingStepDetail.dataAvailable()).should("be.visible");
+    mappingStepDetail.dataAvailable().should("be.visible");
     mappingStepDetail.entityTitle("Person").should("exist");
   });
   it("Verify related entities in mapping details with defaults", {defaultCommandTimeout: 120000}, () => {
@@ -135,7 +135,7 @@ describe("Mapping", () => {
     mappingStepDetail.successMessage().should("exist");
     mappingStepDetail.successMessage().should("not.exist");
     cy.log("**Test expresssions**");
-    cy.waitUntil(() => mappingStepDetail.testMap()).should("be.enabled");
+    mappingStepDetail.testMap().should("be.enabled");
     mappingStepDetail.testMap().click({force: true});
     cy.waitForAsyncRequest();
     mappingStepDetail.validateMapValue("Person", "id", "444-44-4440");
@@ -225,7 +225,7 @@ describe("Mapping", () => {
   });
 
   it("Create new flow, add mapping to flow, run mapping, verify results", () => {
-    cy.waitUntil(() => toolbar.getRunToolbarIcon()).click();
+    toolbar.getRunToolbarIcon().should("be.visible").click();
     runPage.createFlowButton().click();
     runPage.newFlowModal().should("be.visible");
     runPage.setFlowName("relationFlow");
@@ -275,17 +275,17 @@ describe("Mapping", () => {
     mappingStepDetail.getValidationError("Person").should("exist");
     mappingStepDetail.editTargetPermissions("Person", "data-hub-common,read,data-hub-common,update");
     mappingStepDetail.getValidationError("Person").should("not.have.text");
-    cy.waitUntil(() => mappingStepDetail.getSaveSettings("Person")).click({force: true});
+    mappingStepDetail.getSaveSettings("Person").should("be.visible").click({force: true});
 
     mappingStepDetail.getEntitySettings("Relation").scrollIntoView().click();
     mappingStepDetail.editTargetPermissions("Relation", "data-hub-common,read,data-hub-common");
-    cy.waitUntil(() => mappingStepDetail.getSaveSettings("Relation")).click({force: true});
+    mappingStepDetail.getSaveSettings("Relation").should("be.visible").click({force: true});
     mappingStepDetail.getValidationError("Relation").should("exist");
     mappingStepDetail.editTargetPermissions("Relation", "data-hub-common,read");
-    cy.waitUntil(() => mappingStepDetail.getSaveSettings("Relation")).click({force: true});
+    mappingStepDetail.getSaveSettings("Relation").should("be.visible").click({force: true});
     mappingStepDetail.getValidationError("Relation").should("not.have.text");
     mappingStepDetail.editTargetPermissions("Relation", "data-hub-common,read,data-hub-common,update");
-    cy.waitUntil(() => mappingStepDetail.getSaveSettings("Relation")).click({force: true});
+    mappingStepDetail.getSaveSettings("Relation").should("be.visible").click({force: true});
     browsePage.waitForSpinnerToDisappear();
   });
   it("Delete related entity from mapping via filter", () => {
@@ -303,7 +303,7 @@ describe("Mapping", () => {
     curatePage.openMappingStepDetail("Person", "mapRelation");
     curatePage.verifyStepDetailsOpen("mapRelation");
     browsePage.waitForSpinnerToDisappear();
-    cy.waitUntil(() => mappingStepDetail.relatedFilterSelection("Person", "Relation (relatedTo Person)")).should("exist");
+    mappingStepDetail.relatedFilterSelection("Person", "Relation (relatedTo Person)").should("exist");
 
     // Related entity exists before deletion
     cy.log("**Validate related entity exists before deletion**");
@@ -329,7 +329,7 @@ describe("Mapping", () => {
   });
   it("Reopen step and verify the deleted related entity is no longer there", () => {
     mappingStepDetail.goBackToCurateHomePage();
-    cy.waitUntil(() => curatePage.getEntityTypePanel("Person")).should("be.visible");
+    curatePage.getEntityTypePanel("Person").should("be.visible");
     //curatePage.toggleEntityTypeId("Person");
     curatePage.openMappingStepDetail("Person", "mapRelation");
     curatePage.verifyStepDetailsOpen("mapRelation");

marklogic-data-hub-central/ui/e2e/cypress/integration/explore/crudQueriesFromManageQueries.spec.tsx

@@ -40,7 +40,6 @@ describe("manage queries modal scenarios, developer role", () => {
     browsePage.waitForHCTableToLoad();
     entitiesSidebar.openBaseEntityDropdown();
     entitiesSidebar.selectBaseEntityOption("Customer");
-    entitiesSidebar.getBaseEntityOption("Customer").should("be.visible");
     entitiesSidebar.openBaseEntityFacets("Customer");
     browsePage.getFacetItemCheckbox("name", "Adams Cole").click();
     browsePage.getSelectedFacets().should("exist");
@@ -99,8 +98,7 @@ describe("manage queries modal scenarios, developer role", () => {
     entitiesSidebar.removeSelectedBaseEntity();
     entitiesSidebar.openBaseEntityDropdown();
     entitiesSidebar.selectBaseEntityOption("Person");
-    entitiesSidebar.getBaseEntityOption("Person").should("be.visible");
-    cy.waitUntil(() => browsePage.getDetailInstanceViewIcon("/json/persons/last-name-dob-custom1.json"), {timeout: 10000}).click({force: true});
+    browsePage.getDetailInstanceViewIcon("/json/persons/last-name-dob-custom1.json").should("be.visible", {timeout: 10000}).click({force: true});
     browsePage.waitForSpinnerToDisappear();
   });
   it("Navigate to detail page and verify if manage query modal opens up.", () => {
@@ -158,10 +156,8 @@ describe("manage queries modal scenarios, developer role", () => {
     browsePage.waitForHCTableToLoad();
     entitiesSidebar.openBaseEntityDropdown();
     entitiesSidebar.selectBaseEntityOption("All Entities");
-    entitiesSidebar.getBaseEntityOption("All Entities").should("be.visible");
     entitiesSidebar.openBaseEntityDropdown();
     entitiesSidebar.selectBaseEntityOption("Person");
-    entitiesSidebar.getBaseEntityOption("Person").should("be.visible");
     entitiesSidebar.openBaseEntityFacets("Person");
     browsePage.getShowMoreLink("fname").should("be.visible").click();
     browsePage.getFacetItemCheckbox("fname", "Alice").click();
@@ -211,7 +207,6 @@ describe("manage queries modal scenarios, developer role", () => {
     //create a query first
     entitiesSidebar.openBaseEntityDropdown();
     entitiesSidebar.selectBaseEntityOption("Person");
-    entitiesSidebar.getBaseEntityOption("Person").should("be.visible");
     entitiesSidebar.openBaseEntityFacets("Person");
     browsePage.getShowMoreLink("fname").should("be.visible").click();
     browsePage.getFacetItemCheckbox("fname", "Alice").click();
@@ -256,7 +251,6 @@ describe("manage queries modal scenarios, developer role", () => {
     entitiesSidebar.toggleEntitiesView();
     entitiesSidebar.openBaseEntityDropdown();
     entitiesSidebar.selectBaseEntityOption("Person");
-    entitiesSidebar.getBaseEntityOption("Person").should("be.visible");
     //create a query
     entitiesSidebar.openBaseEntityFacets("Person");
     browsePage.getShowMoreLink("fname").should("be.visible").click();
@@ -278,7 +272,6 @@ describe("manage queries modal scenarios, developer role", () => {
     browsePage.getClearAllFacetsButton().click();
     entitiesSidebar.openBaseEntityDropdown();
     entitiesSidebar.selectBaseEntityOption("Customer");
-    entitiesSidebar.getBaseEntityOption("Customer").should("be.visible");
     cy.get("#instance").first().click({force: true});
     cy.waitForAsyncRequest();
     browsePage.waitForSpinnerToDisappear();