diff --git a/test/e2e/gui/objects_map/names.py b/test/e2e/gui/objects_map/names.py index 13fb9211da..9bc7fe40f2 100644 --- a/test/e2e/gui/objects_map/names.py +++ b/test/e2e/gui/objects_map/names.py @@ -527,7 +527,7 @@ networkSettingsNetworks_Arbitrum_Goerli = {"container": settingsContentBase_Scro networkSettingsNetworks_Mainnet_Goerli_sensor = {"container": networkSettingsNetworks_Mainnet_Goerli, "objectName": "walletNetworkDelegate_Mainnet_5_sensor", "id": "sensor", "type": "MouseArea", "unnamed": 1, "visible": True} networkSettingsNetowrks_Mainnet_Testlabel = {"container": networkSettingsNetworks_Mainnet_Goerli_sensor, "objectName": "testnetLabel_Mainnet", "type": "StatusBaseText", "visible": True} settingsWalletAccountDelegate_Status_account = {"container": settingsContentBase_ScrollView, "objectName": "Status account", "type": "WalletAccountDelegate", "visible": True} -settingsWalletAccountDelegate = {"container": settingsContentBase_ScrollView, "objectName": RegularExpression("*"), "type": "WalletAccountDelegate", "visible": True} +settingsWalletAccountDelegate = {"container": settingsContentBase_ScrollView, "index": 0, "objectName": RegularExpression("*"), "type": "WalletAccountDelegate", "visible": True} settingsWalletKeyPairDelegate = {"container": settingsContentBase_ScrollView, "objectName": "walletKeyPairDelegate", "type": "StatusListItem", "visible": True} settingsWalletAccountTotalBalance = {"container": settingsContentBase_ScrollView, "objectName": "includeTotalBalanceListItem", "type": "StatusListItem", "visible": True} settingsWalletAccountTotalBalanceToggle = {"checkable": True, "container": settingsWalletAccountTotalBalance, "type": "StatusSwitch", "visible": True} diff --git a/test/e2e/gui/screens/settings_wallet.py b/test/e2e/gui/screens/settings_wallet.py index e25c388bce..c66a500a50 100644 --- a/test/e2e/gui/screens/settings_wallet.py +++ b/test/e2e/gui/screens/settings_wallet.py @@ -93,8 +93,9 @@ class WalletSettingsView(QObject): return keypair_names @allure.step('Open account view in wallet settings by name') - def open_account_in_settings(self, name): + def open_account_in_settings(self, name: str, index: int): self._wallet_account_from_keypair.real_name['objectName'] = name + self._wallet_account_from_keypair.real_name['index'] = index self._wallet_account_from_keypair.click() return AccountDetailsView().wait_until_appears() diff --git a/test/e2e/tests/onboarding/test_onboarding_import_seed.py b/test/e2e/tests/onboarding/test_onboarding_import_seed.py index 36311cce63..09e1841352 100644 --- a/test/e2e/tests/onboarding/test_onboarding_import_seed.py +++ b/test/e2e/tests/onboarding/test_onboarding_import_seed.py @@ -35,7 +35,7 @@ def keys_screen(main_window) -> KeysView: pytest.param(False, 'Account 1'), pytest.param(True, 'Account 1', marks=pytest.mark.critical) ]) -def test_import_seed_phrase(aut: AUT, keys_screen, main_window, user_account, default_name, autocomplete: bool): +def test_import_seed_phrase(aut: AUT, keys_screen, main_window, user_account, default_name: str, autocomplete: bool): with step('Open import seed phrase view and enter seed phrase'): input_view = keys_screen.open_import_seed_phrase_view().open_seed_phrase_input_view() input_view.input_seed_phrase(user_account.seed_phrase, autocomplete) @@ -54,8 +54,10 @@ def test_import_seed_phrase(aut: AUT, keys_screen, main_window, user_account, de BetaConsentPopup().confirm() with (step('Verify that restored account reveals correct status wallet address')): + status_account_index = 0 status_acc_view = ( - LeftPanel().open_settings().left_panel.open_wallet_settings().open_account_in_settings(default_name)) + LeftPanel().open_settings().left_panel.open_wallet_settings().open_account_in_settings(default_name, + status_account_index)) address = status_acc_view.get_account_address_value() assert address == user_account.status_address, \ f"Recovered account should have address {user_account.status_address}, but has {address}" diff --git a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_account_order.py b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_account_order.py index 5935e6f04f..7789c72446 100644 --- a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_account_order.py +++ b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_account_order.py @@ -22,7 +22,7 @@ pytestmark = marks pytest.param('0xea123F7beFF45E3C9fdF54B324c29DBdA14a639A', 'Account 1', 'WatchOnly', '#2a4af5', 'sunglasses', '😎 ', 'Generated', '#216266', 'thumbsup', '👍 ') ]) -#@pytest.mark.skip(reason='https://github.com/status-im/desktop-qa-automation/issues/519') +@pytest.mark.skip(reason='https://github.com/status-im/desktop-qa-automation/issues/519') def test_change_account_order_by_drag_and_drop(main_screen: MainWindow, user_account, address: str, default_name, name: str, color: str, emoji: str, acc_emoji: str, second_name: str, second_color: str, second_emoji: str, second_acc_emoji: str): diff --git a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_delete_account.py b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_delete_account.py index 963645606d..c5737c357a 100644 --- a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_delete_account.py +++ b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_delete_account.py @@ -40,7 +40,8 @@ def test_delete_generated_account_from_wallet_settings( add_account_popup.wait_until_hidden() with step('Open account details view for the generated account'): - acc_view = WalletSettingsView().open_account_in_settings(account_name) + account_index = 1 + acc_view = WalletSettingsView().open_account_in_settings(account_name, account_index) with step('Verify details view for the generated account'): assert acc_view.get_account_name_value() == account_name, \ diff --git a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_edit_status_account.py b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_edit_status_account.py index c275045265..d507939d62 100644 --- a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_edit_status_account.py +++ b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_edit_status_account.py @@ -33,8 +33,9 @@ def test_settings_edit_status_account(main_screen: MainWindow, new_name): when display name is {profile_display_name}" with step('Open Status account view in wallet settings'): - status_acc_view = ( - SettingsScreen().left_panel.open_wallet_settings().open_account_in_settings('Account 1')) + status_account_index = 0 + status_acc_view = SettingsScreen().left_panel.open_wallet_settings().open_account_in_settings('Account 1', + status_account_index) with step('Check the default values on the account details view for main account'): assert status_acc_view.get_account_name_value() == WalletNetworkSettings.STATUS_ACCOUNT_DEFAULT_NAME.value, \ diff --git a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_watched_addr_include_in_total_balance.py b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_watched_addr_include_in_total_balance.py index 9adb26471d..8a12d871fb 100644 --- a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_watched_addr_include_in_total_balance.py +++ b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_watched_addr_include_in_total_balance.py @@ -14,6 +14,8 @@ from gui.main_window import MainWindow from gui.screens.settings_wallet import WalletSettingsView pytestmark = marks + + @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703508', 'Watched addresses: Excl. / Include in total balance functionality for watched address') @pytest.mark.case(703508) @@ -46,7 +48,8 @@ def test_settings_include_in_total_balance(main_screen: MainWindow, name, watche but currently the list is {keypairs_names}" with step('Open account details view for the watched address'): - acc_view = WalletSettingsView().open_account_in_settings(name) + account_index = 0 + acc_view = WalletSettingsView().open_account_in_settings(name, account_index) with step('Verify details view for the watched address'): assert driver.waitFor( diff --git a/test/e2e/tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_account_from_private_key.py b/test/e2e/tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_account_from_private_key.py index b340fb1dcb..c50e56cdf9 100644 --- a/test/e2e/tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_account_from_private_key.py +++ b/test/e2e/tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_account_from_private_key.py @@ -13,6 +13,8 @@ from gui.components.wallet.authenticate_popup import AuthenticatePopup from gui.main_window import MainWindow pytestmark = marks + + @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703029', 'Manage a private key imported account') @pytest.mark.case(703029) @pytest.mark.parametrize('user_account', [constants.user.user_account_one]) @@ -24,7 +26,8 @@ pytestmark = marks ]) def test_plus_button_manage_account_from_private_key(main_screen: MainWindow, user_account, address_pair, name: str, color: str, emoji: str, emoji_unicode: str, - new_name: str, new_color: str, new_emoji: str, new_emoji_unicode: str): + new_name: str, new_color: str, new_emoji: str, + new_emoji_unicode: str): with step('Import an account within private key'): wallet = main_screen.left_panel.open_wallet() SigningPhrasePopup().wait_until_appears().confirm_phrase() @@ -49,8 +52,10 @@ def test_plus_button_manage_account_from_private_key(main_screen: MainWindow, us raise LookupError(f'Account {expected_account} not found in {wallet.left_panel.accounts}') with step('Verify that importing private key reveals correct wallet address'): + account_index = 0 settings_acc_view = ( - main_screen.left_panel.open_settings().left_panel.open_wallet_settings().open_account_in_settings(name)) + main_screen.left_panel.open_settings().left_panel.open_wallet_settings().open_account_in_settings(name, + account_index)) address = settings_acc_view.get_account_address_value() assert address == address_pair.wallet_address, \ f"Recovered account should have address {address_pair.wallet_address}, but has {address}"