From 923c9d6284378a7cb1cf86faee8fa82db3285d09 Mon Sep 17 00:00:00 2001 From: Valentina1133 <141633821+Valentina1133@users.noreply.github.com> Date: Wed, 25 Oct 2023 14:34:00 +0200 Subject: [PATCH] Fixed get toast messages method (#209) --- .../components/wallet/wallet_toast_message.py | 23 +++++++++++-------- test/e2e/gui/screens/settings_wallet.py | 8 +++---- ...t_wallet_settings_networks_testnet_mode.py | 3 ++- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/test/e2e/gui/components/wallet/wallet_toast_message.py b/test/e2e/gui/components/wallet/wallet_toast_message.py index 0cd566633e..591ce391a0 100644 --- a/test/e2e/gui/components/wallet/wallet_toast_message.py +++ b/test/e2e/gui/components/wallet/wallet_toast_message.py @@ -1,18 +1,23 @@ import allure -from driver import objects_access +import driver from gui.elements.object import QObject class WalletToastMessage(QObject): def __init__(self): - super(WalletToastMessage, self).__init__('ephemeralNotificationList_StatusToastMessage') - self._wallet_toast_messages_list = QObject('mainWallet_Ephemeral_Notification_List') + super(WalletToastMessage, self).__init__('mainWallet_Ephemeral_Notification_List') + self._wallet_toast_message = QObject('ephemeralNotificationList_StatusToastMessage') - @allure.step('Check message at the bottom') - def get_toast_message(self, name: str): - for item in objects_access.walk_children(self._wallet_toast_messages_list.object): - if getattr(item, 'text', '') == name: - return item - raise LookupError(f'Wallet toast message: {name} not found') + @property + @allure.step('Get toast messages') + def get_toast_messages(self): + messages = [] + for obj in driver.findAllObjects(self._wallet_toast_message.real_name): + messages.append(str(obj.primaryText)) + if len(messages) == 0: + raise LookupError( + 'Toast messages were not found') + else: + return messages diff --git a/test/e2e/gui/screens/settings_wallet.py b/test/e2e/gui/screens/settings_wallet.py index c7b70bb825..9553f695ed 100644 --- a/test/e2e/gui/screens/settings_wallet.py +++ b/test/e2e/gui/screens/settings_wallet.py @@ -217,11 +217,11 @@ class EditNetworkSettings(WalletSettingsView): def check_toast_message(self, network_tab): match network_tab: case WalletNetworkSettings.EDIT_NETWORK_LIVE_TAB.value: - WalletToastMessage().get_toast_message( - WalletNetworkSettings.REVERT_TO_DEFAULT_LIVE_MAINNET_TOAST_MESSAGE.value) + assert (WalletNetworkSettings.REVERT_TO_DEFAULT_LIVE_MAINNET_TOAST_MESSAGE.value in + WalletToastMessage().get_toast_messages) case WalletNetworkSettings.EDIT_NETWORK_TEST_TAB.value: - WalletToastMessage().get_toast_message( - WalletNetworkSettings.REVERT_TO_DEFAULT_TEST_MAINNET_TOAST_MESSAGE.value) + assert (WalletNetworkSettings.REVERT_TO_DEFAULT_TEST_MAINNET_TOAST_MESSAGE.value in + WalletToastMessage().get_toast_messages) @allure.step('Verify elements for the edit network view') def check_available_elements_on_edit_view(self, network_tab): diff --git a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_networks_testnet_mode.py b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_networks_testnet_mode.py index 044bf88d66..e89116c3f1 100644 --- a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_networks_testnet_mode.py +++ b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_networks_testnet_mode.py @@ -28,7 +28,8 @@ def test_switch_testnet_mode(main_screen: MainWindow): networks.switch_testnet_mode_toggle().click_turn_on_testnet_mode_in_testnet_modal() with step('Verify that Testnet mode turned on'): - WalletToastMessage().get_toast_message(WalletNetworkSettings.TESTNET_ENABLED_TOAST_MESSAGE.value) + assert WalletNetworkSettings.TESTNET_ENABLED_TOAST_MESSAGE.value in WalletToastMessage().get_toast_messages + assert len(WalletToastMessage().get_toast_messages) == 1 TestnetModeBanner().wait_until_appears() assert networks.is_testnet_mode_toggle_checked(), f"Testnet toggle if off when it should not"