diff --git a/components_derived/modal_change_password.py b/components_derived/modal_change_password.py index 7b00164..daeb3e6 100644 --- a/components_derived/modal_change_password.py +++ b/components_derived/modal_change_password.py @@ -41,7 +41,7 @@ class ChangePasswordModalWindow(ModalWindowComponent): loc = modal_window_locator.get_by_label("Введите текущий пароль *") old_password_input = TextInput(page, loc, "old_password_input") self.add_content_item("old_password_input", old_password_input) - + icon_locator = loc.locator("xpath=../..").locator(TextInputLocators.ICON_PASSWORD_HIDING) old_password_hidden_icon = Icon(page, icon_locator, "old password hidden icon") @@ -50,7 +50,7 @@ class ChangePasswordModalWindow(ModalWindowComponent): loc = modal_window_locator.get_by_label("Введите новый пароль *") new_password_input = TextInput(page, loc, "new_password_input") self.add_content_item("new_password_input", new_password_input) - + icon_locator = loc.locator("xpath=../..").locator(TextInputLocators.ICON_PASSWORD_HIDING) new_password_hidden_icon = Icon(page, icon_locator, "new password hidden icon") @@ -59,7 +59,7 @@ class ChangePasswordModalWindow(ModalWindowComponent): loc = modal_window_locator.get_by_label("Введите повторно новый пароль *") confirm_password_input = TextInput(page, loc, "confirm_password_input") self.add_content_item("confirm_password_input", confirm_password_input) - + icon_locator = loc.locator("xpath=../..").locator(TextInputLocators.ICON_PASSWORD_HIDING) confirm_password_hidden_icon = Icon(page, icon_locator, "confirm password hidden icon") @@ -85,17 +85,17 @@ class ChangePasswordModalWindow(ModalWindowComponent): """Нажимает кнопку 'Отменить'""" self.get_button_by_name("cancel").click() - + def click_old_password_hidden_icon(self) -> None: """Нажатие на иконку скрытия старого пароля.""" self.get_content_item("old_password_hidden_icon").click() - + def click_new_password_hidden_icon(self) -> None: """Нажатие на иконку скрытия нового пароля.""" self.get_content_item("new_password_hidden_icon").click() - + def click_confirm_password_hidden_icon(self) -> None: """Нажатие на иконку скрытия пароля подтверждения.""" @@ -127,9 +127,8 @@ class ChangePasswordModalWindow(ModalWindowComponent): self.alert.check_alert_absence(' Пароль успешно изменён ') is_changed = True elif alert_type == "error": - # to do: fix message after translation - self.alert.check_alert_presence(' Old password not equal ') - self.alert.check_alert_absence(' Old password not equal ') + self.alert.check_alert_presence(' Неверно указан текущий пароль ') + self.alert.check_alert_absence(' Неверно указан текущий пароль ') error = "Old password is not equal real password" else: @@ -155,27 +154,27 @@ class ChangePasswordModalWindow(ModalWindowComponent): self.get_content_item("old_password_input").check_visibility( "Old password input form is missing" ) - old_password_hidden_icon = self.get_content_item("old_password_hidden_icon") + old_password_hidden_icon = self.get_content_item("old_password_hidden_icon") old_password_hidden_icon.check_visibility( "Old password hidden icon is missing" ) is_hidden_state = old_password_hidden_icon.is_password_hidden() assert is_hidden_state, "Old password hidden icon should be in hidden state" - + self.get_content_item("new_password_input").check_visibility( "New password input form is missing" ) - new_password_hidden_icon = self.get_content_item("new_password_hidden_icon") + new_password_hidden_icon = self.get_content_item("new_password_hidden_icon") new_password_hidden_icon.check_visibility( "New password hidden icon is missing" ) is_hidden_state = new_password_hidden_icon.is_password_hidden() assert is_hidden_state, "New password hidden icon should be in hidden state" - + self.get_content_item("confirm_password_input").check_visibility( "Confirm password input form is missing" ) - confirm_password_hidden_icon = self.get_content_item("confirm_password_hidden_icon") + confirm_password_hidden_icon = self.get_content_item("confirm_password_hidden_icon") confirm_password_hidden_icon.check_visibility( "Confirm password hidden icon is missing" )