fix tests

datalens-tech · Dec 19, 2024 · e585717 · e585717
1 parent 585a0a4
commit e585717
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 7 deletions.
diff --git a/src/shared/constants/qa/control.ts b/src/shared/constants/qa/control.ts
@@ -63,9 +63,9 @@ export const DialogGroupControlQa = {
     applyButtonCheckbox: 'apply-button-checkbox',
     resetButtonCheckbox: 'reset-button-checkbox',
     updateControlOnChangeCheckbox: 'update-controls-button-checkbox',
-    placementButton: 'selectors-placement-button',
+    extendedSettingsButton: 'extended-settings-button',
     placementControlList: 'selectors-placement-control-list',
-    placementApplyButton: 'selectors-placement-apply-button',
+    extendedSettingsApplyButton: 'selectors-extended-settings-apply-button',
     controlMenu: 'control-menu',
     removeControlButton: 'remove-control-button',
     copyControlButton: 'copy-control-button',

diff --git a/src/ui/components/DialogExtendedSettings/DialogExtendedSettings.tsx b/src/ui/components/DialogExtendedSettings/DialogExtendedSettings.tsx
@@ -314,7 +314,7 @@ const DialogExtendedSettings = ({
                 textButtonCancel={i18n('button_cancel')}
                 textButtonApply={i18n('button_save')}
                 propsButtonCancel={{view: 'flat'}}
-                propsButtonApply={{qa: DialogGroupControlQa.placementApplyButton}}
+                propsButtonApply={{qa: DialogGroupControlQa.extendedSettingsApplyButton}}
                 onClickButtonApply={handleApplyClick}
                 onClickButtonCancel={onClose}
             />

diff --git a/src/ui/components/DialogGroupControl/GroupControlSidebar/GroupControlSidebar.tsx b/src/ui/components/DialogGroupControl/GroupControlSidebar/GroupControlSidebar.tsx
@@ -165,7 +165,7 @@ export const GroupControlSidebar: React.FC<{
                     className={b('extended-settings-button')}
                     width="max"
                     onClick={handleExtendedSettingsClick}
-                    qa={DialogGroupControlQa.placementButton}
+                    qa={DialogGroupControlQa.extendedSettingsButton}
                 >
                     <Icon data={Gear} height={16} width={16} />
                     {i18n('button_extended-settings')}

diff --git a/tests/opensource-suites/dash/selectors/groupBaseActions.test.ts b/tests/opensource-suites/dash/selectors/groupBaseActions.test.ts
@@ -133,7 +133,7 @@ datalensTest.describe('Dashboards - Base actions with group selectors', () => {
             await dashboardPage.enterEditMode();
             await dashboardPage.clickFirstControlSettingsButton();
             await dashboardPage.controlActions.waitForDialog();
-            await page.locator(slct(DialogGroupControlQa.placementButton)).click();
+            await page.locator(slct(DialogGroupControlQa.extendedSettingsButton)).click();
 
             // the controls of placement prevent you from clicking on the middle of item, so
             // moveXRation is 3 (x position of click is width of item / 3)
@@ -144,7 +144,7 @@ datalensTest.describe('Dashboards - Base actions with group selectors', () => {
                 moveXRation: 3,
             });
 
-            await page.locator(slct(DialogGroupControlQa.placementApplyButton)).click();
+            await page.locator(slct(DialogGroupControlQa.extendedSettingsApplyButton)).click();
 
             await page.locator(slct(ControlQA.dialogControlApplyBtn)).click();
 

diff --git a/tests/opensource-suites/dash/selectors/groupButtonActions.test.ts b/tests/opensource-suites/dash/selectors/groupButtonActions.test.ts
@@ -52,7 +52,9 @@ datalensTest.describe('Dashboards - Action buttons in group selectors', () => {
         async ({page}: {page: Page}) => {
             const dashboardPage = new DashboardPage({page});
 
+            await page.locator(slct(DialogGroupControlQa.extendedSettingsButton)).click();
             await page.locator(slct(DialogGroupControlQa.applyButtonCheckbox)).click();
+            await page.locator(slct(DialogGroupControlQa.extendedSettingsApplyButton)).click();
 
             await page.locator(slct(ControlQA.dialogControlApplyBtn)).click();
             await dashboardPage.saveChanges();
@@ -99,7 +101,9 @@ datalensTest.describe('Dashboards - Action buttons in group selectors', () => {
         async ({page}: {page: Page}) => {
             const dashboardPage = new DashboardPage({page});
 
+            await page.locator(slct(DialogGroupControlQa.extendedSettingsButton)).click();
             await page.locator(slct(DialogGroupControlQa.resetButtonCheckbox)).click();
+            await page.locator(slct(DialogGroupControlQa.extendedSettingsApplyButton)).click();
 
             await page.locator(slct(ControlQA.dialogControlApplyBtn)).click();
             await dashboardPage.saveChanges();
@@ -162,8 +166,10 @@ datalensTest.describe('Dashboards - Action buttons in group selectors', () => {
             const dashboardPage = new DashboardPage({page});
             let stateUpdatesCount = 0;
 
+            await page.locator(slct(DialogGroupControlQa.extendedSettingsButton)).click();
             await page.locator(slct(DialogGroupControlQa.applyButtonCheckbox)).click();
             await page.locator(slct(DialogGroupControlQa.resetButtonCheckbox)).click();
+            await page.locator(slct(DialogGroupControlQa.extendedSettingsApplyButton)).click();
 
             await page.locator(slct(ControlQA.dialogControlApplyBtn)).click();
             await dashboardPage.saveChanges();

diff --git a/tests/page-objects/common/abstract/RadioGroupElementPO.ts b/tests/page-objects/common/abstract/RadioGroupElementPO.ts
@@ -2,7 +2,6 @@ import {ElementPO} from './ElementPO';
 
 export class RadioGroupElementPO extends ElementPO {
     async selectByName(name: string) {
-        await this.expectVisible();
         await this.page.locator(`${this.getSelector()} input[value="${name}"]`).click();
     }
 }
diff --git a/tests/page-objects/dashboard/ControlActions.ts b/tests/page-objects/dashboard/ControlActions.ts
@@ -161,13 +161,16 @@ class ControlActions {
         }
 
         if (options && options.buttonApply) {
+            await this.page.locator(slct(DialogGroupControlQa.extendedSettingsButton)).click();
             await this.page
                 .locator(`${slct(DialogGroupControlQa.applyButtonCheckbox)} input`)
                 .setChecked(true);
 
             await this.page
                 .locator(`${slct(DialogGroupControlQa.updateControlOnChangeCheckbox)} input`)
                 .setChecked(Boolean(options?.updateControlOnChange));
+
+            await this.page.locator(slct(DialogGroupControlQa.extendedSettingsApplyButton)).click();
         }
 
         // adding a selector to the dashboard

diff --git a/tests/page-objects/dashboard/DashboardPage.ts b/tests/page-objects/dashboard/DashboardPage.ts
@@ -988,9 +988,11 @@ class DashboardPage extends BasePage {
     async disableAutoupdateInFirstControl() {
         await this.enterEditMode();
         await this.clickFirstControlSettingsButton();
+        await this.page.locator(slct(DialogGroupControlQa.extendedSettingsButton)).click();
         await this.page
             .locator(`${slct(DialogGroupControlQa.updateControlOnChangeCheckbox)} input`)
             .setChecked(false);
+        await this.page.locator(slct(DialogGroupControlQa.extendedSettingsApplyButton)).click();
         await this.controlActions.applyControlSettings();
         await this.saveChanges();
     }