diff --git a/tests/wallet_main_screen/wallet: footer actions/__init__.py b/tests/wallet_main_screen/wallet: footer actions/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/wallet_main_screen/test_send.py b/tests/wallet_main_screen/wallet: footer actions/test_send.py similarity index 100% rename from tests/wallet_main_screen/test_send.py rename to tests/wallet_main_screen/wallet: footer actions/test_send.py diff --git a/tests/wallet_main_screen/wallet: plus button/__init__.py b/tests/wallet_main_screen/wallet: plus button/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/wallet_main_screen/test_plus_button_add_account_after_restart.py b/tests/wallet_main_screen/wallet: plus button/test_plus_button_add_account_after_restart.py similarity index 97% rename from tests/wallet_main_screen/test_plus_button_add_account_after_restart.py rename to tests/wallet_main_screen/wallet: plus button/test_plus_button_add_account_after_restart.py index 219dc327..81123ad6 100644 --- a/tests/wallet_main_screen/test_plus_button_add_account_after_restart.py +++ b/tests/wallet_main_screen/wallet: plus button/test_plus_button_add_account_after_restart.py @@ -3,7 +3,7 @@ import allure import pytest from allure import step -from . import marks +from tests.wallet_main_screen import marks import constants from driver.aut import AUT @@ -25,7 +25,6 @@ [ pytest.param('GenAcc2', '#2a4af5', 'sunglasses', '1f60e') ]) -@pytest.mark.xfail(reason='https://github.com/status-im/status-desktop/issues/12973') def test_add_generated_account_restart_add_again( aut: AUT, main_screen: MainWindow, user_account, color: str, emoji: str, emoji_unicode: str, name: str, diff --git a/tests/wallet_main_screen/test_plus_button_add_watched_address.py b/tests/wallet_main_screen/wallet: plus button/test_plus_button_add_watched_address.py similarity index 98% rename from tests/wallet_main_screen/test_plus_button_add_watched_address.py rename to tests/wallet_main_screen/wallet: plus button/test_plus_button_add_watched_address.py index 9a5e4506..830ed0ad 100644 --- a/tests/wallet_main_screen/test_plus_button_add_watched_address.py +++ b/tests/wallet_main_screen/wallet: plus button/test_plus_button_add_watched_address.py @@ -3,7 +3,7 @@ import allure import pytest from allure_commons._allure import step -from . import marks +from tests.wallet_main_screen import marks import constants from gui.components.signing_phrase_popup import SigningPhrasePopup diff --git a/tests/wallet_main_screen/test_plus_button_manage_account_added_for_imported_seed_phrase.py b/tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_account_added_for_new_generated_seed.py similarity index 86% rename from tests/wallet_main_screen/test_plus_button_manage_account_added_for_imported_seed_phrase.py rename to tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_account_added_for_new_generated_seed.py index 0668a9a1..e6106ead 100644 --- a/tests/wallet_main_screen/test_plus_button_manage_account_added_for_imported_seed_phrase.py +++ b/tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_account_added_for_new_generated_seed.py @@ -3,7 +3,7 @@ import allure import pytest from allure import step -from . import marks +from tests.wallet_main_screen import marks import constants import driver @@ -13,6 +13,8 @@ from gui.main_window import MainWindow pytestmark = marks + + @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703036', 'Manage an account created from the generated seed phrase') @pytest.mark.case(703036) @@ -21,11 +23,12 @@ 'new_name, new_color, new_emoji, new_emoji_unicode, keypair_name', [ pytest.param('SPAcc', '#2a4af5', 'sunglasses', '1f60e', 'SPAccedited', '#216266', 'thumbsup', '1f44d', 'SPKeyPair')]) -@pytest.mark.xfail(reason="https://github.com/status-im/status-desktop/issues/12914") -def test_plus_button_manage_account_added_for_imported_seed_phrase(main_screen: MainWindow, user_account, - name: str, color: str, emoji: str, emoji_unicode: str, - new_name: str, new_color: str, new_emoji: str, new_emoji_unicode: str, - keypair_name: str): +def test_plus_button_manage_account_added_for_new_seed(main_screen: MainWindow, user_account, + name: str, color: str, emoji: str, + emoji_unicode: str, + new_name: str, new_color: str, new_emoji: str, + new_emoji_unicode: str, + keypair_name: str): with step('Create generated seed phrase wallet account'): wallet = main_screen.left_panel.open_wallet() SigningPhrasePopup().wait_until_appears().confirm_phrase() diff --git a/tests/wallet_main_screen/test_plus_button_manage_account_from_private_key.py b/tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_account_from_private_key.py similarity index 97% rename from tests/wallet_main_screen/test_plus_button_manage_account_from_private_key.py rename to tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_account_from_private_key.py index f7d94a25..b340fb1d 100644 --- a/tests/wallet_main_screen/test_plus_button_manage_account_from_private_key.py +++ b/tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_account_from_private_key.py @@ -3,7 +3,7 @@ import allure import pytest from allure_commons._allure import step -from . import marks +from tests.wallet_main_screen import marks import constants import driver @@ -22,7 +22,6 @@ pytest.param('PrivKeyAcc1', '#2a4af5', 'sunglasses', '1f60e', 'PrivKeyAcc1edited', '#216266', 'thumbsup', '1f44d') ]) -@pytest.mark.xfail(reason="https://github.com/status-im/status-desktop/issues/12914") 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): @@ -70,7 +69,7 @@ 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('Delete wallet account'): - wallet.left_panel.delete_account_from_context_menu(new_name).confirm() + wallet.left_panel.delete_account_from_context_menu(new_name).agree_and_confirm() with step('Verify toast message notification when removing account'): messages = ToastMessage().get_toast_messages diff --git a/tests/wallet_main_screen/test_plus_button_manage_account_from_seed_phrase.py b/tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_account_from_seed_phrase.py similarity index 96% rename from tests/wallet_main_screen/test_plus_button_manage_account_from_seed_phrase.py rename to tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_account_from_seed_phrase.py index d1ae1004..69df0835 100644 --- a/tests/wallet_main_screen/test_plus_button_manage_account_from_seed_phrase.py +++ b/tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_account_from_seed_phrase.py @@ -3,7 +3,7 @@ import allure import pytest from allure_commons._allure import step -from . import marks +from tests.wallet_main_screen import marks import constants import driver @@ -13,6 +13,8 @@ from gui.main_window import MainWindow pytestmark = marks + + @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703030', 'Manage a seed phrase imported account') @pytest.mark.case(703030) @pytest.mark.parametrize('user_account', [constants.user.user_account_one]) @@ -30,10 +32,10 @@ 'SPAcc12edited', '#216266', 'thumbsup', '1f44d', 'pelican chief sudden oval media rare swamp elephant lawsuit wheat knife initial') ]) -@pytest.mark.xfail(reason="https://github.com/status-im/status-desktop/issues/12914") def test_plus_button_manage_account_from_seed_phrase(main_screen: MainWindow, user_account, 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, seed_phrase: str): with step('Create imported seed phrase wallet account'): wallet = main_screen.left_panel.open_wallet() diff --git a/tests/wallet_main_screen/test_plus_button_manage_generated_account.py b/tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_generated_account.py similarity index 97% rename from tests/wallet_main_screen/test_plus_button_manage_generated_account.py rename to tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_generated_account.py index d4c949fe..fff7a1ca 100644 --- a/tests/wallet_main_screen/test_plus_button_manage_generated_account.py +++ b/tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_generated_account.py @@ -3,7 +3,7 @@ import allure import pytest from allure_commons._allure import step -from . import marks +from tests.wallet_main_screen import marks import constants import driver @@ -21,7 +21,6 @@ pytest.param('GenAcc1', '#2a4af5', 'sunglasses', '1f60e', 'GenAcc1edited', '#216266', 'thumbsup', '1f44d') ]) -@pytest.mark.xfail(reason="https://github.com/status-im/status-desktop/issues/12914") def test_plus_button_manage_generated_account(main_screen: MainWindow, user_account, color: str, emoji: str, emoji_unicode: str, name: str, new_name: str, new_color: str, new_emoji: str, new_emoji_unicode: str): diff --git a/tests/wallet_main_screen/test_plus_button_manage_generated_account_custom_derivation_path.py b/tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_generated_account_custom_derivation_path.py similarity index 99% rename from tests/wallet_main_screen/test_plus_button_manage_generated_account_custom_derivation_path.py rename to tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_generated_account_custom_derivation_path.py index fc05f9ee..722d14b8 100644 --- a/tests/wallet_main_screen/test_plus_button_manage_generated_account_custom_derivation_path.py +++ b/tests/wallet_main_screen/wallet: plus button/test_plus_button_manage_generated_account_custom_derivation_path.py @@ -3,7 +3,7 @@ import allure import pytest from allure_commons._allure import step -from . import marks +from tests.wallet_main_screen import marks import constants import driver diff --git a/tests/settings/settings_keycard/test_redirect_to_keycard_settings_from_wallet.py b/tests/wallet_main_screen/wallet: plus button/test_plus_button_use_keycard.py similarity index 87% rename from tests/settings/settings_keycard/test_redirect_to_keycard_settings_from_wallet.py rename to tests/wallet_main_screen/wallet: plus button/test_plus_button_use_keycard.py index 14bb6732..10aaca6c 100644 --- a/tests/settings/settings_keycard/test_redirect_to_keycard_settings_from_wallet.py +++ b/tests/wallet_main_screen/wallet: plus button/test_plus_button_use_keycard.py @@ -1,7 +1,7 @@ import allure import pytest from allure_commons._allure import step -from . import marks +from tests.settings.settings_keycard import marks from gui.components.signing_phrase_popup import SigningPhrasePopup from gui.main_window import MainWindow @@ -9,17 +9,16 @@ pytestmark = marks + @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703514', 'Choosing Use Keycard when adding account') @pytest.mark.case(703514) -@pytest.mark.xfail(reason="https://github.com/status-im/status-desktop/issues/12914") def test_use_keycard_when_adding_account(main_screen: MainWindow): with step('Choose continue in keycard settings'): wallet = main_screen.left_panel.open_wallet() SigningPhrasePopup().wait_until_appears().confirm_phrase() account_popup = wallet.left_panel.open_add_account_popup() account_popup.continue_in_keycard_settings() - account_popup.wait_until_hidden() with (step('Verify that keycard settings view opened and all keycard settings available')): keycard_view = KeycardSettingsView() diff --git a/tests/wallet_main_screen/wallet: right click on account/__init__.py b/tests/wallet_main_screen/wallet: right click on account/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/wallet_main_screen/test_context_menu_edit_default_account.py b/tests/wallet_main_screen/wallet: right click on account/test_context_menu_edit_default_account.py similarity index 97% rename from tests/wallet_main_screen/test_context_menu_edit_default_account.py rename to tests/wallet_main_screen/wallet: right click on account/test_context_menu_edit_default_account.py index 7aa3846d..a5b4a8ea 100644 --- a/tests/wallet_main_screen/test_context_menu_edit_default_account.py +++ b/tests/wallet_main_screen/wallet: right click on account/test_context_menu_edit_default_account.py @@ -3,7 +3,7 @@ import allure import pytest from allure_commons._allure import step -from . import marks +from tests.wallet_main_screen import marks import constants from gui.components.signing_phrase_popup import SigningPhrasePopup diff --git a/tests/wallet_main_screen/wallet: right click out of account area/__init__.py b/tests/wallet_main_screen/wallet: right click out of account area/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/wallet_main_screen/test_context_menu_manage_watched_address.py b/tests/wallet_main_screen/wallet: right click out of account area/test_context_menu_manage_watched_address.py similarity index 98% rename from tests/wallet_main_screen/test_context_menu_manage_watched_address.py rename to tests/wallet_main_screen/wallet: right click out of account area/test_context_menu_manage_watched_address.py index 3bb356d1..8aeca0f1 100644 --- a/tests/wallet_main_screen/test_context_menu_manage_watched_address.py +++ b/tests/wallet_main_screen/wallet: right click out of account area/test_context_menu_manage_watched_address.py @@ -3,7 +3,7 @@ import allure import pytest from allure_commons._allure import step -from . import marks +from tests.wallet_main_screen import marks import constants from gui.components.signing_phrase_popup import SigningPhrasePopup diff --git a/tests/wallet_main_screen/wallet: saved addresses/__init__.py b/tests/wallet_main_screen/wallet: saved addresses/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/wallet_main_screen/test_saved_addresses.py b/tests/wallet_main_screen/wallet: saved addresses/test_saved_addresses.py similarity index 98% rename from tests/wallet_main_screen/test_saved_addresses.py rename to tests/wallet_main_screen/wallet: saved addresses/test_saved_addresses.py index 4dc64aa7..e51f4515 100644 --- a/tests/wallet_main_screen/test_saved_addresses.py +++ b/tests/wallet_main_screen/wallet: saved addresses/test_saved_addresses.py @@ -7,7 +7,7 @@ from gui.components.toast_message import ToastMessage from gui.screens.wallet import SavedAddressesView -from . import marks +from tests.wallet_main_screen import marks import configs import driver