status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore(@e2e): fixes for tests according to changes to wallet tab reordering

This commit is contained in:
Anastasiya Semenkevich 2024-11-20 19:34:34 +03:00 committed by Alex Jbanca
parent a39728ba94
commit 5992054f0d
27 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/gui/components/onboarding/share_usage_data_popup.py
View File

@ -2,13 +2,14 @@ import allure
from gui.components.base_popup import BasePopup
from gui.elements.button import Button
from gui.elements.object import QObject
from gui.objects_map import names
class ShareUsageDataPopup(BasePopup):
class ShareUsageDataPopup(QObject):
def __init__(self):
super().__init__()
super().__init__(names.share_usage_data_StatusButton)
self._not_now_button = Button(names.not_now_StatusButton )
self._share_usage_data_button = Button(names.share_usage_data_StatusButton)

10
test/e2e/gui/components/signing_phrase_popup.py
View File

@ -8,15 +8,11 @@ from gui.objects_map import names
class SigningPhrasePopup(QObject):
def __init__(self):
super(SigningPhrasePopup, self).__init__(names.signPhrase_Ok_Button)
self._ok_got_it_button = Button(names.signPhrase_Ok_Button)
super().__init__(names.signPhrase_Ok_Button)
self.ok_got_it_button = Button(names.signPhrase_Ok_Button)
@allure.step('Confirm signing phrase in popup')
def confirm_phrase(self):
# TODO https://github.com/status-im/status-desktop/issues/15345
self._ok_got_it_button.click(timeout=60)
self.ok_got_it_button.click()
SigningPhrasePopup().wait_until_hidden()
@allure.step('Verify if the signing phrase popup is visible')
def is_ok_got_it_button_visible(self):
return self._ok_got_it_button.is_visible

5
test/e2e/gui/main_window.py
View File

@ -12,6 +12,7 @@ from gui.components.onboarding.share_usage_data_popup import ShareUsageDataPopup
from gui.components.context_menu import ContextMenu
from gui.components.onboarding.before_started_popup import BeforeStartedPopUp
from gui.components.onboarding.beta_consent_popup import BetaConsentPopup
from gui.components.signing_phrase_popup import SigningPhrasePopup
from gui.components.splash_screen import SplashScreen
from gui.components.toast_message import ToastMessage
from gui.components.online_identifier import OnlineIdentifier
@ -191,6 +192,8 @@ class MainWindow(Window):
SplashScreen().wait_until_appears().wait_until_hidden()
if not configs.system.TEST_MODE and not configs._local.DEV_BUILD:
BetaConsentPopup().confirm()
assert SigningPhrasePopup().ok_got_it_button.is_visible
SigningPhrasePopup().confirm_phrase()
return self
@allure.step('Log in user')
@ -200,6 +203,8 @@ class MainWindow(Window):
SplashScreen().wait_until_appears().wait_until_hidden()
if not configs.system.TEST_MODE and not configs._local.DEV_BUILD:
BetaConsentPopup().confirm()
if SigningPhrasePopup().is_visible:
SigningPhrasePopup().confirm_phrase()
if share_updates_popup.is_visible:
share_updates_popup.skip()
return self

3
test/e2e/helpers/OnboardingHelper.py
View File

@ -5,6 +5,7 @@ import configs.system
from gui.components.onboarding.before_started_popup import BeforeStartedPopUp
from gui.components.onboarding.beta_consent_popup import BetaConsentPopup
from gui.components.signing_phrase_popup import SigningPhrasePopup
from gui.components.splash_screen import SplashScreen
from gui.screens.onboarding import WelcomeToStatusView, BiometricsView, YourEmojihashAndIdenticonRingView
@ -38,4 +39,6 @@ with step('Finalize onboarding and open main screen'):
SplashScreen().wait_until_appears().wait_until_hidden()
if not configs.system.TEST_MODE and not configs._local.DEV_BUILD:
BetaConsentPopup().confirm()
assert SigningPhrasePopup().ok_got_it_button.is_visible
SigningPhrasePopup().confirm_phrase()

3
test/e2e/helpers/WalletHelper.py
View File

@ -11,10 +11,9 @@ with step('Authenticate user action with password'):
AuthenticatePopup().wait_until_appears().authenticate(user_account.password)
AuthenticatePopup().wait_until_hidden()
with step('Close signing phrase popup and open wallet send popup'):
with step('Open wallet send popup'):
def open_send_modal_for_account(main_window, account_name):
wallet = main_window.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
assert \
driver.waitFor(lambda: wallet.left_panel.is_total_balance_visible, configs.timeouts.UI_LOAD_TIMEOUT_SEC), \
f"Total balance is not visible"

3
test/e2e/tests/crtitical_tests_prs/test_add_account_after_restart.py
View File

@ -35,7 +35,6 @@ def test_add_generated_account_restart_add_again(
):
with step('Add the first generated wallet account'):
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
account_popup = wallet.left_panel.open_add_account_popup()
account_popup.set_name(name).save_changes()
authenticate_with_password(user_account)
@ -61,7 +60,7 @@ def test_add_generated_account_restart_add_again(
with step('Add second generated wallet account'):
wallet = main_screen.left_panel.open_wallet()
assert not SigningPhrasePopup().is_ok_got_it_button_visible(), \
assert not SigningPhrasePopup().ok_got_it_button.is_visible, \
f"Signing phrase should not be present because it has been hidden in the first step"
account_popup = wallet.left_panel.open_add_account_popup()
account_popup.set_name(name2).save_changes()

1
test/e2e/tests/crtitical_tests_prs/test_add_delete_account_from_settings.py
View File

@ -70,7 +70,6 @@ def test_delete_generated_account_from_wallet_settings(
with step('Verify the removed account is not displayed in accounts list on main wallet screen'):
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
assert driver.waitFor(
lambda: account_name not in [account.name for account in wallet.left_panel.accounts], 10000), \
f'Account with {account_name} is still displayed even it should not be'

1
test/e2e/tests/crtitical_tests_prs/test_add_edit_delete_generated_account.py
View File

@ -24,7 +24,6 @@ def test_add_edit_delete_generated_account(main_screen: MainWindow, user_account
with step('Create generated wallet account'):
name = random_wallet_acc_keypair_name()
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
account_popup = wallet.left_panel.open_add_account_popup()
account_popup.set_name(name).save_changes()
authenticate_with_password(user_account)

3
test/e2e/tests/crtitical_tests_prs/test_onboarding_generate_account_back_up_seed.py
View File

@ -8,6 +8,7 @@ import constants
import driver
from constants import RandomUser
from gui.components.back_up_your_seed_phrase_banner import BackUpSeedPhraseBanner
from gui.components.signing_phrase_popup import SigningPhrasePopup
from . import marks
import configs.timeouts
@ -92,6 +93,8 @@ def test_generate_account_back_up_seed_sign_out(aut, main_window, user_account,
SplashScreen().wait_until_appears().wait_until_hidden()
if not configs.system.TEST_MODE and not configs._local.DEV_BUILD:
BetaConsentPopup().confirm()
assert SigningPhrasePopup().ok_got_it_button.is_visible
SigningPhrasePopup().confirm_phrase()
with step('Verify that user avatar background color'):
avatar_color = str(main_window.left_panel.profile_button.object.identicon.asset.color.name).upper()

3
test/e2e/tests/crtitical_tests_prs/test_onboarding_sync_with_code.py
View File

@ -3,6 +3,7 @@ import pyperclip
import pytest
from allure_commons._allure import step
from gui.components.signing_phrase_popup import SigningPhrasePopup
from . import marks
import configs.testpath
@ -79,6 +80,8 @@ def test_sync_device_during_onboarding(multiple_instances):
SplashScreen().wait_until_appears().wait_until_hidden()
if not configs.system.TEST_MODE and not configs._local.DEV_BUILD:
BetaConsentPopup().confirm()
assert SigningPhrasePopup().ok_got_it_button.is_visible
SigningPhrasePopup().confirm_phrase()
with step('Verify user details are the same with user in first instance'):
online_identifier = main_window.left_panel.open_online_identifier()

3
test/e2e/tests/onboarding/test_onboarding_negative_scenarios.py
View File

@ -6,6 +6,7 @@ import allure
import pytest
from allure_commons._allure import step
from gui.components.signing_phrase_popup import SigningPhrasePopup
from helpers.OnboardingHelper import open_generate_new_keys_view
from . import marks
@ -48,6 +49,8 @@ def test_login_with_wrong_password(aut: AUT, main_window, error: str):
SplashScreen().wait_until_appears().wait_until_hidden()
if not configs.system.TEST_MODE and not configs._local.DEV_BUILD:
BetaConsentPopup().confirm()
if SigningPhrasePopup().is_visible:
SigningPhrasePopup().confirm_phrase()
with step('Verify that the user logged in correctly'):
user_image = main_window.left_panel.open_online_identifier()

1
test/e2e/tests/settings/settings_wallet/test_wallet_rename_keypair.py
View File

@ -32,7 +32,6 @@ def test_rename_keypair_test(main_screen: MainWindow, user_account, emoji: str,
with step('To import an account within private key open add account popup and set name, emoji and color'):
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
account_popup = wallet.left_panel.open_add_account_popup()
account_popup.set_name(random_wallet_acc_keypair_name()).set_emoji(emoji)

1
test/e2e/tests/settings/settings_wallet/test_wallet_settings_account_order.py
View File

@ -44,7 +44,6 @@ def test_change_account_order_by_drag_and_drop(main_screen: MainWindow, user_acc
name_2, emoji_2, acc_emoji_2 = 'Generated 2', 'thumbsup', '👍 '
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
colors = []

2
test/e2e/tests/settings/settings_wallet/test_wallet_settings_add_account.py
View File

@ -6,7 +6,6 @@ import allure
import pytest
from allure_commons._allure import step
from constants import RandomUser
from helpers.WalletHelper import authenticate_with_password
from constants.wallet import WalletAccountPopup
from . import marks
@ -53,7 +52,6 @@ def test_add_new_account_from_wallet_settings(
with step('Verify that the account is correctly displayed in accounts list on main wallet screen'):
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
expected_account = constants.user.account_list_item(account_name, None, None)
started_at = time.monotonic()
while expected_account not in wallet.left_panel.accounts:

1
test/e2e/tests/settings/settings_wallet/test_wallet_settings_watched_addr_include_in_total_balance.py
View File

@ -29,7 +29,6 @@ pytestmark = marks
def test_settings_include_in_total_balance(main_screen: MainWindow, name, watched_address):
with (step('Open wallet on main screen and check the total balance for new account is 0')):
wallet_main_screen = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
total_balance_before = float(wallet_main_screen.left_panel.get_total_balance_value().replace("\xa0", ""
).replace(",",
""))

1
test/e2e/tests/wallet_main_screen/test_wallet_share_address_popup.py
View File

@ -18,7 +18,6 @@ def test_share_wallet_address(main_screen: MainWindow):
with step('Open wallet and choose default account'):
default_name = WalletNetworkSettings.STATUS_ACCOUNT_DEFAULT_NAME.value
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
wallet_account = wallet.left_panel.select_account(default_name)
wallet.left_panel.copy_account_address_in_context_menu(default_name)
wallet_address = pyperclip.paste()

2
test/e2e/tests/wallet_main_screen/wallet - assets tab/test_wallet_assets_sorting.py
View File

@ -40,7 +40,6 @@ def test_wallet_sort_assets(main_screen: MainWindow, address, name, dai, wrapped
with step('Add watched address with plus action button'):
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
account_popup = wallet.left_panel.open_add_account_popup()
account_popup.set_name(name).set_origin_watched_address(address).save_changes()
account_popup.wait_until_hidden()
@ -159,7 +158,6 @@ def test_custom_ordering(main_screen: MainWindow, address, name, dai, wrappedeth
with step('Add watched address with plus action button'):
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
account_popup = wallet.left_panel.open_add_account_popup()
account_popup.set_name(name).set_origin_watched_address(address).save_changes()
account_popup.wait_until_hidden()

1
test/e2e/tests/wallet_main_screen/wallet - footer actions/test_footer_actions_default_account_values.py
View File

@ -16,7 +16,6 @@ from gui.components.signing_phrase_popup import SigningPhrasePopup
def test_wallet_modals_default_account_values(main_screen, default_name, address, name, color, emoji):
with step('Add watched address with plus action button'):
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
account_popup = wallet.left_panel.open_add_account_popup()
account_popup.set_name(name).set_emoji(emoji).set_color(color).set_origin_watched_address(address).save_changes()
account_popup.wait_until_hidden()

1
test/e2e/tests/wallet_main_screen/wallet - plus button/test_plus_button_add_watched_address.py
View File

@ -25,7 +25,6 @@ def test_plus_button_add_watched_address(
name: str):
with step('Add watched address with plus action button'):
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
account_popup = wallet.left_panel.open_add_account_popup()
account_popup.set_name(name).set_emoji(emoji).set_color(color).set_origin_watched_address(address).save_changes()
account_popup.wait_until_hidden()

1
test/e2e/tests/wallet_main_screen/wallet - plus button/test_plus_button_manage_account_added_for_new_generated_seed.py
View File

@ -24,7 +24,6 @@ def test_plus_button_manage_account_added_for_new_seed(main_screen: MainWindow,
with step('Create generated seed phrase wallet account'):
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
account_popup = wallet.left_panel.open_add_account_popup()
account_popup.set_name(name).set_origin_new_seed_phrase(
keypair_name).save_changes()

1
test/e2e/tests/wallet_main_screen/wallet - plus button/test_plus_button_manage_account_from_private_key.py
View File

@ -26,7 +26,6 @@ def test_plus_button_manage_account_from_private_key(main_screen: MainWindow, us
with step('Import an account within private key'):
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
account_popup = wallet.left_panel.open_add_account_popup()
account_popup.set_name(name).set_origin_private_key(
address_pair.private_key, address_pair.private_key[:5]).save_changes()

1
test/e2e/tests/wallet_main_screen/wallet - plus button/test_plus_button_manage_account_from_seed_phrase.py
View File

@ -27,7 +27,6 @@ def test_plus_button_manage_account_from_seed_phrase(main_screen: MainWindow, us
with step('Create imported seed phrase wallet account'):
mnemonic_data = random_mnemonic()
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
account_popup = wallet.left_panel.open_add_account_popup()
account_popup.set_name(name).open_add_new_account_popup().import_new_seed_phrase(mnemonic_data.split())
account_popup.save_changes()

1
test/e2e/tests/wallet_main_screen/wallet - plus button/test_plus_button_manage_generated_account_custom_derivation_path.py
View File

@ -22,7 +22,6 @@ def test_plus_button_manage_generated_account_custom_derivation_path(main_screen
with step('Create generated wallet account'):
name = random_wallet_acc_keypair_name()
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
account_popup = wallet.left_panel.open_add_account_popup()
account_popup.set_name(name).set_derivation_path(
DerivationPathName.select_random_path_name().value,

1
test/e2e/tests/wallet_main_screen/wallet - plus button/test_plus_button_use_keycard.py
View File

@ -16,7 +16,6 @@ pytestmark = marks
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()

1
test/e2e/tests/wallet_main_screen/wallet - right click on account/test_context_menu_edit_default_account.py
View File

@ -22,7 +22,6 @@ def test_context_menu_edit_default_account(main_screen: MainWindow, user_account
with step('Select wallet account'):
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
wallet.left_panel.select_account(name)
with step("Verify default status account can't be deleted"):

3
test/e2e/tests/wallet_main_screen/wallet - right click out of account area/test_right_click_manage_watched_address.py
View File

@ -28,9 +28,8 @@ def test_right_click_manage_watch_only_account_context_menu(main_screen: MainWin
emoji_unicode: str,
name: str, new_name: str, new_color: str, new_emoji: str,
new_emoji_unicode: str):
with step('Open wallet main screen and close signing phrase dialog'):
with step('Open wallet main screen'):
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase()
with step('Create watched address from context menu'):
account_popup = wallet.left_panel.add_watched_address_from_context.click()

1
test/e2e/tests/wallet_main_screen/wallet - saved addresses/test_saved_addresses.py
View File

@ -29,7 +29,6 @@ pytestmark = marks
def test_manage_saved_address(main_screen: MainWindow, name: str, address: str, new_name: str):
with step('Add new saved address'):
wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().confirm_phrase()
wallet.left_panel.open_saved_addresses().open_add_saved_address_popup().add_saved_address(name, address)
with step('Verify that saved address is in the list of saved addresses'):