Skip to content

Commit

Permalink
DHFPROD-10009: Fix intermittent failures on nightly
Browse files Browse the repository at this point in the history
  • Loading branch information
[email protected] authored and MarkLogic Builder committed Mar 16, 2023
1 parent f5f95a6 commit d47b00e
Show file tree
Hide file tree
Showing 16 changed files with 123 additions and 99 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1505,7 +1505,7 @@ pipeline{
}
}
}
stage('10.0-9-cypress-linux-setup-mac-chrome'){
/*stage('10.0-9-cypress-linux-setup-mac-chrome'){
agent {label 'dhfLinuxAgent'}
steps{
script{
Expand All @@ -1522,7 +1522,7 @@ pipeline{
}
}
}
}
}*/
stage('cypress-win-chrome'){
agent { label 'w10-dhf-5'}
environment{
Expand Down
4 changes: 2 additions & 2 deletions marklogic-data-hub-central/ui/e2e/cypress/e2e/curation/curate/relatedEntityMapping.cy.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ describe("Mapping", () => {
propertyTable.getAddPropertyButton("Relation").scrollIntoView().should("be.visible").click();
propertyModal.newPropertyName("relatedTo");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("Related Entity").click();
propertyModal.getCascadedTypeFromDropdown("Person").click();
propertyModal.getTypeFromDropdown("Related Entity");
propertyModal.getCascadedTypeFromDropdown("Person");
propertyModal.openForeignKeyDropdown();
propertyModal.getForeignKey("id").click({force: true});
propertyModal.getSubmitButton().click();
Expand Down
2 changes: 1 addition & 1 deletion marklogic-data-hub-central/ui/e2e/cypress/e2e/login/authorization.cy.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ describe("login", () => {
.url().should("include", "/tiles");
cy.get(`#user-dropdown`).click();
cy.get("#logOut").should("be.visible");
loginPage.clickTitle();
toolbar.getLoadToolbarIcon().click({force: true});
cy.get("#logOut").should("not.be.visible");
});

Expand Down
18 changes: 9 additions & 9 deletions marklogic-data-hub-central/ui/e2e/cypress/e2e/mastering/e2eMasteringflow.cy.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,39 +116,39 @@ describe("Validate E2E Mastering Flow", () => {
propertyTable.getAddPropertyButton("Patient").should("be.visible").click();
propertyModal.newPropertyName("FirstName");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("string").click();
propertyModal.getTypeFromDropdown("string");
propertyModal.getSubmitButton().click();
propertyTable.getAddPropertyButton("Patient").should("be.visible").click();
propertyModal.newPropertyName("LastName");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("string").click();
propertyModal.getTypeFromDropdown("string");
propertyModal.getSubmitButton().click();
propertyTable.getAddPropertyButton("Patient").should("be.visible").click();
propertyModal.newPropertyName("SSN");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("string").click();
propertyModal.getTypeFromDropdown("string");
propertyModal.getSubmitButton().click();
propertyTable.getAddPropertyButton("Patient").should("be.visible").click();
propertyModal.newPropertyName("ZipCode");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("string").click();
propertyModal.getTypeFromDropdown("string");
propertyModal.getSubmitButton().click();
propertyTable.getAddPropertyButton("Patient").should("be.visible").click();
propertyModal.newPropertyName("Address");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("string").click();
propertyModal.getTypeFromDropdown("string");
propertyModal.getSubmitButton().click();
propertyTable.getAddPropertyButton("Patient").should("be.visible").click();
propertyModal.newPropertyName("DateOfBirth");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("More date types").click();
propertyModal.getCascadedTypeFromDropdown("date").click();
propertyModal.getTypeFromDropdown("More date types");
propertyModal.getCascadedTypeFromDropdown("date");
propertyModal.getSubmitButton().click();
propertyTable.getAddPropertyButton("Patient").should("be.visible").click();
propertyModal.newPropertyName("Details");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("Structured").click();
propertyModal.getCascadedTypeFromDropdown("New Property Type").click();
propertyModal.getTypeFromDropdown("Structured");
propertyModal.getCascadedTypeFromDropdown("New Property Type");
structuredTypeModal.newName("DetailsProperty");
structuredTypeModal.getAddButton().click();
propertyModal.getSubmitButton().click();
Expand Down
39 changes: 33 additions & 6 deletions marklogic-data-hub-central/ui/e2e/cypress/e2e/modeling/entitySettings.cy.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import graphExploreSidePanel from "../../support/components/explore/graph-explor
import dataModelDisplaySettingsModal from "../../support/components/explore/data-model-display-settings-modal";
import explorePage from "../../support/pages/explore";

const defaultSelectLabel = "Select...";
const defaultSelectProperty = "Select property";
//const defaultSelectLabel = "Select...";
//const defaultSelectProperty = "Select property";
const defaultEntityTypeData = {
name: BaseEntityTypes.BABYREGISTRY,
properties: {
Expand Down Expand Up @@ -77,28 +77,55 @@ describe("Entity display settings in model tile", () => {
graphViewSidePanel.getEntityDescription().should("be.visible");

cy.log("**Verify no label are selected, select new one and check the selection**");
graphViewSidePanel.getEntityLabelDropdown(defaultEntityTypeData.name).should("have.text", defaultSelectLabel);
//ToDo: Should move it to RTL test
//graphViewSidePanel.getEntityLabelDropdown(defaultEntityTypeData.name).should("have.text", defaultSelectLabel);
graphViewSidePanel.getEntityLabelDropdown(defaultEntityTypeData.name).then(($ele) => {
let text = $ele.text();
if (text === defaultEntityTypeData.properties.ownedBy) {
graphViewSidePanel.getEntityLabelDropdown(defaultEntityTypeData.name).click();
graphViewSidePanel.getEntityLabelDropdownOption(defaultEntityTypeData.name, defaultEntityTypeData.properties.babyRegistryId).click();
graphViewSidePanel.getEntityLabelDropdown(defaultEntityTypeData.name).should("contain.text", defaultEntityTypeData.properties.babyRegistryId);
}
});
graphViewSidePanel.getEntityLabelDropdown(defaultEntityTypeData.name).click();
graphViewSidePanel.getEntityLabelDropdownOption(defaultEntityTypeData.name, defaultEntityTypeData.properties.ownedBy).click();
graphViewSidePanel.getEntityLabelDropdownOption(defaultEntityTypeData.name, defaultEntityTypeData.properties.ownedBy).click({force: true});
graphViewSidePanel.getEntityLabelDropdown(defaultEntityTypeData.name).should("contain.text", defaultEntityTypeData.properties.ownedBy);

cy.log("**Verify no propertiesOnHover are selected, select new one and check the selection**");
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).should("contain.text", defaultSelectProperty);
//ToDo: Should move it to RTL test
//graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).should("contain.text", defaultSelectProperty);
cy.get("body").then((body) => {
if (body.find(".rc-tree-select-selection-item-remove-icon").length > 0) {
dataModelDisplaySettingsModal.getDropdownCloseOption().each(($button) => {
cy.wrap($button).click();
});
}
});
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).click();
graphViewSidePanel.getPropertiesOnHoverDropdownOption(defaultEntityTypeData.properties.babyRegistryId).click({force: true});
graphViewSidePanel.getPropertiesOnHoverDropdownOption(defaultEntityTypeData.properties.babyRegistryId).should("be.visible").click({force: true});
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).click();
graphViewSidePanel.getPropertiesOnHoverDropdownOption(defaultEntityTypeData.properties.arrivalDate).click({force: true});
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).click();
graphViewSidePanel.getPropertiesOnHoverDropdownOption(defaultEntityTypeData.properties.ownedBy).click({force: true});
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).should("contain.text", defaultEntityTypeData.properties.babyRegistryId);
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).should("contain.text", defaultEntityTypeData.properties.arrivalDate);
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).should("contain.text", defaultEntityTypeData.properties.ownedBy);
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).click();
cy.wait(3000);

cy.log("**Close model tile and go to explore**");
homePage.getTileCloseButton().click();
cy.waitForAsyncRequest();
homePage.getExploreCard().click();
cy.waitForAsyncRequest();
browsePage.waitForSpinnerToDisappear();
browsePage.getClearAllFacetsButton().then(($ele) => {
if ($ele.is(":enabled")) {
cy.log("**clear all facets**");
browsePage.getClearAllFacetsButton().click();
browsePage.waitForSpinnerToDisappear();
}
});
});
it("Click on babyRegistry node and verify that properties on hover show up in the tooltip", () => {
graphExplore.getGraphVisCanvas().should("exist");
Expand Down
16 changes: 8 additions & 8 deletions marklogic-data-hub-central/ui/e2e/cypress/e2e/modeling/graphValidations.cy.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ describe("Graph Validations", () => {
propertyTable.getAddPropertyButton("a-Test2").scrollIntoView().click();
propertyModal.addTextInput("hc-input-component", "id-test2");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("string").click();
propertyModal.getTypeFromDropdown("string");
propertyModal.getSubmitButton().click();

cy.log("**Creating new entity Test1 in table view**");
Expand All @@ -240,15 +240,15 @@ describe("Graph Validations", () => {
propertyTable.getAddPropertyButton("a-Test1").scrollIntoView().click();
propertyModal.addTextInput("hc-input-component", "id");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("string").click();
propertyModal.getTypeFromDropdown("string");
propertyModal.getSubmitButton().click();

cy.log("**Creating relation**");
propertyTable.getAddPropertyButton("a-Test1").scrollIntoView().click();
propertyModal.addTextInput("hc-input-component", "relTest1-Test2");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("Related Entity").click();
propertyModal.getCascadedTypeFromDropdown("a-Test2").click();
propertyModal.getTypeFromDropdown("Related Entity");
propertyModal.getCascadedTypeFromDropdown("a-Test2");
propertyModal.getForeignKeySelectWrapper().click();
propertyModal.getForeignKey("id-test2").click();
propertyModal.getSubmitButton().click();
Expand Down Expand Up @@ -320,23 +320,23 @@ describe("Graph Validations", () => {

it("Deleting relation, entities and publish", () => {
cy.log("**Sort table by entities Name**");
cy.get("[data-testid='entityName']").scrollIntoView().should("be.visible").click();
cy.get("[data-testid='entityName']").scrollIntoView().should("be.visible").click({force: true});
entityTypeTable.getExpandEntityIcon("a-Test1");

cy.log("**Deletes rel-Test1-Test2 relationship**");
propertyModal.getDeleteIcon("a-Test1-rel-Test1-Test2").should("exist").scrollIntoView().should("be.visible").click();
propertyModal.getDeleteIcon("a-Test1-rel-Test1-Test2").should("exist").scrollIntoView().should("be.visible").click({force: true});
propertyModal.confirmDeleteProperty("deletePropertyWarn-yes");
cy.waitForAsyncRequest();
propertyModal.getDeleteIcon("a-Test1-rel-Test1-Test2").should("not.exist");

cy.log("**Deletes a-Test2 Entity**");
propertyTable.getEntityToDelete("a-Test2-trash-icon").should("exist").scrollIntoView().should("be.visible").click();
propertyTable.getEntityToDelete("a-Test2-trash-icon").should("exist").scrollIntoView().should("be.visible").click({force: true});
propertyModal.confirmDeleteProperty("deleteEntity-yes");
cy.waitForAsyncRequest();
propertyTable.getEntityToDelete("a-Test2-trash-icon").should("not.exist");

cy.log("**Deletes a-Test1 Entity**");
propertyTable.getEntityToDelete("a-Test1-trash-icon").should("exist").scrollIntoView().should("be.visible").click();
propertyTable.getEntityToDelete("a-Test1-trash-icon").should("exist").scrollIntoView().should("be.visible").click({force: true});
propertyModal.confirmDeleteProperty("deleteEntity-yes");
cy.waitForAsyncRequest();
propertyTable.getEntityToDelete("a-Test1-trash-icon").should("not.exist");
Expand Down
3 changes: 2 additions & 1 deletion marklogic-data-hub-central/ui/e2e/cypress/e2e/modeling/verifyConceptClassesInModeling.cy.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,10 @@ describe("Concept classes in Modeling screen", () => {
it("Create/Edit and verify new concept class from Table view", {defaultCommandTimeout: 120000}, () => {
cy.log("Add new concept class from table view");
toolbar.getModelToolbarIcon().should("be.visible").click();
cy.waitForAsyncRequest();
modelPage.selectView("table");
entityTypeTable.waitForTableToLoad();
modelPage.getAddButton().should("be.visible").click();
modelPage.getAddButton().should("be.visible").click({force: true});
modelPage.getAddConceptClassOption().should("be.visible").click({force: true});
conceptClassModal.newConceptClassName("TestConcept");
conceptClassModal.newConceptClassDescription("Test description.");
Expand Down
26 changes: 13 additions & 13 deletions marklogic-data-hub-central/ui/e2e/cypress/e2e/modeling/writerScenario1.cy.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
it("Add a Multiple Value property", () => {
propertyModal.newPropertyName("user");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("Related Entity").click();
propertyModal.getCascadedTypeFromDropdown("Person").click();
propertyModal.getTypeFromDropdown("Related Entity");
propertyModal.getCascadedTypeFromDropdown("Person");
propertyModal.openForeignKeyDropdown();
propertyModal.getForeignKey("id").click();
propertyModal.getYesRadio("multiple").click();
Expand All @@ -84,8 +84,8 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
propertyTable.getAddPropertyButton("Buyer").should("be.visible").click();
propertyModal.newPropertyName("personNoKey");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("Related Entity").click();
propertyModal.getCascadedTypeFromDropdown("Person").click();
propertyModal.getTypeFromDropdown("Related Entity");
propertyModal.getCascadedTypeFromDropdown("Person");
propertyModal.getSubmitButton().click();
propertyTable.verifyRelationshipIcon("personNoKey").should("exist");
});
Expand Down Expand Up @@ -116,8 +116,8 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
propertyModal.clearPropertyName();
propertyModal.newPropertyName("newId");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("More string types").click();
propertyModal.getCascadedTypeFromDropdown("iri").click();
propertyModal.getTypeFromDropdown("More string types");
propertyModal.getCascadedTypeFromDropdown("iri");
propertyModal.getYesRadio("identifier").click();
propertyModal.getYesRadio("multiple").click();
propertyModal.getNoRadio("pii").click();
Expand All @@ -131,7 +131,7 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
propertyTable.getAddPropertyButton("Buyer").click();
propertyModal.newPropertyName("buyer-id");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("string").click();
propertyModal.getTypeFromDropdown("string");
propertyModal.getYesRadio("identifier").click();
confirmationModal.getIdentifierText().should("be.visible");
confirmationModal.getYesButton(ConfirmationType.Identifer);
Expand All @@ -149,8 +149,8 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
propertyModal.newPropertyName("user-id");
propertyModal.clearPropertyDropdown();
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("Related Entity").click();
propertyModal.getCascadedTypeFromDropdown("Customer").click();
propertyModal.getTypeFromDropdown("Related Entity");
propertyModal.getCascadedTypeFromDropdown("Customer");
propertyModal.openForeignKeyDropdown();
propertyModal.getForeignKey("customerId").click();
propertyModal.getYesRadio("idenifier").should("not.exist");
Expand Down Expand Up @@ -226,7 +226,7 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
propertyTable.getAddPropertyButton("Order").click();
propertyModal.newPropertyName("orderID");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("string").should("be.visible").click();
propertyModal.getTypeFromDropdown("string");
propertyModal.getNoRadio("identifier").click();
propertyModal.getYesRadio("pii").click();
//propertyModal.clickCheckbox('wildcard');
Expand All @@ -249,8 +249,8 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
propertyTable.getAddPropertyButton("Buyer").click();
propertyModal.newPropertyName("relProp");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("Related Entity").click();
propertyModal.getCascadedTypeFromDropdown("Order").click();
propertyModal.getTypeFromDropdown("Related Entity");
propertyModal.getCascadedTypeFromDropdown("Order");
propertyModal.openForeignKeyDropdown();
propertyModal.checkForeignKeyDropdownLength(7); // Check for -None- (1), saved (5), unsaved (1) Order properties
propertyModal.openForeignKeyDropdown();
Expand All @@ -263,7 +263,7 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
propertyModal.clearPropertyName();
propertyModal.newPropertyName("newID");
propertyModal.openPropertyDropdown();
propertyModal.getTypeFromDropdown("string").click();
propertyModal.getTypeFromDropdown("string");
propertyModal.getNoRadio("identifier").click();
propertyModal.getYesRadio("multiple").click();
propertyModal.getYesRadio("pii").click();
Expand Down
Loading

0 comments on commit d47b00e

Please sign in to comment.