From 774916db181de7fa192d38cd4bad0d6f2f1c51b4 Mon Sep 17 00:00:00 2001 From: Valentina Novgorodtceva Date: Thu, 15 Feb 2024 14:46:50 +0700 Subject: [PATCH] chore: fixes of fails from nightly run (seed phrase + group chat) --- test/e2e/gui/components/wallet/wallet_account_popups.py | 4 ++-- test/e2e/gui/objects_map/names.py | 6 ++---- test/e2e/gui/screens/messages.py | 1 + test/e2e/gui/screens/onboarding.py | 2 +- test/e2e/tests/messages/test_messaging_group_chat.py | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/test/e2e/gui/components/wallet/wallet_account_popups.py b/test/e2e/gui/components/wallet/wallet_account_popups.py index 1ef7b0a653..c94f8b6f88 100644 --- a/test/e2e/gui/components/wallet/wallet_account_popups.py +++ b/test/e2e/gui/components/wallet/wallet_account_popups.py @@ -192,7 +192,7 @@ class AddNewAccountPopup(BasePopup): self._seed_phrase_12_words_button = Button(names.mainWallet_AddEditAccountPopup_12WordsButton) self._seed_phrase_18_words_button = Button(names.mainWallet_AddEditAccountPopup_18WordsButton) self._seed_phrase_24_words_button = Button(names.mainWallet_AddEditAccountPopup_24WordsButton) - self._seed_phrase_word_text_edit = TextEdit(names.mainWallet_AddEditAccountPopup_SPWord) + self._seed_phrase_word_text_edit = TextEdit(names.mainWindow_statusSeedPhraseInputField_TextEdit) self._seed_phrase_phrase_key_name_text_edit = TextEdit( names.mainWallet_AddEditAccountPopup_ImportedSeedPhraseKeyName) @@ -216,7 +216,7 @@ class AddNewAccountPopup(BasePopup): else: raise RuntimeError("Wrong amount of seed words", len(seed_phrase_words)) for count, word in enumerate(seed_phrase_words, start=1): - self._seed_phrase_word_text_edit.real_name['objectName'] = f'statusSeedPhraseInputField{count}' + self._seed_phrase_word_text_edit.real_name['objectName'] = f'enterSeedPhraseInputField{count}' self._seed_phrase_word_text_edit.text = word seed_phrase_name = ''.join([word[0] for word in seed_phrase_words[:10]]) self._seed_phrase_phrase_key_name_text_edit.text = seed_phrase_name diff --git a/test/e2e/gui/objects_map/names.py b/test/e2e/gui/objects_map/names.py index 5045465125..f7e904993f 100644 --- a/test/e2e/gui/objects_map/names.py +++ b/test/e2e/gui/objects_map/names.py @@ -299,7 +299,6 @@ mainWallet_AddEditAccountPopup_RevealSeedPhraseButton = {"container": mainWallet mainWallet_AddEditAccountPopup_SeedPhraseWordAtIndex_Placeholder = {"container": mainWallet_AddEditAccountPopup_Content, "objectName": "SeedPhraseWordAtIndex-%WORD-INDEX%", "type": "StatusSeedPhraseInput", "visible": True} mainWallet_AddEditAccountPopup_EnterSeedPhraseWordComponent = {"container": mainWallet_AddEditAccountPopup_Content, "objectName": "AddAccountPopup-EnterSeedPhraseWord", "type": "StatusInput", "visible": True} mainWallet_AddEditAccountPopup_EnterSeedPhraseWord = {"container": mainWallet_AddEditAccountPopup_EnterSeedPhraseWordComponent, "type": "TextEdit", "unnamed": 1, "visible": True} -mainWallet_AddEditAccountPopup_SPWord = {"container": mainWallet_AddEditAccountPopup_Content, "type": "TextEdit", "objectName": RegularExpression("statusSeedPhraseInputField*")} mainWallet_AddEditAccountPopup_12WordsButton = {"container": mainWallet_AddEditAccountPopup_Content, "objectName": "12SeedButton", "type": "StatusSwitchTabButton"} mainWallet_AddEditAccountPopup_18WordsButton = {"container": mainWallet_AddEditAccountPopup_Content, "objectName": "18SeedButton", "type": "StatusSwitchTabButton"} mainWallet_AddEditAccountPopup_24WordsButton = {"container": mainWallet_AddEditAccountPopup_Content, "objectName": "24SeedButton", "type": "StatusSwitchTabButton"} @@ -861,9 +860,8 @@ switchTabBar_18_words_Button = {"container": mainWindow_SeedPhraseInputView, "ob "type": "StatusSwitchTabButton"} switchTabBar_24_words_Button = {"container": mainWindow_SeedPhraseInputView, "objectName": "24SeedButton", "type": "StatusSwitchTabButton"} -mainWindow_statusSeedPhraseInputField_TextEdit = {"container": mainWindow_SeedPhraseInputView, - "objectName": "statusSeedPhraseInputField", "type": "TextEdit", - "visible": True} +mainWindow_statusSeedPhraseInputField_TextEdit = {"container": mainWindow_StatusWindow, "objectName": "enterSeedPhraseInputField", "type": "TextEdit", "visible": True} + mainWindow_Import_StatusButton = {"checkable": False, "container": mainWindow_SeedPhraseInputView, "objectName": "seedPhraseViewSubmitButton", "text": "Import", "type": "StatusButton", "visible": True} diff --git a/test/e2e/gui/screens/messages.py b/test/e2e/gui/screens/messages.py index 254cc6e1bf..b8f5a3372c 100644 --- a/test/e2e/gui/screens/messages.py +++ b/test/e2e/gui/screens/messages.py @@ -90,6 +90,7 @@ class ToolBar(QObject): for child in walk_children(item): if getattr(child, 'objectName', '') == 'close-icon': driver.mouseClick(child) + break class Message: diff --git a/test/e2e/gui/screens/onboarding.py b/test/e2e/gui/screens/onboarding.py index 4525a2c8ed..5dd4b015db 100755 --- a/test/e2e/gui/screens/onboarding.py +++ b/test/e2e/gui/screens/onboarding.py @@ -226,7 +226,7 @@ class SeedPhraseInputView(OnboardingView): raise RuntimeError("Wrong amount of seed words", len(seed_phrase)) for index, word in enumerate(seed_phrase, start=1): - self._seed_phrase_input_text_edit.real_name['objectName'] = f'statusSeedPhraseInputField{index}' + self._seed_phrase_input_text_edit.real_name['objectName'] = f'enterSeedPhraseInputField{index}' if autocomplete: word_to_put = word[:-1] self._seed_phrase_input_text_edit.text = word_to_put diff --git a/test/e2e/tests/messages/test_messaging_group_chat.py b/test/e2e/tests/messages/test_messaging_group_chat.py index ec25e6deab..2a8a51e2c8 100644 --- a/test/e2e/tests/messages/test_messaging_group_chat.py +++ b/test/e2e/tests/messages/test_messaging_group_chat.py @@ -17,7 +17,7 @@ pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703014', 'Create a group and send messages') @pytest.mark.case(703014) -@pytest.mark.timeout(timeout=310) +@pytest.mark.timeout(timeout=315) @pytest.mark.parametrize('user_data_one, user_data_two, user_data_three', [ (configs.testpath.TEST_USER_DATA / 'user_account_one', configs.testpath.TEST_USER_DATA / 'user_account_two', configs.testpath.TEST_USER_DATA / 'user_account_two')