From 542cd01568948f7ac0bd9fcebf8651e321e07421 Mon Sep 17 00:00:00 2001 From: Anastasiya Semenkevich Date: Fri, 1 Nov 2024 17:30:01 +0300 Subject: [PATCH] chore(@e2e): fix tests to reflect new settings list --- test/e2e/gui/objects_map/settings_names.py | 7 +++- test/e2e/gui/screens/settings.py | 46 +++++++++++----------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/test/e2e/gui/objects_map/settings_names.py b/test/e2e/gui/objects_map/settings_names.py index 1adebc241b..063c0c43f1 100644 --- a/test/e2e/gui/objects_map/settings_names.py +++ b/test/e2e/gui/objects_map/settings_names.py @@ -14,10 +14,15 @@ LeftTabProfileMenu = {"container": LeftTabView_ScrollView, "objectName": "leftTa mainWindow_Settings_StatusNavigationPanelHeadline = {"container": mainWindow_LeftTabView, "type": "StatusNavigationPanelHeadline", "unnamed": 1, "visible": True} mainWindow_scrollView_StatusScrollView = {"container": mainWindow_LeftTabView, "id": "scrollView", "type": "StatusScrollView", "unnamed": 1, "visible": True} +mainWindow_settingsList_SettingsList = {"container": statusDesktop_mainWindow, "id": "settingsList", "type": "SettingsList", "unnamed": 1, "visible": True} +mainWindow_settingsList_SettingsListItem = {"container": mainWindow_settingsList_SettingsList, "type": "StatusNavigationListItem", "visible": True} +mainWindow_settingsList_VerticalScroll = {"container": mainWindow_settingsList_SettingsList, "id": "verticalScrollBar", "type": "StatusScrollBar", "unnamed": 1, "visible": True} scrollView_MenuItem_StatusNavigationListItem = {"container": mainWindow_scrollView_StatusScrollView, "type": "StatusNavigationListItem", "visible": True} + + scrollView_Flickable = {"container": mainWindow_scrollView_StatusScrollView, "type": "Flickable", "unnamed": 1, "visible": True} settingsBackUpSeedPhraseOption = {"container": mainWindow_scrollView_StatusScrollView, "objectName": "18-MainMenuItem", "type": "StatusNavigationListItem", "visible": True} -settingsWalletOption = {"container": LeftTabView_ScrollView, "objectName": "5-AppMenuItem", "type": "StatusNavigationListItem", "visible": True} +settingsWalletOption = {"container": mainWindow_settingsList_SettingsList, "objectName": "5-MenuItem", "type": "StatusNavigationListItem", "visible": True} settingsSignOutQuitOption = {"container": LeftTabProfileMenu, "objectName": "17-ExtraMenuItem", "type": "StatusNavigationListItem", "visible": True} # Communities View diff --git a/test/e2e/gui/screens/settings.py b/test/e2e/gui/screens/settings.py index d77bdd8d60..925e417988 100644 --- a/test/e2e/gui/screens/settings.py +++ b/test/e2e/gui/screens/settings.py @@ -23,8 +23,8 @@ class LeftPanel(QObject): def __init__(self): super().__init__(settings_names.mainWindow_LeftTabView) - self._settings_section_template = QObject(settings_names.scrollView_MenuItem_StatusNavigationListItem) - self._scroll = Scroll(settings_names.mainWindow_scrollView_StatusScrollView) + self._settings_section_template = QObject(settings_names.mainWindow_settingsList_SettingsListItem) + self._scroll = Scroll(settings_names.mainWindow_settingsList_VerticalScroll) self.settings_section_back_up_seed_option = QObject(settings_names.settingsBackUpSeedPhraseOption) self.settings_section_wallet_option = QObject(settings_names.settingsWalletOption) self.settings_section_sign_out_quit_option = QObject(settings_names.settingsSignOutQuitOption) @@ -40,68 +40,68 @@ class LeftPanel(QObject): self._scroll.vertical_scroll_down(self._settings_section_template) self._settings_section_template.click() + @allure.step('Choose back up seed phrase in settings') + @handle_settings_opening(BackUpYourSeedPhrasePopUp, '18-MenuItem') + def open_back_up_seed_phrase(self, click_attempts: int = 2) -> 'BackUpYourSeedPhrasePopUp': + assert BackUpYourSeedPhrasePopUp().exists, 'Back up your seed phrase modal was not opened' + return BackUpYourSeedPhrasePopUp() + + @allure.step('Open wallet settings') + @handle_settings_opening(WalletSettingsView, '5-MenuItem') + def open_wallet_settings(self, click_attempts: int = 2) -> 'WalletSettingsView': + assert WalletSettingsView().exists, 'Wallet view was not opened' + return WalletSettingsView() + @allure.step('Open messaging settings') - @handle_settings_opening(MessagingSettingsView, '4-AppMenuItem') + @handle_settings_opening(MessagingSettingsView, '4-MenuItem') def open_messaging_settings(self, click_attempts: int = 2) -> 'MessagingSettingsView': assert MessagingSettingsView().wait_until_appears(), 'Messaging settings view was not opened' return MessagingSettingsView() @allure.step('Open communities settings') - @handle_settings_opening(CommunitiesSettingsView, '12-AppMenuItem') + @handle_settings_opening(CommunitiesSettingsView, '12-MenuItem') def open_communities_settings(self, attempts: int = 2) -> 'CommunitiesSettingsView': assert CommunitiesSettingsView().exists, 'Community settings view was not opened' return CommunitiesSettingsView() - @allure.step('Open wallet settings') - @handle_settings_opening(WalletSettingsView, '5-AppMenuItem') - def open_wallet_settings(self, click_attempts: int = 2) -> 'WalletSettingsView': - assert WalletSettingsView().wait_until_appears(), 'Wallet settings view was not opened' - return WalletSettingsView() - @allure.step('Open profile settings') - @handle_settings_opening(ProfileSettingsView, '0-MainMenuItem') + @handle_settings_opening(ProfileSettingsView, '0-MenuItem') def open_profile_settings(self, click_attempts: int = 2) -> 'ProfileSettingsView': assert ProfileSettingsView().exists, 'Profile settings view was not opened' return ProfileSettingsView() @allure.step('Open password settings') - @handle_settings_opening(ChangePasswordView, '1-MainMenuItem') + @handle_settings_opening(ChangePasswordView, '1-MenuItem') def open_password_settings(self, click_attempts: int = 2) -> 'ChangePasswordView': assert ChangePasswordView().exists, 'Password settings view was not opened' return ChangePasswordView() - @allure.step('Choose back up seed phrase in settings') - @handle_settings_opening(BackUpYourSeedPhrasePopUp, '18-MainMenuItem') - def open_back_up_seed_phrase(self, click_attempts: int = 2) -> 'BackUpYourSeedPhrasePopUp': - assert BackUpYourSeedPhrasePopUp().exists, 'Back up your seed phrase modal was not opened' - return BackUpYourSeedPhrasePopUp() - @allure.step('Open syncing settings') - @handle_settings_opening(SyncingSettingsView, '9-MainMenuItem') + @handle_settings_opening(SyncingSettingsView, '9-MenuItem') def open_syncing_settings(self, click_attempts: int = 2) -> 'SyncingSettingsView': assert SyncingSettingsView().exists, 'Syncing settings view was not opened' return SyncingSettingsView() @allure.step('Choose sign out and quit in settings') - @handle_settings_opening(SignOutPopup, '17-ExtraMenuItem') + @handle_settings_opening(SignOutPopup, '17-MenuItem') def open_sign_out_and_quit(self, click_attempts: int = 2) -> 'SignOutPopup': assert SignOutPopup().wait_until_appears(), 'Sign out modal was not opened' return SignOutPopup() @allure.step('Open keycard settings') - @handle_settings_opening(KeycardSettingsView, '13-MainMenuItem') + @handle_settings_opening(KeycardSettingsView, '13-MenuItem') def open_keycard_settings(self, click_attempts: int = 2) -> 'KeycardSettingsView': assert KeycardSettingsView().wait_until_appears(), f'Keycard settings view was not opened' return KeycardSettingsView() @allure.step('Open ENS usernames settings') - @handle_settings_opening(ENSSettingsView, '3-MainMenuItem') + @handle_settings_opening(ENSSettingsView, '3-MenuItem') def open_ens_usernames_settings(self, click_attempts: int = 2) -> 'ENSSettingsView': assert ENSSettingsView().wait_until_appears(), 'ENS settings view was not opened' return ENSSettingsView() @allure.step('Open advanced settings') - @handle_settings_opening(AdvancedSettingsView, '10-SettingsMenuItem') + @handle_settings_opening(AdvancedSettingsView, '10-MenuItem') def open_advanced_settings(self, click_attempts: int = 2) -> 'AdvancedSettingsView': assert AdvancedSettingsView().wait_until_appears(), 'Advanced settings view was not opened' return AdvancedSettingsView()