Skip to content

Commit d47b00e

Browse files
nikhila.godugu@marklogic.comMarkLogic Builder
[email protected]
authored and
MarkLogic Builder
committed
DHFPROD-10009: Fix intermittent failures on nightly
1 parent f5f95a6 commit d47b00e

16 files changed

+123
-99
lines changed

‎Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,7 +1505,7 @@ pipeline{
15051505
}
15061506
}
15071507
}
1508-
stage('10.0-9-cypress-linux-setup-mac-chrome'){
1508+
/*stage('10.0-9-cypress-linux-setup-mac-chrome'){
15091509
agent {label 'dhfLinuxAgent'}
15101510
steps{
15111511
script{
@@ -1522,7 +1522,7 @@ pipeline{
15221522
}
15231523
}
15241524
}
1525-
}
1525+
}*/
15261526
stage('cypress-win-chrome'){
15271527
agent { label 'w10-dhf-5'}
15281528
environment{

‎marklogic-data-hub-central/ui/e2e/cypress/e2e/curation/curate/relatedEntityMapping.cy.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ describe("Mapping", () => {
4949
propertyTable.getAddPropertyButton("Relation").scrollIntoView().should("be.visible").click();
5050
propertyModal.newPropertyName("relatedTo");
5151
propertyModal.openPropertyDropdown();
52-
propertyModal.getTypeFromDropdown("Related Entity").click();
53-
propertyModal.getCascadedTypeFromDropdown("Person").click();
52+
propertyModal.getTypeFromDropdown("Related Entity");
53+
propertyModal.getCascadedTypeFromDropdown("Person");
5454
propertyModal.openForeignKeyDropdown();
5555
propertyModal.getForeignKey("id").click({force: true});
5656
propertyModal.getSubmitButton().click();

‎marklogic-data-hub-central/ui/e2e/cypress/e2e/login/authorization.cy.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ describe("login", () => {
7070
.url().should("include", "/tiles");
7171
cy.get(`#user-dropdown`).click();
7272
cy.get("#logOut").should("be.visible");
73-
loginPage.clickTitle();
73+
toolbar.getLoadToolbarIcon().click({force: true});
7474
cy.get("#logOut").should("not.be.visible");
7575
});
7676

‎marklogic-data-hub-central/ui/e2e/cypress/e2e/mastering/e2eMasteringflow.cy.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,39 +116,39 @@ describe("Validate E2E Mastering Flow", () => {
116116
propertyTable.getAddPropertyButton("Patient").should("be.visible").click();
117117
propertyModal.newPropertyName("FirstName");
118118
propertyModal.openPropertyDropdown();
119-
propertyModal.getTypeFromDropdown("string").click();
119+
propertyModal.getTypeFromDropdown("string");
120120
propertyModal.getSubmitButton().click();
121121
propertyTable.getAddPropertyButton("Patient").should("be.visible").click();
122122
propertyModal.newPropertyName("LastName");
123123
propertyModal.openPropertyDropdown();
124-
propertyModal.getTypeFromDropdown("string").click();
124+
propertyModal.getTypeFromDropdown("string");
125125
propertyModal.getSubmitButton().click();
126126
propertyTable.getAddPropertyButton("Patient").should("be.visible").click();
127127
propertyModal.newPropertyName("SSN");
128128
propertyModal.openPropertyDropdown();
129-
propertyModal.getTypeFromDropdown("string").click();
129+
propertyModal.getTypeFromDropdown("string");
130130
propertyModal.getSubmitButton().click();
131131
propertyTable.getAddPropertyButton("Patient").should("be.visible").click();
132132
propertyModal.newPropertyName("ZipCode");
133133
propertyModal.openPropertyDropdown();
134-
propertyModal.getTypeFromDropdown("string").click();
134+
propertyModal.getTypeFromDropdown("string");
135135
propertyModal.getSubmitButton().click();
136136
propertyTable.getAddPropertyButton("Patient").should("be.visible").click();
137137
propertyModal.newPropertyName("Address");
138138
propertyModal.openPropertyDropdown();
139-
propertyModal.getTypeFromDropdown("string").click();
139+
propertyModal.getTypeFromDropdown("string");
140140
propertyModal.getSubmitButton().click();
141141
propertyTable.getAddPropertyButton("Patient").should("be.visible").click();
142142
propertyModal.newPropertyName("DateOfBirth");
143143
propertyModal.openPropertyDropdown();
144-
propertyModal.getTypeFromDropdown("More date types").click();
145-
propertyModal.getCascadedTypeFromDropdown("date").click();
144+
propertyModal.getTypeFromDropdown("More date types");
145+
propertyModal.getCascadedTypeFromDropdown("date");
146146
propertyModal.getSubmitButton().click();
147147
propertyTable.getAddPropertyButton("Patient").should("be.visible").click();
148148
propertyModal.newPropertyName("Details");
149149
propertyModal.openPropertyDropdown();
150-
propertyModal.getTypeFromDropdown("Structured").click();
151-
propertyModal.getCascadedTypeFromDropdown("New Property Type").click();
150+
propertyModal.getTypeFromDropdown("Structured");
151+
propertyModal.getCascadedTypeFromDropdown("New Property Type");
152152
structuredTypeModal.newName("DetailsProperty");
153153
structuredTypeModal.getAddButton().click();
154154
propertyModal.getSubmitButton().click();

‎marklogic-data-hub-central/ui/e2e/cypress/e2e/modeling/entitySettings.cy.tsx

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import graphExploreSidePanel from "../../support/components/explore/graph-explor
1515
import dataModelDisplaySettingsModal from "../../support/components/explore/data-model-display-settings-modal";
1616
import explorePage from "../../support/pages/explore";
1717

18-
const defaultSelectLabel = "Select...";
19-
const defaultSelectProperty = "Select property";
18+
//const defaultSelectLabel = "Select...";
19+
//const defaultSelectProperty = "Select property";
2020
const defaultEntityTypeData = {
2121
name: BaseEntityTypes.BABYREGISTRY,
2222
properties: {
@@ -77,28 +77,55 @@ describe("Entity display settings in model tile", () => {
7777
graphViewSidePanel.getEntityDescription().should("be.visible");
7878

7979
cy.log("**Verify no label are selected, select new one and check the selection**");
80-
graphViewSidePanel.getEntityLabelDropdown(defaultEntityTypeData.name).should("have.text", defaultSelectLabel);
80+
//ToDo: Should move it to RTL test
81+
//graphViewSidePanel.getEntityLabelDropdown(defaultEntityTypeData.name).should("have.text", defaultSelectLabel);
82+
graphViewSidePanel.getEntityLabelDropdown(defaultEntityTypeData.name).then(($ele) => {
83+
let text = $ele.text();
84+
if (text === defaultEntityTypeData.properties.ownedBy) {
85+
graphViewSidePanel.getEntityLabelDropdown(defaultEntityTypeData.name).click();
86+
graphViewSidePanel.getEntityLabelDropdownOption(defaultEntityTypeData.name, defaultEntityTypeData.properties.babyRegistryId).click();
87+
graphViewSidePanel.getEntityLabelDropdown(defaultEntityTypeData.name).should("contain.text", defaultEntityTypeData.properties.babyRegistryId);
88+
}
89+
});
8190
graphViewSidePanel.getEntityLabelDropdown(defaultEntityTypeData.name).click();
82-
graphViewSidePanel.getEntityLabelDropdownOption(defaultEntityTypeData.name, defaultEntityTypeData.properties.ownedBy).click();
91+
graphViewSidePanel.getEntityLabelDropdownOption(defaultEntityTypeData.name, defaultEntityTypeData.properties.ownedBy).click({force: true});
8392
graphViewSidePanel.getEntityLabelDropdown(defaultEntityTypeData.name).should("contain.text", defaultEntityTypeData.properties.ownedBy);
8493

8594
cy.log("**Verify no propertiesOnHover are selected, select new one and check the selection**");
86-
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).should("contain.text", defaultSelectProperty);
95+
//ToDo: Should move it to RTL test
96+
//graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).should("contain.text", defaultSelectProperty);
97+
cy.get("body").then((body) => {
98+
if (body.find(".rc-tree-select-selection-item-remove-icon").length > 0) {
99+
dataModelDisplaySettingsModal.getDropdownCloseOption().each(($button) => {
100+
cy.wrap($button).click();
101+
});
102+
}
103+
});
87104
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).click();
88-
graphViewSidePanel.getPropertiesOnHoverDropdownOption(defaultEntityTypeData.properties.babyRegistryId).click({force: true});
105+
graphViewSidePanel.getPropertiesOnHoverDropdownOption(defaultEntityTypeData.properties.babyRegistryId).should("be.visible").click({force: true});
89106
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).click();
90107
graphViewSidePanel.getPropertiesOnHoverDropdownOption(defaultEntityTypeData.properties.arrivalDate).click({force: true});
91108
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).click();
92109
graphViewSidePanel.getPropertiesOnHoverDropdownOption(defaultEntityTypeData.properties.ownedBy).click({force: true});
93110
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).should("contain.text", defaultEntityTypeData.properties.babyRegistryId);
94111
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).should("contain.text", defaultEntityTypeData.properties.arrivalDate);
95112
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).should("contain.text", defaultEntityTypeData.properties.ownedBy);
113+
graphViewSidePanel.getPropertiesOnHoverDropdown(defaultEntityTypeData.name).click();
114+
cy.wait(3000);
96115

97116
cy.log("**Close model tile and go to explore**");
98117
homePage.getTileCloseButton().click();
118+
cy.waitForAsyncRequest();
99119
homePage.getExploreCard().click();
100120
cy.waitForAsyncRequest();
101121
browsePage.waitForSpinnerToDisappear();
122+
browsePage.getClearAllFacetsButton().then(($ele) => {
123+
if ($ele.is(":enabled")) {
124+
cy.log("**clear all facets**");
125+
browsePage.getClearAllFacetsButton().click();
126+
browsePage.waitForSpinnerToDisappear();
127+
}
128+
});
102129
});
103130
it("Click on babyRegistry node and verify that properties on hover show up in the tooltip", () => {
104131
graphExplore.getGraphVisCanvas().should("exist");

‎marklogic-data-hub-central/ui/e2e/cypress/e2e/modeling/graphValidations.cy.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ describe("Graph Validations", () => {
226226
propertyTable.getAddPropertyButton("a-Test2").scrollIntoView().click();
227227
propertyModal.addTextInput("hc-input-component", "id-test2");
228228
propertyModal.openPropertyDropdown();
229-
propertyModal.getTypeFromDropdown("string").click();
229+
propertyModal.getTypeFromDropdown("string");
230230
propertyModal.getSubmitButton().click();
231231

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

246246
cy.log("**Creating relation**");
247247
propertyTable.getAddPropertyButton("a-Test1").scrollIntoView().click();
248248
propertyModal.addTextInput("hc-input-component", "relTest1-Test2");
249249
propertyModal.openPropertyDropdown();
250-
propertyModal.getTypeFromDropdown("Related Entity").click();
251-
propertyModal.getCascadedTypeFromDropdown("a-Test2").click();
250+
propertyModal.getTypeFromDropdown("Related Entity");
251+
propertyModal.getCascadedTypeFromDropdown("a-Test2");
252252
propertyModal.getForeignKeySelectWrapper().click();
253253
propertyModal.getForeignKey("id-test2").click();
254254
propertyModal.getSubmitButton().click();
@@ -320,23 +320,23 @@ describe("Graph Validations", () => {
320320

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

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

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

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

‎marklogic-data-hub-central/ui/e2e/cypress/e2e/modeling/verifyConceptClassesInModeling.cy.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,10 @@ describe("Concept classes in Modeling screen", () => {
306306
it("Create/Edit and verify new concept class from Table view", {defaultCommandTimeout: 120000}, () => {
307307
cy.log("Add new concept class from table view");
308308
toolbar.getModelToolbarIcon().should("be.visible").click();
309+
cy.waitForAsyncRequest();
309310
modelPage.selectView("table");
310311
entityTypeTable.waitForTableToLoad();
311-
modelPage.getAddButton().should("be.visible").click();
312+
modelPage.getAddButton().should("be.visible").click({force: true});
312313
modelPage.getAddConceptClassOption().should("be.visible").click({force: true});
313314
conceptClassModal.newConceptClassName("TestConcept");
314315
conceptClassModal.newConceptClassDescription("Test description.");

‎marklogic-data-hub-central/ui/e2e/cypress/e2e/modeling/writerScenario1.cy.tsx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
7272
it("Add a Multiple Value property", () => {
7373
propertyModal.newPropertyName("user");
7474
propertyModal.openPropertyDropdown();
75-
propertyModal.getTypeFromDropdown("Related Entity").click();
76-
propertyModal.getCascadedTypeFromDropdown("Person").click();
75+
propertyModal.getTypeFromDropdown("Related Entity");
76+
propertyModal.getCascadedTypeFromDropdown("Person");
7777
propertyModal.openForeignKeyDropdown();
7878
propertyModal.getForeignKey("id").click();
7979
propertyModal.getYesRadio("multiple").click();
@@ -84,8 +84,8 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
8484
propertyTable.getAddPropertyButton("Buyer").should("be.visible").click();
8585
propertyModal.newPropertyName("personNoKey");
8686
propertyModal.openPropertyDropdown();
87-
propertyModal.getTypeFromDropdown("Related Entity").click();
88-
propertyModal.getCascadedTypeFromDropdown("Person").click();
87+
propertyModal.getTypeFromDropdown("Related Entity");
88+
propertyModal.getCascadedTypeFromDropdown("Person");
8989
propertyModal.getSubmitButton().click();
9090
propertyTable.verifyRelationshipIcon("personNoKey").should("exist");
9191
});
@@ -116,8 +116,8 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
116116
propertyModal.clearPropertyName();
117117
propertyModal.newPropertyName("newId");
118118
propertyModal.openPropertyDropdown();
119-
propertyModal.getTypeFromDropdown("More string types").click();
120-
propertyModal.getCascadedTypeFromDropdown("iri").click();
119+
propertyModal.getTypeFromDropdown("More string types");
120+
propertyModal.getCascadedTypeFromDropdown("iri");
121121
propertyModal.getYesRadio("identifier").click();
122122
propertyModal.getYesRadio("multiple").click();
123123
propertyModal.getNoRadio("pii").click();
@@ -131,7 +131,7 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
131131
propertyTable.getAddPropertyButton("Buyer").click();
132132
propertyModal.newPropertyName("buyer-id");
133133
propertyModal.openPropertyDropdown();
134-
propertyModal.getTypeFromDropdown("string").click();
134+
propertyModal.getTypeFromDropdown("string");
135135
propertyModal.getYesRadio("identifier").click();
136136
confirmationModal.getIdentifierText().should("be.visible");
137137
confirmationModal.getYesButton(ConfirmationType.Identifer);
@@ -149,8 +149,8 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
149149
propertyModal.newPropertyName("user-id");
150150
propertyModal.clearPropertyDropdown();
151151
propertyModal.openPropertyDropdown();
152-
propertyModal.getTypeFromDropdown("Related Entity").click();
153-
propertyModal.getCascadedTypeFromDropdown("Customer").click();
152+
propertyModal.getTypeFromDropdown("Related Entity");
153+
propertyModal.getCascadedTypeFromDropdown("Customer");
154154
propertyModal.openForeignKeyDropdown();
155155
propertyModal.getForeignKey("customerId").click();
156156
propertyModal.getYesRadio("idenifier").should("not.exist");
@@ -226,7 +226,7 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
226226
propertyTable.getAddPropertyButton("Order").click();
227227
propertyModal.newPropertyName("orderID");
228228
propertyModal.openPropertyDropdown();
229-
propertyModal.getTypeFromDropdown("string").should("be.visible").click();
229+
propertyModal.getTypeFromDropdown("string");
230230
propertyModal.getNoRadio("identifier").click();
231231
propertyModal.getYesRadio("pii").click();
232232
//propertyModal.clickCheckbox('wildcard');
@@ -249,8 +249,8 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
249249
propertyTable.getAddPropertyButton("Buyer").click();
250250
propertyModal.newPropertyName("relProp");
251251
propertyModal.openPropertyDropdown();
252-
propertyModal.getTypeFromDropdown("Related Entity").click();
253-
propertyModal.getCascadedTypeFromDropdown("Order").click();
252+
propertyModal.getTypeFromDropdown("Related Entity");
253+
propertyModal.getCascadedTypeFromDropdown("Order");
254254
propertyModal.openForeignKeyDropdown();
255255
propertyModal.checkForeignKeyDropdownLength(7); // Check for -None- (1), saved (5), unsaved (1) Order properties
256256
propertyModal.openForeignKeyDropdown();
@@ -263,7 +263,7 @@ describe("Entity Modeling Senario 1: Writer Role", () => {
263263
propertyModal.clearPropertyName();
264264
propertyModal.newPropertyName("newID");
265265
propertyModal.openPropertyDropdown();
266-
propertyModal.getTypeFromDropdown("string").click();
266+
propertyModal.getTypeFromDropdown("string");
267267
propertyModal.getNoRadio("identifier").click();
268268
propertyModal.getYesRadio("multiple").click();
269269
propertyModal.getYesRadio("pii").click();

0 commit comments

Comments
 (0)