diff --git a/test/e2e/gui/objects_map/communities_names.py b/test/e2e/gui/objects_map/communities_names.py index fc09d70d4c..d24b172208 100644 --- a/test/e2e/gui/objects_map/communities_names.py +++ b/test/e2e/gui/objects_map/communities_names.py @@ -118,7 +118,7 @@ editPermissionView_Is_allowed_to_StatusFlowSelector = {"container": mainWindow_e editPermissionView_In_StatusItemSelector = {"container": mainWindow_editPermissionView_EditPermissionView, "id": "inSelector", "type": "StatusItemSelector", "unnamed": 1, "visible": True} editPermissionView_whoHoldsSwitch_StatusSwitch = {"checkable": True, "container": mainWindow_editPermissionView_EditPermissionView, "id": "whoHoldsSwitch", "type": "StatusSwitch", "unnamed": 1, "visible": True} edit_TextEdit = {"container": statusDesktop_mainWindow_overlay, "type": "TextEdit", "unnamed": 1, "visible": True} -inputValue_StyledTextField = {"container": statusDesktop_mainWindow_overlay, "echoMode": 0, "id": "inputValue", "type": "StyledTextField", "unnamed": 1, "visible": True} +inputValue_StyledTextField = {"container": statusDesktop_mainWindow_overlay, "id": "inputValue", "type": "StyledTextField", "unnamed": 1, "visible": True} o_TokenItem = {"container": statusDesktop_mainWindow_overlay, "index": 0, "type": "TokenItem", "unnamed": 1, "visible": True} add_StatusButton = {"checkable": False, "container": statusDesktop_mainWindow_overlay, "type": "StatusButton", "unnamed": 1, "visible": True} customPermissionListItem = {"container": statusDesktop_mainWindow_overlay, "objectName": "becomeAdmin", "type": "CustomPermissionListItem", "visible": True} diff --git a/test/e2e/gui/objects_map/names.py b/test/e2e/gui/objects_map/names.py index 33639bac54..f26858ea0e 100644 --- a/test/e2e/gui/objects_map/names.py +++ b/test/e2e/gui/objects_map/names.py @@ -616,7 +616,7 @@ signOutConfirmationButton = {"container": statusDesktop_mainWindow_overlay, "obj mainWindow_EnsWelcomeView = {"container": statusDesktop_mainWindow, "type": "EnsWelcomeView", "unnamed": 1, "visible": True} mainWindow_Start_StatusButton = {"checkable": False, "container": statusDesktop_mainWindow, "objectName": "ensStartButton", "type": "StatusButton", "visible": True} mainWindow_EnsSearchView = {"container": statusDesktop_mainWindow, "type": "EnsSearchView", "unnamed": 1, "visible": True} -mainWindow_ensUsernameInput_StyledTextField = {"container": statusDesktop_mainWindow, "echoMode": 0, "objectName": "ensUsernameInput", "type": "StyledTextField", "visible": True} +mainWindow_ensUsernameInput_StyledTextField = {"container": statusDesktop_mainWindow, "objectName": "ensUsernameInput", "type": "StyledTextField", "visible": True} mainWindow_ensNextButton_StatusRoundButton = {"container": statusDesktop_mainWindow, "objectName": "ensNextButton", "type": "StatusRoundButton", "visible": True} ens_StatusBaseText = {"container": mainWindow_EnsSearchView, "type": "StatusBaseText", "unnamed": 1, "visible": True} mainWindow_EnsTermsAndConditionsView = {"container": statusDesktop_mainWindow, "type": "EnsTermsAndConditionsView", "unnamed": 1, "visible": True} @@ -710,8 +710,8 @@ profileImageCropper = {"container": statusDesktop_mainWindow, "objectName": "ima # Create Password View mainWindow_CreatePasswordView = {"container": statusDesktop_mainWindow, "type": "CreatePasswordView", "unnamed": 1, "visible": True} -mainWindow_passwordViewNewPassword = {"container": mainWindow_StatusWindow, "echoMode": 2, "objectName": "passwordViewNewPassword", "type": "StatusPasswordInput", "visible": True} -mainWindow_passwordViewNewPasswordConfirm = {"container": mainWindow_CreatePasswordView, "echoMode": 2, "objectName": "passwordViewNewPasswordConfirm", "type": "StatusPasswordInput", "visible": True} +mainWindow_passwordViewNewPassword = {"container": mainWindow_CreatePasswordView, "objectName": "passwordViewNewPassword", "type": "StatusPasswordInput", "visible": True} +mainWindow_passwordViewNewPasswordConfirm = {"container": mainWindow_CreatePasswordView, "objectName": "passwordViewNewPasswordConfirm", "type": "StatusPasswordInput", "visible": True} mainWindow_Create_password_StatusButton = {"checkable": False, "container": mainWindow_CreatePasswordView, "objectName": "onboardingCreatePasswordButton", "type": "StatusButton", "visible": True} mainWindow_view_PasswordView = {"container": statusDesktop_mainWindow, "id": "view", "type": "PasswordView", "unnamed": 1, "visible": True} mainWindow_RowLayout = {"container": mainWindow_StatusWindow, "type": "RowLayout", "unnamed": 1, "visible": True} diff --git a/test/e2e/gui/screens/onboarding.py b/test/e2e/gui/screens/onboarding.py index 6bd53723fe..431e6b8e04 100755 --- a/test/e2e/gui/screens/onboarding.py +++ b/test/e2e/gui/screens/onboarding.py @@ -439,13 +439,11 @@ class CreatePasswordView(OnboardingView): self._hide_icon = QObject(names.mainWindow_hide_icon_StatusIcon) @allure.step('Get password content from first field') - def get_password_from_first_field(self, echo_mode) -> str: - self._new_password_text_field.real_name['echoMode'] = echo_mode + def get_password_from_first_field(self) -> str: return str(self._new_password_text_field.object.displayText) @allure.step('Get password content from confirmation field') - def get_password_from_confirmation_field(self, echo_mode) -> str: - self._confirm_password_text_field.real_name['echoMode'] = echo_mode + def get_password_from_confirmation_field(self) -> str: return str(self._confirm_password_text_field.object.displayText) @property @@ -561,8 +559,7 @@ class ConfirmPasswordView(OnboardingView): return CreatePasswordView().wait_until_appears() @allure.step('Get password content from confirmation again field') - def get_password_from_confirmation_again_field(self, echo_mode) -> str: - self._confirm_password_text_field.real_name['echoMode'] = echo_mode + def get_password_from_confirmation_again_field(self) -> str: return str(self._confirm_password_text_field.object.displayText) diff --git a/test/e2e/tests/onboarding/test_password_strength.py b/test/e2e/tests/onboarding/test_password_strength.py index 72e51c64b8..683e9d494e 100644 --- a/test/e2e/tests/onboarding/test_password_strength.py +++ b/test/e2e/tests/onboarding/test_password_strength.py @@ -1,14 +1,14 @@ import allure import pytest from allure_commons._allure import step + from . import marks -import configs.system import constants from constants.onboarding import very_weak_lower_elements, very_weak_upper_elements, \ very_weak_numbers_elements, very_weak_symbols_elements, weak_elements, so_so_elements, good_elements, great_elements from gui.components.onboarding.before_started_popup import BeforeStartedPopUp -from gui.screens.onboarding import AllowNotificationsView, WelcomeToStatusView, KeysView +from gui.screens.onboarding import WelcomeToStatusView, KeysView pytestmark = marks @@ -25,7 +25,6 @@ def keys_screen(main_window) -> KeysView: 'Strength of the password') @pytest.mark.case(702989) @pytest.mark.parametrize('user_account', [constants.user.user_with_random_attributes_1]) -@pytest.mark.skip(reason="https://github.com/status-im/status-desktop/issues/13783") def test_check_password_strength_and_login(keys_screen, main_window, user_account): values = [('abcdefghij', very_weak_lower_elements), ('ABCDEFGHIJ', very_weak_upper_elements), @@ -57,18 +56,18 @@ def test_check_password_strength_and_login(keys_screen, main_window, user_accoun assert create_password_view.is_create_password_button_enabled create_password_view.click_show_icon(0) - assert create_password_view.get_password_from_first_field(0) == expected_password + assert create_password_view.get_password_from_first_field() == expected_password create_password_view.click_hide_icon(0) # we decided to comment it because this verification is not stable (always different format of dots) - # assert create_password_view.get_password_from_first_field(2) == '●●●●●●●●●●' + # assert create_password_view.get_password_from_first_field() == '●●●●●●●●●●' create_password_view.click_show_icon(1) - assert create_password_view.get_password_from_confirmation_field(0) == expected_password + assert create_password_view.get_password_from_confirmation_field() == expected_password create_password_view.click_hide_icon(0) # we decided to comment it because this verification is not stable (always different format of dots) - # assert create_password_view.get_password_from_confirmation_field(2) == '●●●●●●●●●●' + # assert create_password_view.get_password_from_confirmation_field() == '●●●●●●●●●●' with step('Confirm creation of password and set password in confirmation again field'): confirm_password_view = create_password_view.click_create_password() @@ -79,9 +78,9 @@ def test_check_password_strength_and_login(keys_screen, main_window, user_accoun with step('Click show icon to show password and check that shown password is correct'): create_password_view.click_show_icon(0) - assert confirm_password_view.get_password_from_confirmation_again_field(0) == expected_password + assert confirm_password_view.get_password_from_confirmation_again_field() == expected_password with step('Click show icon to hide password and check that there are dots instead'): create_password_view.click_hide_icon(0) # we decided to comment it because this verification is not stable (always different format of dots) - # assert confirm_password_view.get_password_from_confirmation_again_field(2) == '●●●●●●●●●●' + # assert confirm_password_view.get_password_from_confirmation_again_field() == '●●●●●●●●●●' diff --git a/test/e2e/tests/settings/test_ens_name_purchase.py b/test/e2e/tests/settings/test_ens_name_purchase.py index 488cae0726..3452bf5843 100644 --- a/test/e2e/tests/settings/test_ens_name_purchase.py +++ b/test/e2e/tests/settings/test_ens_name_purchase.py @@ -13,8 +13,7 @@ from gui.components.onboarding.beta_consent_popup import BetaConsentPopup from gui.components.splash_screen import SplashScreen from gui.components.wallet.authenticate_popup import AuthenticatePopup from gui.components.wallet.send_popup import SendPopup -from gui.screens.onboarding import KeysView, AllowNotificationsView, WelcomeToStatusView, BiometricsView, \ - YourEmojihashAndIdenticonRingView +from gui.screens.onboarding import KeysView, WelcomeToStatusView, BiometricsView, YourEmojihashAndIdenticonRingView from gui.screens.settings_ens_usernames import ENSRegisteredView pytestmark = marks