chore(@e2e): temp disable adding color and emoji for account creation

This commit is contained in:
Anastasiya 2024-10-23 12:31:23 +03:00 committed by Anastasiya
parent 7b3936522f
commit 5842600eb0
8 changed files with 21 additions and 24 deletions

View File

@ -55,13 +55,14 @@ class LeftPanel(QObject):
for account_item in driver.findAllObjects(self._wallet_account_item.real_name): for account_item in driver.findAllObjects(self._wallet_account_item.real_name):
try: try:
name = str(account_item.title) name = str(account_item.title)
color = str(account_item.asset.color.name).lower() # TODO: to fix properly with account data class implementation
emoji = '' # color = str(account_item.asset.color.name).lower()
for child in walk_children(account_item): # emoji = ''
if hasattr(child, 'emojiId'): # for child in walk_children(account_item):
emoji = str(child.emojiId) # if hasattr(child, 'emojiId'):
break # emoji = str(child.emojiId)
accounts.append(constants.user.account_list_item(name, color, emoji)) # break
accounts.append(constants.user.account_list_item(name, None, None))
except (AttributeError, RuntimeError): except (AttributeError, RuntimeError):
continue continue

View File

@ -37,7 +37,7 @@ def test_add_generated_account_restart_add_again(
wallet = main_screen.left_panel.open_wallet() wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase() SigningPhrasePopup().wait_until_appears().confirm_phrase()
account_popup = wallet.left_panel.open_add_account_popup() account_popup = wallet.left_panel.open_add_account_popup()
account_popup.set_name(name).set_emoji(emoji).set_color(color).save_changes() account_popup.set_name(name).save_changes()
authenticate_with_password(user_account) authenticate_with_password(user_account)
account_popup.wait_until_hidden() account_popup.wait_until_hidden()
@ -48,7 +48,7 @@ def test_add_generated_account_restart_add_again(
assert message == f'"{name}" successfully added' assert message == f'"{name}" successfully added'
with step('Verify that the account is correctly displayed in accounts list'): with step('Verify that the account is correctly displayed in accounts list'):
expected_account = constants.user.account_list_item(name, color.lower(), emoji_unicode) expected_account = constants.user.account_list_item(name, None, None)
started_at = time.monotonic() started_at = time.monotonic()
while expected_account not in wallet.left_panel.accounts: while expected_account not in wallet.left_panel.accounts:
time.sleep(1) time.sleep(1)
@ -64,7 +64,7 @@ def test_add_generated_account_restart_add_again(
assert not SigningPhrasePopup().is_ok_got_it_button_visible(), \ assert not SigningPhrasePopup().is_ok_got_it_button_visible(), \
f"Signing phrase should not be present because it has been hidden in the first step" 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 = wallet.left_panel.open_add_account_popup()
account_popup.set_name(name2).set_emoji(emoji2).set_color(color2).save_changes() account_popup.set_name(name2).save_changes()
authenticate_with_password(user_account) authenticate_with_password(user_account)
account_popup.wait_until_hidden() account_popup.wait_until_hidden()
@ -75,7 +75,7 @@ def test_add_generated_account_restart_add_again(
assert message == f'"{name2}" successfully added' assert message == f'"{name2}" successfully added'
with step('Verify that the account is correctly displayed in accounts list'): with step('Verify that the account is correctly displayed in accounts list'):
expected_account = constants.user.account_list_item_2(name2, color2.lower(), emoji_unicode2) expected_account = constants.user.account_list_item_2(name2, None, None)
started_at = time.monotonic() started_at = time.monotonic()
while expected_account not in wallet.left_panel.accounts: while expected_account not in wallet.left_panel.accounts:
time.sleep(1) time.sleep(1)

View File

@ -35,7 +35,7 @@ def test_delete_generated_account_from_wallet_settings(
main_screen.left_panel.open_settings().left_panel.open_wallet_settings().open_add_account_pop_up() main_screen.left_panel.open_settings().left_panel.open_wallet_settings().open_add_account_pop_up()
with step('Add a new generated account from wallet settings screen'): with step('Add a new generated account from wallet settings screen'):
add_account_popup.set_name(account_name).set_emoji(emoji).set_color(color).save_changes() add_account_popup.set_name(account_name).save_changes()
authenticate_with_password(user_account) authenticate_with_password(user_account)
add_account_popup.wait_until_hidden() add_account_popup.wait_until_hidden()

View File

@ -34,7 +34,7 @@ def test_add_edit_delete_generated_account(main_screen: MainWindow, user_account
wallet = main_screen.left_panel.open_wallet() wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase() SigningPhrasePopup().wait_until_appears().confirm_phrase()
account_popup = wallet.left_panel.open_add_account_popup() account_popup = wallet.left_panel.open_add_account_popup()
account_popup.set_name(name).set_emoji(emoji).set_color(color).save_changes() account_popup.set_name(name).save_changes()
authenticate_with_password(user_account) authenticate_with_password(user_account)
account_popup.wait_until_hidden() account_popup.wait_until_hidden()
@ -45,7 +45,7 @@ def test_add_edit_delete_generated_account(main_screen: MainWindow, user_account
assert message == f'"{name}" successfully added' assert message == f'"{name}" successfully added'
with step('Verify that the account is correctly displayed in accounts list'): with step('Verify that the account is correctly displayed in accounts list'):
expected_account = constants.user.account_list_item(name, color.lower(), emoji_unicode) expected_account = constants.user.account_list_item(name, None, None)
started_at = time.monotonic() started_at = time.monotonic()
while expected_account not in wallet.left_panel.accounts: while expected_account not in wallet.left_panel.accounts:
time.sleep(1) time.sleep(1)
@ -55,10 +55,10 @@ def test_add_edit_delete_generated_account(main_screen: MainWindow, user_account
with step('Edit wallet account'): with step('Edit wallet account'):
new_name = random_wallet_account_name() new_name = random_wallet_account_name()
account_popup = wallet.left_panel.open_edit_account_popup_from_context_menu(name) account_popup = wallet.left_panel.open_edit_account_popup_from_context_menu(name)
account_popup.set_name(new_name).set_emoji(new_emoji).set_color(new_color).save_changes() account_popup.set_name(new_name).set_color(new_color).save_changes()
with step('Verify that the account is correctly displayed in accounts list'): with step('Verify that the account is correctly displayed in accounts list'):
expected_account = constants.user.account_list_item(new_name, new_color.lower(), new_emoji_unicode) expected_account = constants.user.account_list_item(new_name, None, None)
started_at = time.monotonic() started_at = time.monotonic()
while expected_account not in wallet.left_panel.accounts: while expected_account not in wallet.left_panel.accounts:
time.sleep(1) time.sleep(1)

View File

@ -37,6 +37,7 @@ def _verify_account_order(account_order, main_screen, default_name, order):
@allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703415', @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703415',
'Account order: account order could be changed with drag&drop') 'Account order: account order could be changed with drag&drop')
@pytest.mark.case(703415) @pytest.mark.case(703415)
@pytest.mark.skip("To check if we need that test at all in e2e")
def test_change_account_order_by_drag_and_drop(main_screen: MainWindow, user_account): def test_change_account_order_by_drag_and_drop(main_screen: MainWindow, user_account):
default_name = 'Account 1' default_name = 'Account 1'
name_1, emoji_1, acc_emoji_1 = 'Generated 1', 'sunglasses', '😎 ' name_1, emoji_1, acc_emoji_1 = 'Generated 1', 'sunglasses', '😎 '

View File

@ -40,7 +40,7 @@ def test_add_new_account_from_wallet_settings(
string.digits, k=4))) string.digits, k=4)))
assert add_account_popup.get_error_message() == WalletAccountPopup.WALLET_ACCOUNT_NAME_MIN.value assert add_account_popup.get_error_message() == WalletAccountPopup.WALLET_ACCOUNT_NAME_MIN.value
add_account_popup.set_name(account_name).set_emoji(emoji).set_color(color).save_changes() add_account_popup.set_name(account_name).save_changes()
authenticate_with_password(user_account) authenticate_with_password(user_account)
add_account_popup.wait_until_hidden() add_account_popup.wait_until_hidden()
@ -54,7 +54,7 @@ def test_add_new_account_from_wallet_settings(
wallet = main_screen.left_panel.open_wallet() wallet = main_screen.left_panel.open_wallet()
SigningPhrasePopup().wait_until_appears().confirm_phrase() SigningPhrasePopup().wait_until_appears().confirm_phrase()
expected_account = constants.user.account_list_item(account_name, color.lower(), emoji_unicode) expected_account = constants.user.account_list_item(account_name, None, None)
started_at = time.monotonic() started_at = time.monotonic()
while expected_account not in wallet.left_panel.accounts: while expected_account not in wallet.left_panel.accounts:
time.sleep(1) time.sleep(1)

View File

@ -25,9 +25,7 @@ pytestmark = marks
pytest.param('0x7f1502605A2f2Cc01f9f4E7dd55e549954A8cD0C', ''.join(random.choices(string.ascii_letters + pytest.param('0x7f1502605A2f2Cc01f9f4E7dd55e549954A8cD0C', ''.join(random.choices(string.ascii_letters +
string.digits, k=20))) string.digits, k=20)))
]) ])
@pytest.mark.local_run @pytest.mark.skip(reason="https://github.com/status-im/status-desktop/issues/14862, https://github.com/status-im/status-desktop/issues/14509")
@pytest.mark.skipif('jenkins' in str(testpath.ROOT),
reason="https://github.com/status-im/status-desktop/issues/14862, https://github.com/status-im/status-desktop/issues/14509")
def test_settings_include_in_total_balance(main_screen: MainWindow, name, watched_address): 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')): 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() wallet_main_screen = main_screen.left_panel.open_wallet()

View File

@ -14,9 +14,6 @@ from gui.components.signing_phrase_popup import SigningPhrasePopup
]) ])
@pytest.mark.skip(reason="https://github.com/status-im/status-desktop/issues/14862") @pytest.mark.skip(reason="https://github.com/status-im/status-desktop/issues/14862")
@pytest.mark.skip(reason="https://github.com/status-im/status-desktop/issues/14509") @pytest.mark.skip(reason="https://github.com/status-im/status-desktop/issues/14509")
@pytest.mark.local_run
@pytest.mark.skipif('jenkins' in str(testpath.ROOT),
reason="https://github.com/status-im/status-desktop/issues/14862, https://github.com/status-im/status-desktop/issues/14509")
def test_wallet_modals_default_account_values(main_screen, default_name, address, name, color, emoji): def test_wallet_modals_default_account_values(main_screen, default_name, address, name, color, emoji):
with step('Add watched address with plus action button'): with step('Add watched address with plus action button'):
wallet = main_screen.left_panel.open_wallet() wallet = main_screen.left_panel.open_wallet()