Fix the E2E scripts that are failing in DHS

Author: ngodugu-marklogic

marklogic-data-hub-central/ui/e2e/cypress/integration/curation/load/defaultIngestionCardView.spec.tsx

@@ -101,12 +101,15 @@ describe("Validate CRUD functionality from card view and run in a flow", () => {
     runPage.setFlowDescription(`${flowName} description`);
     loadPage.confirmationOptions("Save").click();
     cy.verifyStepAddedToFlow("Load", stepName);
+  });
+  it("Delete the step and Navigate back to load step", () => {
     runPage.deleteStep(stepName).click();
     loadPage.confirmationOptions("Yes").click();
-  });
-  it("Verify Run Load step in an Existing Flow", () => {
+    cy.waitForAsyncRequest();
     cy.waitUntil(() => toolbar.getLoadToolbarIcon()).click();
     cy.waitUntil(() => loadPage.addNewButton("card").should("be.visible"));
+  });
+  it("Verify Run Load step in an Existing Flow", () => {
     loadPage.runStep(stepName).click();
     loadPage.runStepSelectFlowConfirmation().should("be.visible");
     loadPage.selectFlowToRunIn(flowName);
@@ -179,12 +182,15 @@ describe("Validate CRUD functionality from card view and run in a flow", () => {
     cy.uploadFile("input/test-1.json");
     cy.verifyStepRunResult("success", "Ingestion", stepName);
     tiles.closeRunMessage();
+  });
+  it("Delete the step and Navigate back to load step", () => {
     runPage.deleteStep(stepName).click();
     loadPage.confirmationOptions("Yes").click();
-  });
-  it("Verify Add to Existing Flow after changing source/target format to TEXT", () => {
+    cy.waitForAsyncRequest();
     cy.waitUntil(() => toolbar.getLoadToolbarIcon()).click();
     cy.waitUntil(() => loadPage.addNewButton("card").should("be.visible"));
+  });
+  it("Verify Add to Existing Flow after changing source/target format to TEXT", () => {
     loadPage.loadView("th-large").click();
     loadPage.editStepInCardView(stepName).click();
     loadPage.selectSourceFormat("TEXT");

marklogic-data-hub-central/ui/e2e/cypress/integration/curation/load/defaultIngestionListView.spec.tsx

@@ -128,11 +128,15 @@ describe("Validate CRUD functionality from list view", () => {
     runPage.setFlowDescription(`${flowName} description`);
     loadPage.confirmationOptions("Save").click();
     cy.verifyStepAddedToFlow("Load", stepName);
+  });
+  it("Delete the step and Navigate back to load step", () => {
     runPage.deleteStep(stepName).click();
     loadPage.confirmationOptions("Yes").click();
+    cy.waitForAsyncRequest();
+    cy.waitUntil(() => toolbar.getLoadToolbarIcon()).click();
+    cy.waitUntil(() => loadPage.addNewButton("card").should("be.visible"));
   });
   it("Verify Run in an existing flow", () => {
-    cy.waitUntil(() => toolbar.getLoadToolbarIcon()).click();
     loadPage.loadView("table").click();
     loadPage.runStep(stepName).click();
     loadPage.runStepSelectFlowConfirmation().should("be.visible");

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

@@ -404,6 +404,7 @@ describe("save/manage queries scenarios, developer role", () => {
     //verifying the confirmation modal displays if no query selected and selected columns changed
     browsePage.selectEntity("Customer");
     browsePage.getSelectedEntity().should("contain", "Customer");
+    browsePage.getColumnSelectorIcon().should("be.visible");
     browsePage.getColumnSelectorIcon().click();
     browsePage.getColumnSelector().should("be.visible");
     browsePage.selectColumnSelectorProperty("status");
@@ -417,6 +418,7 @@ describe("save/manage queries scenarios, developer role", () => {
     browsePage.getSaveQueriesDropdown().should("be.visible");
     browsePage.selectQuery("reset-query");
     //changing the selecte column list should trigger modal confirmation
+    browsePage.getColumnSelectorIcon().should("be.visible");
     browsePage.getColumnSelectorIcon().click();
     browsePage.getColumnSelector().should("be.visible");
     browsePage.selectColumnSelectorProperty("status");

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

@@ -36,6 +36,8 @@ describe("Verify All Data for final/staging databases and non-entity detail page
     browsePage.getAllDataSnippetByUri("/json/customers/Cust2.json").should("contain", "ColeAdams");
   });
   it("Select query parameters for final database", () => {
+    browsePage.clearSearchText();
+    browsePage.waitForSpinnerToDisappear();
     browsePage.search("Barbi");
     browsePage.waitForSpinnerToDisappear();
     cy.waitForAsyncRequest();
@@ -154,19 +156,21 @@ describe("Verify All Data for final/staging databases and non-entity detail page
     //Verify if the pagination gets reset upon cliking on database buttons
     browsePage.clearSearchText();
     browsePage.selectEntity("All Entities");
-    browsePage.getPaginationPageSizeOptions().then(attr => {
-      attr[0].click();
+    browsePage.getTotalDocuments().then(val => {
+      browsePage.getPaginationPageSizeOptions().then(attr => {
+        attr[0].click();
+      });
+      browsePage.getPageSizeOption("10 / page").click();
+      browsePage.waitForSpinnerToDisappear();
+      browsePage.clickPaginationItem(4);
+      browsePage.waitForSpinnerToDisappear();
+      browsePage.getStagingDatabaseButton().click();
+      browsePage.waitForSpinnerToDisappear();
+      browsePage.getFinalDatabaseButton().click();
+      browsePage.waitForSpinnerToDisappear();
+      cy.contains("Showing 1-20 of "+val+" results", {timeout: 5000});
+      browsePage.getTotalDocuments().should("be.equal", val);
     });
-    browsePage.getPageSizeOption("10 / page").click();
-    browsePage.waitForSpinnerToDisappear();
-    browsePage.clickPaginationItem(4);
-    browsePage.waitForSpinnerToDisappear();
-    browsePage.getStagingDatabaseButton().click();
-    browsePage.waitForSpinnerToDisappear();
-    browsePage.getFinalDatabaseButton().click();
-    browsePage.waitForSpinnerToDisappear();
-    cy.contains("Showing 1-20 of 36 results", {timeout: 5000});
-    browsePage.getTotalDocuments().should("be.equal", 36);
   });
   it("Switch to staging database and verify the number of documents for the search string is 0", () => {
     browsePage.getStagingDatabaseButton().click();