From 2c150e71e109e6f0d3583a366db49c159ab1c639 Mon Sep 17 00:00:00 2001 From: nsubbot Date: Thu, 18 Sep 2025 15:17:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=BE=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=B2=20=D1=82=D1=83=D0=BB=D0=B1=D0=B0=D1=80=20=D0=BA=D0=BD?= =?UTF-8?q?=D0=BE=D0=BF=D0=BA=D0=B8=20=D0=BE=D0=B1=D1=8B=D1=87=D0=BD=D0=BE?= =?UTF-8?q?=D0=B9=20=D0=B8=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20=D1=82?= =?UTF-8?q?=D0=B8=D0=BF=D0=B0=20v-tabs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/modal_window_component.py | 2 +- components/toolbar_component.py | 24 +++++++++++++++++++++++- pages/users_tab.py | 6 +++--- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/components/modal_window_component.py b/components/modal_window_component.py index 0929ba0..33511cf 100644 --- a/components/modal_window_component.py +++ b/components/modal_window_component.py @@ -40,7 +40,7 @@ class ModalWindowComponent(BaseComponent): def add_toolbar_button(self, locator: str, name: str) -> None: """Добавляет кнопку в панель инструментов модального окна.""" - self.toolbar.add_button(locator, name) + self.toolbar.add_tooltip_button(locator, name) def add_button(self, locator: str, name: str) -> None: """Добавляет кнопку в модальное окно.""" diff --git a/components/toolbar_component.py b/components/toolbar_component.py index 8cd8083..4372c6b 100644 --- a/components/toolbar_component.py +++ b/components/toolbar_component.py @@ -10,6 +10,8 @@ from playwright.sync_api import Page, expect, Locator from tools.logger import get_logger from locators.toolbar_locators import ToolbarLocators from elements.tooltip_button_element import TooltipButton +from elements.tab_button_element import TabButton +from elements.button_element import Button from components.base_component import BaseComponent logger = get_logger("TOOLBAR") @@ -39,6 +41,26 @@ class ToolbarComponent(BaseComponent): self.title = title + def add_tooltip_button(self, locator: Locator, name: str) -> None: + """Добавляет кнопку с подсказкой в тулбар. + + Args: + locator (Locator): Локатор кнопки + name (str): Уникальное имя кнопки + """ + + self.buttons.append(TooltipButton(self.page, locator, name)) + + def add_tab_button(self, locator: Locator, name: str) -> None: + """Добавляет кнопку типа v-tab в тулбар. + + Args: + locator (Locator): Локатор кнопки + name (str): Уникальное имя кнопки + """ + + self.buttons.append(TabButton(self.page, locator, name)) + def add_button(self, locator: Locator, name: str) -> None: """Добавляет кнопку в тулбар. @@ -47,7 +69,7 @@ class ToolbarComponent(BaseComponent): name (str): Уникальное имя кнопки """ - self.buttons.append(TooltipButton(self.page, locator, name)) + self.buttons.append(Button(self.page, locator, name)) def get_button_by_name(self, name: str) -> TooltipButton | None: """Возвращает кнопку по имени. diff --git a/pages/users_tab.py b/pages/users_tab.py index c9893c1..f5c17c4 100644 --- a/pages/users_tab.py +++ b/pages/users_tab.py @@ -40,9 +40,9 @@ class UsersTab(BasePage): ).get_by_role("button").nth(1) self.toolbar = ToolbarComponent(page, "Пользователи") - self.toolbar.add_button(locator_button_1, "edit") - self.toolbar.add_button(locator_button_1, "add_user") - self.toolbar.add_button(locator_button_2, "close") + self.toolbar.add_tooltip_button(locator_button_1, "edit") + self.toolbar.add_tooltip_button(locator_button_1, "add_user") + self.toolbar.add_tooltip_button(locator_button_2, "close") self.users_table = TableComponent(page) self.modal_windows = {}