Skip to content

Commit cbd286a

Browse files
authored
Merge pull request #6492 from Countly/QT-323-v2
[QT-323-v2] Fix the scroll issue for Settings
2 parents d2bfc1a + 18e800a commit cbd286a

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

ui-tests/cypress/lib/dashboard/manage/configurations/configurations.js

100644100755
Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ const verifyPageElements = () => {
179179
attrText: "100"
180180
});
181181

182-
cy.scrollPageToCenter();
182+
// cy.scrollPageToCenter();
183+
cy.scrollPageSlightly();
183184

184185
cy.verifyElement({
185186
labelElement: configurationsListBoxElements({subFeature: SETTINGS.API.DATA_LIMITS.EVENT_SEGMENTATION_VALUE_LIMIT}).SELECTED_SUBFEATURE_TITLE,
@@ -244,6 +245,7 @@ const verifyPageElements = () => {
244245
attr: "aria-valuenow",
245246
attrText: "10"
246247
});
248+
cy.scrollPageSlightly();
247249

248250
cy.verifyElement({
249251
labelElement: configurationsListBoxElements({subFeature: SETTINGS.API.OTHER_API_SETTINGS.OTHER_API_SETTINGS}).SELECTED_FEATURE_GROUP_NAME,
@@ -327,7 +329,7 @@ const verifyPageElements = () => {
327329
value: "every hour"
328330
});
329331

330-
cy.scrollPageToBottom();
332+
cy.scrollPageSlightly();
331333

332334
cy.verifyElement({
333335
labelElement: configurationsListBoxElements({subFeature: SETTINGS.API.OTHER_API_SETTINGS.REQUEST_THRESHOLD}).SELECTED_SUBFEATURE_TITLE,
@@ -395,6 +397,8 @@ const verifyPageElements = () => {
395397
labelText: "Track country data",
396398
});
397399

400+
cy.scrollPageSlightly();
401+
398402
cy.verifyElement({
399403
labelElement: configurationsListBoxElements({subFeature: SETTINGS.API.OTHER_API_SETTINGS.COUNTRY_DATA}).SELECTED_SUBFEATURE_DESCRIPTION,
400404
labelText: "Enable tracking country level data in dashboard. If disabled, country information will no longer be added or updated for users.",
@@ -837,7 +841,7 @@ const verifyPageElements = () => {
837841
isChecked: true
838842
});
839843

840-
cy.scrollPageToBottom();
844+
cy.scrollPageSlightly();
841845

842846
cy.verifyElement({
843847
labelElement: configurationsListBoxElements({ subFeature: SETTINGS.SECURITY.PASSWORD_EXPIRATION }).SELECTED_SUBFEATURE_TITLE,
@@ -912,6 +916,8 @@ const verifyPageElements = () => {
912916
labelText: "If enabled, provided passwords must contain at least one special symbol (not a number or latin character)",
913917
});
914918

919+
cy.scrollPageToBottom();
920+
915921
cy.verifyElement({
916922
element: configurationsListBoxElements({ subFeature: SETTINGS.SECURITY.PASSWORD_SYMBOL }).SELECTED_SUBFEATURE_CHECKBOX,
917923
isChecked: true

ui-tests/cypress/support/commands.js

100644100755
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,18 @@ Cypress.Commands.add('checkPaceActive', () => {
206206
});
207207
});
208208

209+
Cypress.Commands.add("scrollPageSlightly", (element = '.main-view', index = 0) => {
210+
cy.get(element).eq(index).then(($el) => {
211+
const currentScroll = $el[0].scrollTop;
212+
const newScroll = currentScroll + 550;
213+
214+
cy.wrap($el).scrollTo(0, newScroll, {
215+
duration: 1000,
216+
ensureScrollable: false,
217+
});
218+
});
219+
});
220+
209221
Cypress.Commands.add("scrollPageToBottom", (element = '.main-view', index = 0) => {
210222
cy.get(element).eq(index).scrollTo('bottom', { ensureScrollable: false });
211223
});

0 commit comments

Comments
 (0)