From 1ad9ceb25654b9d009eb55d7570ee406c9483e93 Mon Sep 17 00:00:00 2001 From: nsubbot Date: Wed, 4 Feb 2026 15:06:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=20=D0=BB=D0=BE=D0=BA=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D1=8B=20data-testid=20=D0=B4=D0=BB=D1=8F=20=D1=8D?= =?UTF-8?q?=D0=BB=D0=B5=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D0=B2=D0=BA?= =?UTF-8?q?=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8=20'=D0=9D=D0=B0=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=B9=D0=BA=D0=B8/=D0=9E=D0=B1=D1=81=D0=BB=D1=83?= =?UTF-8?q?=D0=B6=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA=D0=B0/?= =?UTF-8?q?=D0=A1=D0=B5=D0=B0=D0=BD=D1=81=D1=8B/=D0=9D=D0=B0=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=B9=D0=BA=D0=B8'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/session_settings_tab.py | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pages/session_settings_tab.py b/pages/session_settings_tab.py index fbecd7c..e25cc9b 100644 --- a/pages/session_settings_tab.py +++ b/pages/session_settings_tab.py @@ -27,17 +27,18 @@ class SessionSettingsTab(BasePage): super().__init__(page) - locator_button_1 = self.page.get_by_role("navigation").filter( - has_text=re.compile("Настройки") - ).get_by_role("button").nth(0) - locator_button_2 = self.page.get_by_role("navigation").filter( - has_text=re.compile("Настройки") - ).get_by_role("button").nth(1) - self.toolbar = ToolbarComponent(page, "Настройки") - self.toolbar.add_tooltip_button(locator_button_1, "edit") - self.toolbar.add_tooltip_button(locator_button_1, "save") - self.toolbar.add_tooltip_button(locator_button_2, "cancel") + toolbar_button_edit = self.page.get_by_role("navigation").filter(has_text=re.compile("Настройки")). \ + locator("//button[@data-testid='SESSION_SETTINGS__btn__edit']") + self.toolbar.add_tooltip_button(toolbar_button_edit, "edit") + + toolbar_button_save = self.page.get_by_role("navigation").filter(has_text=re.compile("Настройки")). \ + locator("//button[@data-testid='SESSION_SETTINGS__btn__submit']") + self.toolbar.add_tooltip_button(toolbar_button_save, "save") + + toolbar_button_cancel = self.page.get_by_role("navigation").filter(has_text=re.compile("Настройки")). \ + locator("//button[@data-testid='SESSION_SETTINGS__btn__cancelEdit']") + self.toolbar.add_tooltip_button(toolbar_button_cancel, "cancel") # Форма для отображения/редактирования полей настроек сессии пользователя self.settings_form = SettingsFormComponent(page) @@ -49,27 +50,27 @@ class SessionSettingsTab(BasePage): # Используем локаторы для числовых полей loc = self.input_fields_locators.get("Администратор") - loc_admin = loc.locator(SettingsFormLocators.SETTINGS_FORM_INPUT_FIELD).first + loc_admin = loc.locator("//input[@data-testid='SESSION_SETTINGS__text-field__administrator']") admin_setting = TextInput(page, loc_admin, "admin_setting") self.settings_form.add_content_item("admin_setting", admin_setting) loc = self.input_fields_locators.get("Оператор") - loc_oper = loc.locator(SettingsFormLocators.SETTINGS_FORM_INPUT_FIELD).first + loc_oper = loc.locator("//input[@data-testid='SESSION_SETTINGS__text-field__operator']") operator_setting = TextInput(page, loc_oper, "operator_setting") self.settings_form.add_content_item("operator_setting", operator_setting) loc = self.input_fields_locators.get("Контактное лицо") - loc_manager = loc.locator(SettingsFormLocators.SETTINGS_FORM_INPUT_FIELD).first + loc_manager = loc.locator("//input[@data-testid='SESSION_SETTINGS__text-field__manager']") manager_setting = TextInput(page, loc_manager, "manager_setting") self.settings_form.add_content_item("manager_setting", manager_setting) loc = self.input_fields_locators.get("Специалист информационной безопасности") - loc_inform_secur_user = loc.locator(SettingsFormLocators.SETTINGS_FORM_INPUT_FIELD).first + loc_inform_secur_user = loc.locator("//input[@data-testid='SESSION_SETTINGS__text-field__inform_secur_user']") inform_secur_user_setting = TextInput(page, loc_inform_secur_user, "inform_secur_user_setting") self.settings_form.add_content_item("inform_secur_user_setting", inform_secur_user_setting) loc = self.input_fields_locators.get('$collector') - loc_collector = loc.locator(SettingsFormLocators.SETTINGS_FORM_INPUT_FIELD).first + loc_collector = loc.locator("//input[@data-testid='SESSION_SETTINGS__text-field__$collector']") collector_setting = TextInput(page, loc_collector, "collector_setting") self.settings_form.add_content_item("collector_setting", collector_setting) @@ -221,7 +222,8 @@ class SessionSettingsTab(BasePage): for name in actual_input_field_names: # Для суффикса "минут" - value_suffix_loc = self.input_fields_locators.get(name).locator(SettingsFormLocators.SETTINGS_FORM_INPUT_VALUE_SUFFIX) + value_suffix_loc = self.input_fields_locators.get(name). \ + locator(SettingsFormLocators.SETTINGS_FORM_INPUT_VALUE_SUFFIX) value_suffix = value_suffix_loc.text_content().strip() assert value_suffix == "минут", f"Incorrect value suffix for field {name}"