diff --git a/test/e2e/ci/Jenkinsfile b/test/e2e/ci/Jenkinsfile index d74ff217a4..8927aa58d2 100644 --- a/test/e2e/ci/Jenkinsfile +++ b/test/e2e/ci/Jenkinsfile @@ -7,6 +7,10 @@ pipeline { } environment { + QT_QPA_PLATFORMTHEME = "qt5ct" + QT_LOGGING_DEBUG = 1 + QT_DEBUG_PLUGINS = 1 + SQUISH_DIR = "/opt/squish-runner-7.1-20230222-1555" PYTHONPATH = "${SQUISH_DIR}/lib:${SQUISH_DIR}/lib/python:${PYTHONPATH}" LD_LIBRARY_PATH = "${SQUISH_DIR}/lib:${SQUISH_DIR}/python3/lib:${LD_LIBRARY_PATH}" @@ -16,11 +20,6 @@ pipeline { } parameters { - string( - name: 'BRANCH', - description: 'Paste a branch name from test repository.', - defaultValue: 'master' - ) string( name: 'BUILD', description: 'Paste a number of PR that you want to test.', @@ -67,8 +66,7 @@ pipeline { ) def pkg_path = "${env.WORKSPACE}/${utils.findFile('tmp/pkg/*-x86_64.tar.gz')}" sh "tar -zxvf '${pkg_path}' -C '${env.WORKSPACE}/tmp'" - def app_dir = "${env.WORKSPACE}/${utils.findFile('tmp/*.AppImage')}" - env.APP_DIR = app_dir + env.APP_DIR = "${env.WORKSPACE}/${utils.findFile('tmp/*.AppImage')}" } } } @@ -82,9 +80,10 @@ pipeline { steps { wrap([ $class: 'Xvfb', autoDisplayName: true, - parallelBuild: false, + parallelBuild: true, screen: '1920x1080x24', ]) { script { + sh "fluxbox &" env.TESTRAIL_USR = "${CREDS_USR}" env.TESTRAIL_PWD = "${CREDS_PSW}" def cmd = '' diff --git a/test/e2e/gui/components/back_up_your_seed_phrase_banner.py b/test/e2e/gui/components/back_up_your_seed_phrase_banner.py index 39924c4c35..0d5e93f1ac 100644 --- a/test/e2e/gui/components/back_up_your_seed_phrase_banner.py +++ b/test/e2e/gui/components/back_up_your_seed_phrase_banner.py @@ -1,4 +1,4 @@ -from gui.elements.qt.object import QObject +from gui.elements.object import QObject class BackUpSeedPhraseBanner(QObject): diff --git a/test/e2e/gui/components/back_up_your_seed_phrase_popup.py b/test/e2e/gui/components/back_up_your_seed_phrase_popup.py index ab8b36bbf8..c90b6108fc 100644 --- a/test/e2e/gui/components/back_up_your_seed_phrase_popup.py +++ b/test/e2e/gui/components/back_up_your_seed_phrase_popup.py @@ -4,13 +4,11 @@ import typing import allure -import configs.timeouts -import driver from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.check_box import CheckBox -from gui.elements.qt.object import QObject -from gui.elements.qt.text_edit import TextEdit +from gui.elements.button import Button +from gui.elements.check_box import CheckBox +from gui.elements.object import QObject +from gui.elements.text_edit import TextEdit class BackUpYourSeedPhrasePopUp(BasePopup): diff --git a/test/e2e/gui/components/base_popup.py b/test/e2e/gui/components/base_popup.py index 4c6d189721..362e87cb04 100644 --- a/test/e2e/gui/components/base_popup.py +++ b/test/e2e/gui/components/base_popup.py @@ -1,7 +1,7 @@ import allure import driver -from gui.elements.qt.object import QObject +from gui.elements.object import QObject class BasePopup(QObject): diff --git a/test/e2e/gui/components/change_password_popup.py b/test/e2e/gui/components/change_password_popup.py index 7ba52d5a86..43c11bb8c8 100644 --- a/test/e2e/gui/components/change_password_popup.py +++ b/test/e2e/gui/components/change_password_popup.py @@ -1,8 +1,8 @@ import allure from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.text_edit import TextEdit +from gui.elements.button import Button +from gui.elements.text_edit import TextEdit class ChangePasswordPopup(BasePopup): diff --git a/test/e2e/gui/components/color_select_popup.py b/test/e2e/gui/components/color_select_popup.py index 6c7f7cbfa0..24ba88e29b 100644 --- a/test/e2e/gui/components/color_select_popup.py +++ b/test/e2e/gui/components/color_select_popup.py @@ -2,8 +2,8 @@ import allure import configs from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.text_edit import TextEdit +from gui.elements.button import Button +from gui.elements.text_edit import TextEdit class ColorSelectPopup(BasePopup): diff --git a/test/e2e/gui/components/community/authenticate_popup.py b/test/e2e/gui/components/community/authenticate_popup.py index 72c4ab1b3a..7a59920e9b 100644 --- a/test/e2e/gui/components/community/authenticate_popup.py +++ b/test/e2e/gui/components/community/authenticate_popup.py @@ -2,9 +2,9 @@ import allure import configs from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.object import QObject -from gui.elements.qt.text_edit import TextEdit +from gui.elements.button import Button +from gui.elements.object import QObject +from gui.elements.text_edit import TextEdit class AuthenticatePopup(BasePopup): diff --git a/test/e2e/gui/components/community/community_channel_popups.py b/test/e2e/gui/components/community/community_channel_popups.py index 729dff5e50..84c2aaf6f7 100644 --- a/test/e2e/gui/components/community/community_channel_popups.py +++ b/test/e2e/gui/components/community/community_channel_popups.py @@ -1,8 +1,8 @@ import configs from gui.components.base_popup import BasePopup from gui.components.emoji_popup import EmojiPopup -from gui.elements.qt.button import Button -from gui.elements.qt.text_edit import TextEdit +from gui.elements.button import Button +from gui.elements.text_edit import TextEdit class ChannelPopup(BasePopup): diff --git a/test/e2e/gui/components/community/create_community_popups.py b/test/e2e/gui/components/community/create_community_popups.py index ad0b50c010..cc4f04b124 100644 --- a/test/e2e/gui/components/community/create_community_popups.py +++ b/test/e2e/gui/components/community/create_community_popups.py @@ -8,10 +8,10 @@ from gui.components.color_select_popup import ColorSelectPopup from gui.components.community.tags_select_popup import TagsSelectPopup from gui.components.os.open_file_dialogs import OpenFileDialog from gui.components.picture_edit_popup import PictureEditPopup -from gui.elements.qt.button import Button -from gui.elements.qt.check_box import CheckBox -from gui.elements.qt.scroll import Scroll -from gui.elements.qt.text_edit import TextEdit +from gui.elements.button import Button +from gui.elements.check_box import CheckBox +from gui.elements.scroll import Scroll +from gui.elements.text_edit import TextEdit from gui.screens.community import CommunityScreen diff --git a/test/e2e/gui/components/community/invite_contacts.py b/test/e2e/gui/components/community/invite_contacts.py index 6dac5fe1e0..2351c4dbd4 100644 --- a/test/e2e/gui/components/community/invite_contacts.py +++ b/test/e2e/gui/components/community/invite_contacts.py @@ -5,9 +5,9 @@ import allure import configs.timeouts import driver from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.object import QObject -from gui.elements.qt.text_edit import TextEdit +from gui.elements.button import Button +from gui.elements.object import QObject +from gui.elements.text_edit import TextEdit class InviteContactsPopup(BasePopup): diff --git a/test/e2e/gui/components/community/tags_select_popup.py b/test/e2e/gui/components/community/tags_select_popup.py index bad70ed124..3eba16ca3b 100644 --- a/test/e2e/gui/components/community/tags_select_popup.py +++ b/test/e2e/gui/components/community/tags_select_popup.py @@ -6,8 +6,8 @@ import allure import configs import driver from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.object import QObject +from gui.elements.button import Button +from gui.elements.object import QObject class TagsSelectPopup(BasePopup): diff --git a/test/e2e/gui/components/community/welcome_community.py b/test/e2e/gui/components/community/welcome_community.py index 523d8471e6..01a645201f 100644 --- a/test/e2e/gui/components/community/welcome_community.py +++ b/test/e2e/gui/components/community/welcome_community.py @@ -2,9 +2,9 @@ import allure from gui.components.community.authenticate_popup import AuthenticatePopup from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.object import QObject -from gui.elements.qt.text_label import TextLabel +from gui.elements.button import Button +from gui.elements.object import QObject +from gui.elements.text_label import TextLabel from scripts.tools.image import Image diff --git a/test/e2e/gui/components/context_menu.py b/test/e2e/gui/components/context_menu.py index 83d171e53c..34452e1067 100644 --- a/test/e2e/gui/components/context_menu.py +++ b/test/e2e/gui/components/context_menu.py @@ -1,6 +1,6 @@ import allure -from gui.elements.qt.object import QObject +from gui.elements.object import QObject class ContextMenu(QObject): diff --git a/test/e2e/gui/components/delete_popup.py b/test/e2e/gui/components/delete_popup.py index cb7040efca..603c21501f 100644 --- a/test/e2e/gui/components/delete_popup.py +++ b/test/e2e/gui/components/delete_popup.py @@ -1,7 +1,7 @@ import allure from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button +from gui.elements.button import Button class DeletePopup(BasePopup): diff --git a/test/e2e/gui/components/emoji_popup.py b/test/e2e/gui/components/emoji_popup.py index d11c125f4e..0bae9f5efe 100644 --- a/test/e2e/gui/components/emoji_popup.py +++ b/test/e2e/gui/components/emoji_popup.py @@ -2,8 +2,8 @@ import allure import configs from .base_popup import BasePopup -from ..elements.qt.object import QObject -from ..elements.qt.text_edit import TextEdit +from gui.elements.object import QObject +from gui.elements.text_edit import TextEdit class EmojiPopup(BasePopup): diff --git a/test/e2e/gui/components/onboarding/before_started_popup.py b/test/e2e/gui/components/onboarding/before_started_popup.py index b0752d5674..9ea5380658 100644 --- a/test/e2e/gui/components/onboarding/before_started_popup.py +++ b/test/e2e/gui/components/onboarding/before_started_popup.py @@ -1,9 +1,9 @@ import allure from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.check_box import CheckBox -from gui.elements.qt.object import QObject +from gui.elements.button import Button +from gui.elements.check_box import CheckBox +from gui.elements.object import QObject class BeforeStartedPopUp(BasePopup): diff --git a/test/e2e/gui/components/onboarding/beta_consent_popup.py b/test/e2e/gui/components/onboarding/beta_consent_popup.py index d139013e32..1a3100214a 100644 --- a/test/e2e/gui/components/onboarding/beta_consent_popup.py +++ b/test/e2e/gui/components/onboarding/beta_consent_popup.py @@ -1,8 +1,8 @@ import allure from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.check_box import CheckBox +from gui.elements.button import Button +from gui.elements.check_box import CheckBox class BetaConsentPopup(BasePopup): diff --git a/test/e2e/gui/components/os/lin/__init__.py b/test/e2e/gui/components/os/lin/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/e2e/gui/components/os/lin/open_file_dialog.py b/test/e2e/gui/components/os/lin/open_file_dialog.py deleted file mode 100644 index 06b56466b5..0000000000 --- a/test/e2e/gui/components/os/lin/open_file_dialog.py +++ /dev/null @@ -1,22 +0,0 @@ -import allure - -import constants.commands -import driver -from gui.elements.qt.button import Button -from gui.elements.qt.text_edit import TextEdit -from gui.elements.qt.window import Window -from scripts.utils.system_path import SystemPath - - -class OpenFileDialog(Window): - - def __init__(self): - super(OpenFileDialog, self).__init__('please_choose_an_image_QQuickWindow') - self._path_text_edit = TextEdit('titleBar_textInput_TextInputWithHandles') - self._open_button = Button('please_choose_an_image_Open_Button') - - @allure.step('Open file') - def open_file(self, fp: SystemPath): - self._path_text_edit.text = str(fp) - driver.type(self._path_text_edit.object, f'<{constants.commands.RETURN}>') - self.wait_until_hidden() diff --git a/test/e2e/gui/components/os/mac/__init__.py b/test/e2e/gui/components/os/mac/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/e2e/gui/components/os/mac/open_file_dialogs.py b/test/e2e/gui/components/os/mac/open_file_dialogs.py deleted file mode 100644 index 8d0b545a3c..0000000000 --- a/test/e2e/gui/components/os/mac/open_file_dialogs.py +++ /dev/null @@ -1,59 +0,0 @@ -import logging -import time - -import allure - -import constants -import driver -from gui.elements.os.mac.button import Button -from gui.elements.os.mac.object import NativeObject -from gui.elements.os.mac.text_edit import TextEdit -from scripts.utils.system_path import SystemPath - -_logger = logging.getLogger(__name__) - - -class OpenFileDialog(NativeObject): - - def __init__(self): - super(OpenFileDialog, self).__init__('openFileDialog') - self._open_button = Button('openButton') - - def _open_go_to_dialog(self, attempt: int = 2): - # Set focus - driver.nativeMouseClick(int(self.bounds.x + 10), int(self.bounds.y + 10), driver.Qt.LeftButton) - time.sleep(1) - driver.nativeType(f'<{constants.commands.OPEN_GOTO}>') - try: - return _GoToDialog().wait_until_appears() - except LookupError as err: - _logger.debug(err) - if attempt: - self._open_go_to_dialog(attempt - 1) - else: - raise err - - @allure.step('Open file') - def open_file(self, fp: SystemPath): - # Set focus - driver.nativeMouseClick(int(self.bounds.x + 10), int(self.bounds.y + 10), driver.Qt.LeftButton) - time.sleep(1) - driver.nativeType(f'<{constants.commands.OPEN_GOTO}>') - self._open_go_to_dialog().select_file(fp) - self._open_button.click() - self.wait_until_hidden() - - -class _GoToDialog(NativeObject): - - def __init__(self): - self.go_to_text_edit = TextEdit('pathTextField') - super(_GoToDialog, self).__init__('goToDialog') - - @allure.step('Select file') - def select_file(self, fp: SystemPath): - self.go_to_text_edit.text = str(fp) - driver.nativeMouseClick(int(self.bounds.x + 10), int(self.bounds.y + 10), driver.Qt.LeftButton) - time.sleep(1) - driver.nativeType(f'<{constants.commands.RETURN}>') - self.wait_until_hidden() diff --git a/test/e2e/gui/components/os/open_file_dialogs.py b/test/e2e/gui/components/os/open_file_dialogs.py index 5a40ba9463..90f45716da 100644 --- a/test/e2e/gui/components/os/open_file_dialogs.py +++ b/test/e2e/gui/components/os/open_file_dialogs.py @@ -1,12 +1,24 @@ -import configs +import logging -if configs.system.IS_WIN: - from .win.open_file_dialogs import OpenFileDialog as BaseOpenFileDialog -elif configs.system.IS_MAC: - from .mac.open_file_dialogs import OpenFileDialog as BaseOpenFileDialog -else: - from .lin.open_file_dialog import OpenFileDialog as BaseOpenFileDialog +import allure + +import driver +from gui.elements.text_edit import TextEdit +from gui.elements.window import Window +from scripts.utils.system_path import SystemPath + +_logger = logging.getLogger(__name__) -class OpenFileDialog(BaseOpenFileDialog): - pass +class OpenFileDialog(Window): + + def __init__(self): + super(OpenFileDialog, self).__init__('chooseAnImageALogo_QQuickWindow') + self._file_path_text_edit = TextEdit('titleBar_currentPathField_TextField') + + @allure.step('Open file') + def open_file(self, fp: SystemPath): + driver.type(self._file_path_text_edit.object, "") + driver.type(self._file_path_text_edit.object, str(fp)) + driver.type(self._file_path_text_edit.object, "") + self.wait_until_hidden() diff --git a/test/e2e/gui/components/os/win/__init__.py b/test/e2e/gui/components/os/win/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/e2e/gui/components/os/win/open_file_dialogs.py b/test/e2e/gui/components/os/win/open_file_dialogs.py deleted file mode 100644 index 722ea0073c..0000000000 --- a/test/e2e/gui/components/os/win/open_file_dialogs.py +++ /dev/null @@ -1,24 +0,0 @@ -import logging - -import allure - -from gui.elements.os.win.button import Button -from gui.elements.os.win.object import NativeObject -from gui.elements.os.win.text_edit import TextEdit -from scripts.utils.system_path import SystemPath - -_logger = logging.getLogger(__name__) - - -class OpenFileDialog(NativeObject): - - def __init__(self): - super().__init__('file_Dialog') - self._file_path_text_edit = TextEdit('choose_file_Edit') - self._select_button = Button('choose_Open_Button') - - @allure.step('Open file') - def open_file(self, fp: SystemPath): - self._file_path_text_edit.text = str(fp) - self._select_button.click() - self.wait_until_hidden() diff --git a/test/e2e/gui/components/picture_edit_popup.py b/test/e2e/gui/components/picture_edit_popup.py index 1985e58919..35dfdaae93 100644 --- a/test/e2e/gui/components/picture_edit_popup.py +++ b/test/e2e/gui/components/picture_edit_popup.py @@ -5,9 +5,9 @@ import allure import driver.mouse from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.object import QObject -from gui.elements.qt.slider import Slider +from gui.elements.button import Button +from gui.elements.object import QObject +from gui.elements.slider import Slider shift_image = namedtuple('Shift', ['left', 'right', 'top', 'bottom']) diff --git a/test/e2e/gui/components/profile_popup.py b/test/e2e/gui/components/profile_popup.py index 0e56b9f9af..850dd846c2 100644 --- a/test/e2e/gui/components/profile_popup.py +++ b/test/e2e/gui/components/profile_popup.py @@ -4,9 +4,9 @@ import pyperclip import constants import driver from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.object import QObject -from gui.elements.qt.text_label import TextLabel +from gui.elements.button import Button +from gui.elements.object import QObject +from gui.elements.text_label import TextLabel from gui.screens.settings import ProfileSettingsView from scripts.tools.image import Image diff --git a/test/e2e/gui/components/settings/changes_detected_popup.py b/test/e2e/gui/components/settings/changes_detected_popup.py index afc6f6245f..fee2700147 100644 --- a/test/e2e/gui/components/settings/changes_detected_popup.py +++ b/test/e2e/gui/components/settings/changes_detected_popup.py @@ -1,9 +1,7 @@ import allure -from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.object import QObject -from gui.elements.qt.text_edit import TextEdit +from gui.elements.button import Button +from gui.elements.object import QObject class ChangesDetectedToastMessage(QObject): diff --git a/test/e2e/gui/components/settings/send_contact_request_popup.py b/test/e2e/gui/components/settings/send_contact_request_popup.py index 7b7f47cfa4..afbc58b1ca 100644 --- a/test/e2e/gui/components/settings/send_contact_request_popup.py +++ b/test/e2e/gui/components/settings/send_contact_request_popup.py @@ -1,8 +1,8 @@ import allure from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.text_edit import TextEdit +from gui.elements.button import Button +from gui.elements.text_edit import TextEdit class SendContactRequest(BasePopup): diff --git a/test/e2e/gui/components/settings/sync_new_device_popup.py b/test/e2e/gui/components/settings/sync_new_device_popup.py index 79a6bb4b97..4c338a2ac3 100644 --- a/test/e2e/gui/components/settings/sync_new_device_popup.py +++ b/test/e2e/gui/components/settings/sync_new_device_popup.py @@ -2,8 +2,8 @@ import allure import pyperclip from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.text_edit import TextEdit +from gui.elements.button import Button +from gui.elements.text_edit import TextEdit class SyncNewDevicePopup(BasePopup): diff --git a/test/e2e/gui/components/signing_phrase_popup.py b/test/e2e/gui/components/signing_phrase_popup.py index c556043e77..496bc82d30 100644 --- a/test/e2e/gui/components/signing_phrase_popup.py +++ b/test/e2e/gui/components/signing_phrase_popup.py @@ -1,7 +1,7 @@ import allure from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button +from gui.elements.button import Button class SigningPhrasePopup(BasePopup): diff --git a/test/e2e/gui/components/social_links_popup.py b/test/e2e/gui/components/social_links_popup.py index aaee6f4fc5..4faf10f934 100644 --- a/test/e2e/gui/components/social_links_popup.py +++ b/test/e2e/gui/components/social_links_popup.py @@ -4,9 +4,9 @@ import typing import allure from .base_popup import BasePopup -from ..elements.qt.button import Button -from ..elements.qt.object import QObject -from ..elements.qt.text_edit import TextEdit +from gui.elements.button import Button +from gui.elements.object import QObject +from gui.elements.text_edit import TextEdit class SocialLinksPopup(BasePopup): diff --git a/test/e2e/gui/components/splash_screen.py b/test/e2e/gui/components/splash_screen.py index b9e7a7bde0..44a451e13d 100644 --- a/test/e2e/gui/components/splash_screen.py +++ b/test/e2e/gui/components/splash_screen.py @@ -2,7 +2,7 @@ import allure import configs -from gui.elements.qt.object import QObject +from gui.elements.object import QObject class SplashScreen(QObject): diff --git a/test/e2e/gui/components/user_canvas.py b/test/e2e/gui/components/user_canvas.py index 11b6648dc5..e7691ddae0 100644 --- a/test/e2e/gui/components/user_canvas.py +++ b/test/e2e/gui/components/user_canvas.py @@ -6,9 +6,9 @@ import configs import constants import driver from gui.components.profile_popup import ProfilePopup -from gui.elements.qt.button import Button -from gui.elements.qt.object import QObject -from gui.elements.qt.text_label import TextLabel +from gui.elements.button import Button +from gui.elements.object import QObject +from gui.elements.text_label import TextLabel class UserCanvas(QObject): diff --git a/test/e2e/gui/components/wallet/add_saved_address_popup.py b/test/e2e/gui/components/wallet/add_saved_address_popup.py index 1e7ceec7a3..78cd162ec3 100644 --- a/test/e2e/gui/components/wallet/add_saved_address_popup.py +++ b/test/e2e/gui/components/wallet/add_saved_address_popup.py @@ -1,11 +1,11 @@ import allure from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.check_box import CheckBox -from gui.elements.qt.object import QObject -from gui.elements.qt.text_edit import TextEdit -from gui.elements.qt.text_label import TextLabel +from gui.elements.button import Button +from gui.elements.check_box import CheckBox +from gui.elements.object import QObject +from gui.elements.text_edit import TextEdit +from gui.elements.text_label import TextLabel class AddSavedAddressPopup(BasePopup): diff --git a/test/e2e/gui/components/wallet/authenticate_popup.py b/test/e2e/gui/components/wallet/authenticate_popup.py index cc0f7fbb93..7706f34092 100644 --- a/test/e2e/gui/components/wallet/authenticate_popup.py +++ b/test/e2e/gui/components/wallet/authenticate_popup.py @@ -1,8 +1,8 @@ import allure -from gui.elements.qt.button import Button -from gui.elements.qt.text_edit import TextEdit -from gui.elements.qt.object import QObject +from gui.elements.button import Button +from gui.elements.text_edit import TextEdit +from gui.elements.object import QObject class AuthenticatePopup(QObject): diff --git a/test/e2e/gui/components/wallet/back_up_your_seed_phrase_popup.py b/test/e2e/gui/components/wallet/back_up_your_seed_phrase_popup.py index 6aeded37d6..4195950736 100644 --- a/test/e2e/gui/components/wallet/back_up_your_seed_phrase_popup.py +++ b/test/e2e/gui/components/wallet/back_up_your_seed_phrase_popup.py @@ -3,12 +3,11 @@ import typing import allure import configs -from driver.toplevel_window import set_focus from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.check_box import CheckBox -from gui.elements.qt.object import QObject -from gui.elements.qt.text_edit import TextEdit +from gui.elements.button import Button +from gui.elements.check_box import CheckBox +from gui.elements.object import QObject +from gui.elements.text_edit import TextEdit class BackUpYourSeedPhrasePopUp(BasePopup): diff --git a/test/e2e/gui/components/wallet/confirmation_popup.py b/test/e2e/gui/components/wallet/confirmation_popup.py index e5aaecfd7c..497d08715a 100644 --- a/test/e2e/gui/components/wallet/confirmation_popup.py +++ b/test/e2e/gui/components/wallet/confirmation_popup.py @@ -1,7 +1,7 @@ import allure -from gui.elements.qt.button import Button -from gui.elements.qt.object import QObject +from gui.elements.button import Button +from gui.elements.object import QObject class ConfirmationPopup(QObject): diff --git a/test/e2e/gui/components/wallet/remove_wallet_account_popup.py b/test/e2e/gui/components/wallet/remove_wallet_account_popup.py index ffb6e5fce3..f91629fa3c 100644 --- a/test/e2e/gui/components/wallet/remove_wallet_account_popup.py +++ b/test/e2e/gui/components/wallet/remove_wallet_account_popup.py @@ -2,8 +2,8 @@ import allure import configs from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button -from gui.elements.qt.check_box import CheckBox +from gui.elements.button import Button +from gui.elements.check_box import CheckBox class RemoveWalletAccountPopup(BasePopup): diff --git a/test/e2e/gui/components/wallet/testnet_mode_banner.py b/test/e2e/gui/components/wallet/testnet_mode_banner.py index daaa372a80..4e774488a0 100644 --- a/test/e2e/gui/components/wallet/testnet_mode_banner.py +++ b/test/e2e/gui/components/wallet/testnet_mode_banner.py @@ -1,5 +1,5 @@ -from gui.elements.qt.object import QObject -from gui.elements.qt.button import Button +from gui.elements.object import QObject +from gui.elements.button import Button class TestnetModeBanner(QObject): diff --git a/test/e2e/gui/components/wallet/testnet_mode_popup.py b/test/e2e/gui/components/wallet/testnet_mode_popup.py index 67095a3ff4..c72a8a8884 100644 --- a/test/e2e/gui/components/wallet/testnet_mode_popup.py +++ b/test/e2e/gui/components/wallet/testnet_mode_popup.py @@ -1,7 +1,7 @@ import allure from gui.components.base_popup import BasePopup -from gui.elements.qt.button import Button +from gui.elements.button import Button class TestnetModePopup(BasePopup): diff --git a/test/e2e/gui/components/wallet/wallet_account_popups.py b/test/e2e/gui/components/wallet/wallet_account_popups.py index 9916577c0d..065b0460b1 100644 --- a/test/e2e/gui/components/wallet/wallet_account_popups.py +++ b/test/e2e/gui/components/wallet/wallet_account_popups.py @@ -9,11 +9,11 @@ import driver from gui.components.wallet.back_up_your_seed_phrase_popup import BackUpYourSeedPhrasePopUp from gui.components.base_popup import BasePopup from gui.components.emoji_popup import EmojiPopup -from gui.elements.qt.button import Button -from gui.elements.qt.check_box import CheckBox -from gui.elements.qt.object import QObject -from gui.elements.qt.scroll import Scroll -from gui.elements.qt.text_edit import TextEdit +from gui.elements.button import Button +from gui.elements.check_box import CheckBox +from gui.elements.object import QObject +from gui.elements.scroll import Scroll +from gui.elements.text_edit import TextEdit GENERATED_PAGES_LIMIT = 20 diff --git a/test/e2e/gui/components/wallet/wallet_toast_message.py b/test/e2e/gui/components/wallet/wallet_toast_message.py index cbd19bc7f2..0cd566633e 100644 --- a/test/e2e/gui/components/wallet/wallet_toast_message.py +++ b/test/e2e/gui/components/wallet/wallet_toast_message.py @@ -1,7 +1,7 @@ import allure from driver import objects_access -from gui.elements.qt.object import QObject +from gui.elements.object import QObject class WalletToastMessage(QObject): diff --git a/test/e2e/gui/elements/qt/button.py b/test/e2e/gui/elements/button.py similarity index 91% rename from test/e2e/gui/elements/qt/button.py rename to test/e2e/gui/elements/button.py index 16d4b1f043..d838ee9b8c 100644 --- a/test/e2e/gui/elements/qt/button.py +++ b/test/e2e/gui/elements/button.py @@ -3,7 +3,7 @@ import typing import allure import driver -from gui.elements.qt.object import QObject +from gui.elements.object import QObject class Button(QObject): diff --git a/test/e2e/gui/elements/qt/check_box.py b/test/e2e/gui/elements/check_box.py similarity index 86% rename from test/e2e/gui/elements/qt/check_box.py rename to test/e2e/gui/elements/check_box.py index b3a26b4124..49a21e5eaf 100644 --- a/test/e2e/gui/elements/qt/check_box.py +++ b/test/e2e/gui/elements/check_box.py @@ -2,7 +2,7 @@ import allure import configs import driver -from gui.elements.qt.object import QObject +from gui.elements.object import QObject class CheckBox(QObject): diff --git a/test/e2e/gui/elements/qt/list.py b/test/e2e/gui/elements/list.py similarity index 94% rename from test/e2e/gui/elements/qt/list.py rename to test/e2e/gui/elements/list.py index 577fb5dff1..248f8ee4a3 100644 --- a/test/e2e/gui/elements/qt/list.py +++ b/test/e2e/gui/elements/list.py @@ -5,7 +5,7 @@ import allure import configs import driver -from gui.elements.qt.object import QObject +from gui.elements.object import QObject class List(QObject): diff --git a/test/e2e/gui/elements/qt/object.py b/test/e2e/gui/elements/object.py similarity index 100% rename from test/e2e/gui/elements/qt/object.py rename to test/e2e/gui/elements/object.py diff --git a/test/e2e/gui/elements/os/__init__.py b/test/e2e/gui/elements/os/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/e2e/gui/elements/os/mac/__init__.py b/test/e2e/gui/elements/os/mac/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/e2e/gui/elements/os/mac/button.py b/test/e2e/gui/elements/os/mac/button.py deleted file mode 100644 index bc5838f215..0000000000 --- a/test/e2e/gui/elements/os/mac/button.py +++ /dev/null @@ -1,10 +0,0 @@ -import allure - -from .object import NativeObject - - -class Button(NativeObject): - - @allure.step('Click {0}') - def click(self): - self.object.Press() diff --git a/test/e2e/gui/elements/os/mac/object.py b/test/e2e/gui/elements/os/mac/object.py deleted file mode 100644 index 5c8d17959e..0000000000 --- a/test/e2e/gui/elements/os/mac/object.py +++ /dev/null @@ -1,48 +0,0 @@ -import logging - -import allure - -import driver -from gui.elements.base_object import BaseObject - -_logger = logging.getLogger(__name__) - - -class NativeObject(BaseObject): - - def __init__(self, name: str): - super().__init__(name) - - @property - @allure.step('Get object {0}') - def object(self): - return driver.atomacos.wait_for_object(self.real_name) - - @property - @allure.step('Get visible {0}') - def is_visible(self): - try: - return self.object is not None - except (LookupError, ValueError) as err: - _logger.debug(err) - return False - - @property - @allure.step('Get bounds {0}') - def bounds(self): - return self.object.AXFrame - - @property - @allure.step('Get width {0}') - def width(self) -> int: - return int(self.object.AXSize.width) - - @property - @allure.step('Get height {0}') - def height(self) -> int: - return int(self.object.AXSize.height) - - @property - @allure.step('Get central coordinate {0}') - def center(self): - return self.bounds.center() diff --git a/test/e2e/gui/elements/os/mac/text_edit.py b/test/e2e/gui/elements/os/mac/text_edit.py deleted file mode 100644 index dad05c17a4..0000000000 --- a/test/e2e/gui/elements/os/mac/text_edit.py +++ /dev/null @@ -1,14 +0,0 @@ -import driver -from .object import NativeObject - - -class TextEdit(NativeObject): - - @property - def text(self) -> str: - return str(self.object.AXValue) - - @text.setter - def text(self, value: str): - self.object.setString('AXValue', value) - driver.waitFor(lambda: self.text == value) diff --git a/test/e2e/gui/elements/os/win/__init__.py b/test/e2e/gui/elements/os/win/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/e2e/gui/elements/os/win/button.py b/test/e2e/gui/elements/os/win/button.py deleted file mode 100644 index 47399c7b40..0000000000 --- a/test/e2e/gui/elements/os/win/button.py +++ /dev/null @@ -1,10 +0,0 @@ -import allure - -from .object import NativeObject - - -class Button(NativeObject): - - @allure.step('Click {0}') - def click(self): - super().click() diff --git a/test/e2e/gui/elements/os/win/object.py b/test/e2e/gui/elements/os/win/object.py deleted file mode 100644 index 335a273aaa..0000000000 --- a/test/e2e/gui/elements/os/win/object.py +++ /dev/null @@ -1,42 +0,0 @@ -import logging - -import allure - -import driver -from gui.elements.base_object import BaseObject - -_logger = logging.getLogger(__name__) - - -class NativeObject(BaseObject): - - def __init__(self, name: str): - super().__init__(name) - - @property - @allure.step('Get object {0}') - def object(self): - return driver.waitForObject(self.real_name) - - @property - @allure.step('Get visible {0}') - def is_visible(self): - try: - driver.waitForObject(self.real_name, 1) - return True - except (AttributeError, LookupError, RuntimeError): - return False - - @property - @allure.step('Get bounds {0}') - def bounds(self): - return driver.object.globalBounds(self.object) - - @property - @allure.step('Get central coordinate {0}') - def center(self): - return self.bounds.center() - - @allure.step('Click {0}') - def click(self): - driver.mouseClick(self.object) diff --git a/test/e2e/gui/elements/os/win/text_edit.py b/test/e2e/gui/elements/os/win/text_edit.py deleted file mode 100644 index 7ccbf2a0b2..0000000000 --- a/test/e2e/gui/elements/os/win/text_edit.py +++ /dev/null @@ -1,32 +0,0 @@ -import allure - -import configs -import constants -import driver -from .object import NativeObject - - -class TextEdit(NativeObject): - - @property - @allure.step('Get current text {0}') - def text(self) -> str: - return str(self.object.text) - - @text.setter - @allure.step('Type: {1} {0}') - def text(self, value: str): - self.clear() - driver.nativeType(value) - assert driver.waitFor(lambda: self.text == value, configs.timeouts.UI_LOAD_TIMEOUT_MSEC), \ - f'Type text failed, value in field: "{self.text}", expected: {value}' - - @allure.step('Clear {0}') - def clear(self): - # Set focus - driver.nativeMouseClick(int(self.center.x), int(self.center.y), driver.Qt.LeftButton) - driver.type(self.object, f'<{constants.commands.SELECT_ALL}>') - driver.type(self.object, f'<{constants.commands.BACKSPACE}>') - assert driver.waitFor(lambda: not self.text), \ - f'Clear text field failed, value in field: "{self.text}"' - return self diff --git a/test/e2e/gui/elements/qt/__init__.py b/test/e2e/gui/elements/qt/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/e2e/gui/elements/qt/scroll.py b/test/e2e/gui/elements/scroll.py similarity index 100% rename from test/e2e/gui/elements/qt/scroll.py rename to test/e2e/gui/elements/scroll.py diff --git a/test/e2e/gui/elements/qt/slider.py b/test/e2e/gui/elements/slider.py similarity index 91% rename from test/e2e/gui/elements/qt/slider.py rename to test/e2e/gui/elements/slider.py index 5e48a50410..613697bc27 100644 --- a/test/e2e/gui/elements/qt/slider.py +++ b/test/e2e/gui/elements/slider.py @@ -1,6 +1,6 @@ import allure -from gui.elements.qt.object import QObject +from gui.elements.object import QObject class Slider(QObject): diff --git a/test/e2e/gui/elements/qt/text_edit.py b/test/e2e/gui/elements/text_edit.py similarity index 92% rename from test/e2e/gui/elements/qt/text_edit.py rename to test/e2e/gui/elements/text_edit.py index 74737c6c4d..ddd5151dae 100644 --- a/test/e2e/gui/elements/qt/text_edit.py +++ b/test/e2e/gui/elements/text_edit.py @@ -2,7 +2,7 @@ import allure import configs import driver -from gui.elements.qt.object import QObject +from gui.elements.object import QObject class TextEdit(QObject): diff --git a/test/e2e/gui/elements/qt/text_label.py b/test/e2e/gui/elements/text_label.py similarity index 74% rename from test/e2e/gui/elements/qt/text_label.py rename to test/e2e/gui/elements/text_label.py index ba604fdaaf..e8b605298f 100644 --- a/test/e2e/gui/elements/qt/text_label.py +++ b/test/e2e/gui/elements/text_label.py @@ -1,6 +1,6 @@ import allure -from gui.elements.qt.object import QObject +from gui.elements.object import QObject class TextLabel(QObject): diff --git a/test/e2e/gui/elements/qt/window.py b/test/e2e/gui/elements/window.py similarity index 97% rename from test/e2e/gui/elements/qt/window.py rename to test/e2e/gui/elements/window.py index 93f46cbcf1..32071e6ef9 100644 --- a/test/e2e/gui/elements/qt/window.py +++ b/test/e2e/gui/elements/window.py @@ -4,7 +4,7 @@ import allure import configs import driver -from gui.elements.qt.object import QObject +from gui.elements.object import QObject _logger = logging.getLogger(__name__) diff --git a/test/e2e/gui/main_window.py b/test/e2e/gui/main_window.py index 9694b37252..d9aa5973a3 100644 --- a/test/e2e/gui/main_window.py +++ b/test/e2e/gui/main_window.py @@ -12,9 +12,9 @@ from gui.components.onboarding.before_started_popup import BeforeStartedPopUp from gui.components.onboarding.beta_consent_popup import BetaConsentPopup from gui.components.splash_screen import SplashScreen from gui.components.user_canvas import UserCanvas -from gui.elements.qt.button import Button -from gui.elements.qt.object import QObject -from gui.elements.qt.window import Window +from gui.elements.button import Button +from gui.elements.object import QObject +from gui.elements.window import Window from gui.screens.community import CommunityScreen from gui.screens.community_portal import CommunitiesPortal from gui.screens.messages import MessagesScreen diff --git a/test/e2e/gui/objects_map/os_names.py b/test/e2e/gui/objects_map/os_names.py index cc02ef6588..e751e84f60 100644 --- a/test/e2e/gui/objects_map/os_names.py +++ b/test/e2e/gui/objects_map/os_names.py @@ -1,25 +1,7 @@ -""" MAC """ +from objectmaphelper import * + # Open Files Dialog -mainWindow = {"AXRole": "AXWindow", "AXMain": True} -openFileDialog = {"container": mainWindow, "AXRole": "AXSheet", "AXIdentifier": "open-panel"} -openButton = {"container": openFileDialog, "AXRole": "AXButton", "AXIdentifier": "OKButton"} +chooseAnImageALogo_QQuickWindow = {"title": RegularExpression("Choose.*"), "type": "QQuickWindow", "unnamed": 1, "visible": True} +choose_an_image_as_logo_titleBar_ToolBar = {"container": chooseAnImageALogo_QQuickWindow, "id": "titleBar", "type": "ToolBar", "unnamed": 1, "visible": True} +titleBar_currentPathField_TextField = {"container": choose_an_image_as_logo_titleBar_ToolBar, "id": "currentPathField", "type": "TextField", "unnamed": 1, "visible": True} -# Go To Dialog -goToDialog = {"container": openFileDialog, "AXRole": "AXSheet", "AXIdentifier": "GoToWindow"} -pathTextField = {"container": goToDialog, "AXRole": "AXTextField", "AXIdentifier": "PathTextField"} - -""" WINDOWS """ -# Open File Dialog -file_Dialog = {"type": "Dialog"} -choose_file_Edit = {"container": file_Dialog, "type": "Edit"} -choose_Open_Button = {"container": file_Dialog, "text": "Open", "type": "Button"} - -""" LINUX """ -# Open File Dialog -# Select Image Dialog -please_choose_an_image_QQuickWindow = {"type": "QQuickWindow", "unnamed": 1, "visible": True} -please_choose_an_image_Open_Button = {"container": please_choose_an_image_QQuickWindow, "id": "okButton", "type": "Button", "unnamed": 1, "visible": True} -please_choose_an_image_titleBar_ToolBar = {"container": please_choose_an_image_QQuickWindow, "id": "titleBar", "type": "ToolBar", "unnamed": 1, "visible": True} -titleBar_textInput_TextInputWithHandles = {"container": please_choose_an_image_QQuickWindow, "echoMode": 0, "id": "textInput", "type": "TextInputWithHandles", "unnamed": 1, "visible": True} -view_listView_ListView = {"container": please_choose_an_image_QQuickWindow, "id": "listView", "type": "ListView", "unnamed": 1, "visible": True} -rowitem_Text = {"container": view_listView_ListView, "type": "Text", "unnamed": 1, "visible": True} diff --git a/test/e2e/gui/screens/community.py b/test/e2e/gui/screens/community.py index 335b5087a2..42c040e9b5 100644 --- a/test/e2e/gui/screens/community.py +++ b/test/e2e/gui/screens/community.py @@ -8,10 +8,10 @@ from constants import UserChannel from gui.components.community.community_channel_popups import EditChannelPopup, NewChannelPopup from gui.components.community.welcome_community import WelcomeCommunityPopup from gui.components.delete_popup import DeletePopup -from gui.elements.qt.button import Button -from gui.elements.qt.list import List -from gui.elements.qt.object import QObject -from gui.elements.qt.text_label import TextLabel +from gui.elements.button import Button +from gui.elements.list import List +from gui.elements.object import QObject +from gui.elements.text_label import TextLabel from gui.screens.community_settings import CommunitySettingsScreen from scripts.tools import image from scripts.tools.image import Image diff --git a/test/e2e/gui/screens/community_portal.py b/test/e2e/gui/screens/community_portal.py index 6ac35d6945..78dca21acd 100644 --- a/test/e2e/gui/screens/community_portal.py +++ b/test/e2e/gui/screens/community_portal.py @@ -1,8 +1,8 @@ import allure from gui.components.community.create_community_popups import CreateCommunitiesBanner, CreateCommunityPopup -from gui.elements.qt.button import Button -from gui.elements.qt.object import QObject +from gui.elements.button import Button +from gui.elements.object import QObject class CommunitiesPortal(QObject): diff --git a/test/e2e/gui/screens/community_settings.py b/test/e2e/gui/screens/community_settings.py index 45db82f04d..60cf372e72 100644 --- a/test/e2e/gui/screens/community_settings.py +++ b/test/e2e/gui/screens/community_settings.py @@ -7,12 +7,12 @@ from gui.components.color_select_popup import ColorSelectPopup from gui.components.community.tags_select_popup import TagsSelectPopup from gui.components.os.open_file_dialogs import OpenFileDialog from gui.components.picture_edit_popup import PictureEditPopup -from gui.elements.qt.button import Button -from gui.elements.qt.check_box import CheckBox -from gui.elements.qt.object import QObject -from gui.elements.qt.scroll import Scroll -from gui.elements.qt.text_edit import TextEdit -from gui.elements.qt.text_label import TextLabel +from gui.elements.button import Button +from gui.elements.check_box import CheckBox +from gui.elements.object import QObject +from gui.elements.scroll import Scroll +from gui.elements.text_edit import TextEdit +from gui.elements.text_label import TextLabel from scripts.tools.image import Image diff --git a/test/e2e/gui/screens/messages.py b/test/e2e/gui/screens/messages.py index c4a47d3d92..994f9f7970 100644 --- a/test/e2e/gui/screens/messages.py +++ b/test/e2e/gui/screens/messages.py @@ -7,15 +7,11 @@ import allure import configs import driver from driver.objects_access import walk_children -from gui.components.context_menu import ContextMenu -from gui.components.messaging.edit_group_name_and_image_popup import EditGroupNameAndImagePopup -from gui.components.messaging.leave_group_popup import LeaveGroupPopup -from gui.elements.qt.button import Button -from gui.elements.qt.list import List -from gui.elements.qt.object import QObject -from gui.elements.qt.scroll import Scroll -from gui.elements.qt.text_edit import TextEdit -from gui.elements.qt.text_label import TextLabel +from gui.elements.button import Button +from gui.elements.list import List +from gui.elements.object import QObject +from gui.elements.scroll import Scroll +from gui.elements.text_edit import TextEdit from gui.screens.community import CommunityScreen from scripts.tools.image import Image diff --git a/test/e2e/gui/screens/onboarding.py b/test/e2e/gui/screens/onboarding.py index 060c95bd07..3b96e49fca 100755 --- a/test/e2e/gui/screens/onboarding.py +++ b/test/e2e/gui/screens/onboarding.py @@ -10,10 +10,10 @@ import constants.tesseract import driver from gui.components.os.open_file_dialogs import OpenFileDialog from gui.components.picture_edit_popup import PictureEditPopup -from gui.elements.qt.button import Button -from gui.elements.qt.object import QObject -from gui.elements.qt.text_edit import TextEdit -from gui.elements.qt.text_label import TextLabel +from gui.elements.button import Button +from gui.elements.object import QObject +from gui.elements.text_edit import TextEdit +from gui.elements.text_label import TextLabel from scripts.tools.image import Image from scripts.utils.system_path import SystemPath diff --git a/test/e2e/gui/screens/settings.py b/test/e2e/gui/screens/settings.py index a4597f4a2b..f1aa7e4b3d 100644 --- a/test/e2e/gui/screens/settings.py +++ b/test/e2e/gui/screens/settings.py @@ -19,13 +19,13 @@ from gui.components.settings.sync_new_device_popup import SyncNewDevicePopup from gui.components.social_links_popup import SocialLinksPopup from gui.components.wallet.testnet_mode_popup import TestnetModePopup from gui.components.wallet.wallet_account_popups import AccountPopup -from gui.elements.qt.button import Button -from gui.elements.qt.check_box import CheckBox -from gui.elements.qt.list import List -from gui.elements.qt.object import QObject -from gui.elements.qt.scroll import Scroll -from gui.elements.qt.text_edit import TextEdit -from gui.elements.qt.text_label import TextLabel +from gui.elements.button import Button +from gui.elements.check_box import CheckBox +from gui.elements.list import List +from gui.elements.object import QObject +from gui.elements.scroll import Scroll +from gui.elements.text_edit import TextEdit +from gui.elements.text_label import TextLabel from gui.screens.community_settings import CommunitySettingsScreen from gui.screens.messages import MessagesScreen from scripts.tools.image import Image diff --git a/test/e2e/gui/screens/wallet.py b/test/e2e/gui/screens/wallet.py index ef490375dc..1e7b844247 100644 --- a/test/e2e/gui/screens/wallet.py +++ b/test/e2e/gui/screens/wallet.py @@ -12,9 +12,9 @@ from gui.components.wallet.confirmation_popup import ConfirmationPopup from gui.components.wallet.remove_wallet_account_popup import RemoveWalletAccountPopup from gui.components.wallet.wallet_account_popups import AccountPopup from gui.components.context_menu import ContextMenu -from gui.elements.qt.button import Button -from gui.elements.qt.object import QObject -from gui.elements.qt.text_label import TextLabel +from gui.elements.button import Button +from gui.elements.object import QObject +from gui.elements.text_label import TextLabel from scripts.utils.decorators import close_exists diff --git a/test/e2e/tests/wallet/test_wallet_settings.py b/test/e2e/tests/wallet/test_wallet_settings.py index 6cbaba4267..f39c5fa616 100644 --- a/test/e2e/tests/wallet/test_wallet_settings.py +++ b/test/e2e/tests/wallet/test_wallet_settings.py @@ -144,9 +144,8 @@ def test_settings_networks_edit_restore_defaults(main_screen: MainWindow): with step('Click in Main JSON RPC URL and paste incorrect URL'): edit_network_form.edit_network_main_json_rpc_url_input("https://eth-archival.gateway.pokt.network/v1/lb/") - with step('Check error message for Main JSON RPC URL input'): - assert driver.waitFor( - lambda: edit_network_form.get_main_rpc_url_error_message_text() == WalletEditNetworkErrorMessages.PINGUNSUCCESSFUL.value) + # with step('Check error message'): + # assert edit_network_form._network_edit_error_message() == 'test' with step('Click in Failover JSON RPC URL and paste incorrect URL'): edit_network_form.edit_network_failover_json_rpc_url_input("https://eth-archival.gateway.pokt.network/v1/lb/")