Skip to content

Commit ed1343b

Browse files
jmjuanesjmjuanes
authored
Merge branch 'develop' into TASK-5963
2 parents 9a5ce24 + cd2c831 commit ed1343b

20 files changed

+176
-238
lines changed

‎cypress/e2e/iva/cohort-browser-grid.cy.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ context("Cohort Browser Grid", () => {
3131

3232
// TOOLBAR
3333
context("Cohort Toolbar", () => {
34-
const toolbarComponent = "";
35-
3634
beforeEach(() => {
3735
cy.get(browserGrid)
3836
.find(`div[data-cy="toolbar"]`)
@@ -59,7 +57,6 @@ context("Cohort Browser Grid", () => {
5957
// MODAL CREATE
6058
context("Modal Create", () => {
6159
beforeEach(() => {
62-
// eslint-disable-next-line cypress/unsafe-to-chain-command
6360
cy.get(browserGrid)
6461
.find(`button[data-action="create"]`)
6562
.click();
@@ -69,44 +66,38 @@ context("Cohort Browser Grid", () => {
6966
});
7067
// 1. Open modal and render create
7168
it("should render create modal", () => {
72-
// eslint-disable-next-line cypress/unsafe-to-chain-command
7369
cy.get("@modal-create")
7470
.find("div.modal-dialog")
7571
.should("be.visible");
7672
});
7773
// 2. Render title
7874
it("should render create title", () => {
79-
// eslint-disable-next-line cypress/unsafe-to-chain-command
8075
cy.get("@modal-create")
8176
.find("h4.modal-title")
8277
.should("contain.text", "Cohort Create");
8378
});
8479
// 3. Render button clear
8580
it("should render button clear", () => {
86-
// eslint-disable-next-line cypress/unsafe-to-chain-command
8781
cy.get("@modal-create")
8882
.contains("button", "Clear")
8983
.should("be.visible");
9084
});
9185
// 4. Render button create
9286
it("should render button create", () => {
93-
// eslint-disable-next-line cypress/unsafe-to-chain-command
9487
cy.get("@modal-create")
9588
.contains("button", "Create")
9689
.should("be.visible");
9790
});
9891
// 5. Render tabs
9992
it("should render form tabs", () => {
100-
// eslint-disable-next-line cypress/unsafe-to-chain-command
10193
cy.get("@modal-create")
10294
.find("ul.nav.nav-tabs > li")
10395
.should("have.length.at.least", 1);
10496
});
10597
// 6. Render Cohort ID
10698
it("should have form field ID", () => {
107-
// eslint-disable-next-line cypress/unsafe-to-chain-command
10899
cy.get("@modal-create")
109-
.find(`data-form div.form-horizontal div.row label.col-form-label`)
100+
.find(`data-form div.form-horizontal div.row div.col-md-3`)
110101
.should("contain.text", "Cohort ID");
111102
});
112103
});

‎cypress/e2e/iva/disease-panel-browser-grid.cy.js

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ context("Disease Panel Browser Grid", () => {
3232

3333
// TOOLBAR
3434
context("Disease Panel Toolbar", () => {
35-
const toolbarComponent = "";
36-
3735
beforeEach(() => {
3836
cy.get("@container")
3937
.find("div[data-cy='toolbar']")
@@ -75,45 +73,39 @@ context("Disease Panel Browser Grid", () => {
7573
});
7674
// 2. Render title
7775
it("should render create title", () => {
78-
// eslint-disable-next-line cypress/unsafe-to-chain-command
7976
cy.get("@modal-create")
8077
.find("h4.modal-title")
8178
.should("contain.text", "Disease Panel Create");
8279
});
8380
// 3. Render button clear
8481
it("should render button clear", () => {
85-
// eslint-disable-next-line cypress/unsafe-to-chain-command
8682
cy.get("@modal-create")
8783
.contains("button", "Clear")
8884
.should("be.visible");
8985
});
9086
// 4. Render button create
9187
it("should render button create", () => {
92-
// eslint-disable-next-line cypress/unsafe-to-chain-command
9388
cy.get("@modal-create")
9489
.contains("button", "Create")
9590
.should("be.visible");
9691
});
9792
// 5. Render tabs
9893
it("should render form tabs", () => {
99-
// eslint-disable-next-line cypress/unsafe-to-chain-command
10094
cy.get("@modal-create")
10195
.find("ul.nav.nav-tabs > li")
10296
.should("have.length.greaterThan", 1);
10397
});
10498
// 6. Render Disease Panel ID
10599
it("should have form field ID", () => {
106-
// eslint-disable-next-line cypress/unsafe-to-chain-command
107100
cy.get("@modal-create")
108-
.find("data-form div.form-horizontal div.row label.col-form-label")
101+
.find("data-form div.form-horizontal div.row div.col-md-3")
109102
.should("contain.text", "Disease Panel ID");
110103
});
111104
});
112105

113106
// MODAL UPDATE
114107
context("Modal Update", () => {
115108
beforeEach(() => {
116-
// eslint-disable-next-line cypress/unsafe-to-chain-command
117109
cy.get("@container")
118110
.find("table tbody tr td button.dropdown-toggle")
119111
.first()
@@ -127,44 +119,38 @@ context("Disease Panel Browser Grid", () => {
127119
});
128120
// 1. Open modal and render update
129121
it("should render update modal", () => {
130-
// eslint-disable-next-line cypress/unsafe-to-chain-command
131122
cy.get("@modal-update")
132123
.find("div.modal-dialog")
133124
.should("be.visible");
134125
});
135126
// 2. Render title
136127
it("should render update title", () => {
137-
// eslint-disable-next-line cypress/unsafe-to-chain-command
138128
cy.get("@modal-update")
139129
.find("h4.modal-title")
140130
.should("contain.text", "Disease Panel Update");
141131
});
142132
// 3. Render button clear
143133
it("should render button clear", () => {
144-
// eslint-disable-next-line cypress/unsafe-to-chain-command
145134
cy.get("@modal-update")
146135
.contains("button", "Discard Changes")
147136
.should("be.visible");
148137
});
149138
// 4. Render button create
150139
it("should render button create", () => {
151-
// eslint-disable-next-line cypress/unsafe-to-chain-command
152140
cy.get("@modal-update")
153141
.contains("button", "Update")
154142
.should("be.visible");
155143
});
156144
// 5. Render tabs
157145
it("should render form tabs", () => {
158-
// eslint-disable-next-line cypress/unsafe-to-chain-command
159146
cy.get("@modal-update")
160147
.find("ul.nav.nav-tabs > li")
161148
.should("have.length.greaterThan", 1);
162149
});
163150
// 6. Render Sample ID
164151
it("should have form field ID equal to sample selected", () => {
165-
// eslint-disable-next-line cypress/unsafe-to-chain-command
166152
cy.get("@modal-update")
167-
.find("data-form div.row div.row label.col-form-label")
153+
.find("data-form div.row div.row div.col-md-3")
168154
.should("contain.text", "Disease Panel ID");
169155
});
170156
});

‎cypress/e2e/iva/family-browser-grid.cy.js

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ context("Family Browser Grid", () => {
3131

3232
// TOOLBAR
3333
context("Family Toolbar", () => {
34-
const toolbarComponent = "";
35-
3634
beforeEach(() => {
3735
cy.get(browserGrid)
3836
.find("div[data-cy='toolbar']")
@@ -59,7 +57,6 @@ context("Family Browser Grid", () => {
5957
// MODAL CREATE
6058
context("Modal Create", () => {
6159
beforeEach(() => {
62-
// eslint-disable-next-line cypress/unsafe-to-chain-command
6360
cy.get(browserGrid)
6461
.find("button[data-action='create']")
6562
.click();
@@ -69,52 +66,45 @@ context("Family Browser Grid", () => {
6966
});
7067
// 1. Open modal and render create
7168
it("should render create modal", () => {
72-
// eslint-disable-next-line cypress/unsafe-to-chain-command
7369
cy.get("@modal-create")
7470
.find("div.modal-dialog")
7571
.should("be.visible");
7672
});
7773
// 2. Render title
7874
it("should render create title", () => {
79-
// eslint-disable-next-line cypress/unsafe-to-chain-command
8075
cy.get("@modal-create")
8176
.find("h4.modal-title")
8277
.should("contain.text", "Family Create");
8378
});
8479
// 3. Render button clear
8580
it("should render button clear", () => {
86-
// eslint-disable-next-line cypress/unsafe-to-chain-command
8781
cy.get("@modal-create")
8882
.contains("button", "Clear")
8983
.should("be.visible");
9084
});
9185
// 4. Render button create
9286
it("should render button create", () => {
93-
// eslint-disable-next-line cypress/unsafe-to-chain-command
9487
cy.get("@modal-create")
9588
.contains("button", "Create")
9689
.should("be.visible");
9790
});
9891
// 5. Render tabs
9992
it("should render form tabs", () => {
100-
// eslint-disable-next-line cypress/unsafe-to-chain-command
10193
cy.get("@modal-create")
10294
.find("ul.nav.nav-tabs > li")
10395
.should("have.length.at.least", 1);
10496
});
10597
// 6. Render Family ID
10698
it("should have form field ID", () => {
107-
// eslint-disable-next-line cypress/unsafe-to-chain-command
10899
cy.get("@modal-create")
109-
.find("data-form div.form-horizontal div.row label.col-form-label")
100+
.find("data-form div.form-horizontal div.row div.col-md-3")
110101
.should("contain.text", "Family ID");
111102
});
112103
});
113104

114105
// MODAL UPDATE
115106
context("Modal Update", () => {
116107
beforeEach(() => {
117-
// eslint-disable-next-line cypress/unsafe-to-chain-command
118108
cy.get(browserGrid)
119109
.find("table tbody tr td button.dropdown-toggle")
120110
.first()
@@ -128,44 +118,38 @@ context("Family Browser Grid", () => {
128118
});
129119
// 1. Open modal and render update
130120
it("should render update modal", () => {
131-
// eslint-disable-next-line cypress/unsafe-to-chain-command
132121
cy.get("@modal-update")
133122
.find("div.modal-dialog")
134123
.should("be.visible");
135124
});
136125
// 2. Render title
137126
it("should render update title", () => {
138-
// eslint-disable-next-line cypress/unsafe-to-chain-command
139127
cy.get("@modal-update")
140128
.find("h4.modal-title")
141129
.should("contain.text", "Family Update");
142130
});
143131
// 3. Render button clear
144132
it("should render button clear", () => {
145-
// eslint-disable-next-line cypress/unsafe-to-chain-command
146133
cy.get("@modal-update")
147134
.contains("button", "Discard Changes")
148135
.should("be.visible");
149136
});
150137
// 4. Render button create
151138
it("should render button create", () => {
152-
// eslint-disable-next-line cypress/unsafe-to-chain-command
153139
cy.get("@modal-update")
154140
.contains("button", "Update")
155141
.should("be.visible");
156142
});
157143
// 5. Render tabs
158144
it("should render form tabs", () => {
159-
// eslint-disable-next-line cypress/unsafe-to-chain-command
160145
cy.get("@modal-update")
161146
.find("ul.nav.nav-tabs > li")
162147
.should("have.length.at.least", 1);
163148
});
164149
// 6. Render Sample ID
165150
it("should have form field ID equal to sample selected", () => {
166-
// eslint-disable-next-line cypress/unsafe-to-chain-command
167151
cy.get("@modal-update")
168-
.find("data-form div.row div.row label.col-form-label")
152+
.find("data-form div.row div.row div.col-md-3")
169153
.should("contain.text", "Family ID");
170154
});
171155
});

0 commit comments

Comments
 (0)