From 6f84fe7c08e2c87c5b901dbc149d43975b253c4d Mon Sep 17 00:00:00 2001 From: Valentina Novgorodtceva Date: Mon, 12 Feb 2024 13:48:10 +0700 Subject: [PATCH] chore: fixes for fails from nightly run --- test/e2e/gui/components/profile_popup.py | 2 +- test/e2e/gui/objects_map/component_names.py | 3 +-- .../test_communities_pin_and_unpin_messages.py | 2 +- test/e2e/tests/communities/test_join_community.py | 2 +- .../onboarding/test_onboarding_generate_new_keys.py | 10 ++++++---- .../test_messaging_settings_accept_request.py | 2 +- .../test_messaging_settings_identity_verification.py | 2 +- .../test_messaging_settings_reject_request.py | 2 +- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/test/e2e/gui/components/profile_popup.py b/test/e2e/gui/components/profile_popup.py index a2e28a491d..638620adab 100644 --- a/test/e2e/gui/components/profile_popup.py +++ b/test/e2e/gui/components/profile_popup.py @@ -20,7 +20,7 @@ class ProfilePopup(BasePopup): self._edit_profile_button = Button('ProfilePopup_editButton') self._chat_key_text_label = TextLabel('https_status_app_StatusBaseText') self._emoji_hash = QObject('profileDialog_userEmojiHash_EmojiHash') - self._chat_key_copy_button = Button('copy_icon_StatusIcon') + self._chat_key_copy_button = Button('copy_icon_CopyButton') @property @allure.step('Get profile image') diff --git a/test/e2e/gui/objects_map/component_names.py b/test/e2e/gui/objects_map/component_names.py index 5ea62e696c..709de719a9 100644 --- a/test/e2e/gui/objects_map/component_names.py +++ b/test/e2e/gui/objects_map/component_names.py @@ -62,8 +62,7 @@ ProfilePopup_SendContactRequestButton = {"container": statusDesktop_mainWindow_o profileDialog_userEmojiHash_EmojiHash = {"container": statusDesktop_mainWindow_overlay, "objectName": "ProfileDialog_userEmojiHash", "type": "EmojiHash", "visible": True} edit_TextEdit = {"container": statusDesktop_mainWindow_overlay, "id": "edit", "type": "TextEdit", "unnamed": 1, "visible": True} https_status_app_StatusBaseText = {"container": edit_TextEdit, "type": "StatusBaseText", "unnamed": 1, "visible": True} -copy_icon_StatusIcon = {"container": statusDesktop_mainWindow_overlay, "objectName": "copy-icon", "type": "StatusIcon", "visible": True} - +copy_icon_CopyButton = {"container": statusDesktop_mainWindow_overlay, "objectName": "copy-icon", "type": "CopyButton", "visible": True} # Welcome Status Popup betaConsent_StatusModal = {"container": statusDesktop_mainWindow_overlay, "objectName": "desktopBetaStatusModal", "type": "StatusModal", "visible": True} diff --git a/test/e2e/tests/communities/test_communities_pin_and_unpin_messages.py b/test/e2e/tests/communities/test_communities_pin_and_unpin_messages.py index 778ffd6a18..4aa22350ef 100644 --- a/test/e2e/tests/communities/test_communities_pin_and_unpin_messages.py +++ b/test/e2e/tests/communities/test_communities_pin_and_unpin_messages.py @@ -59,4 +59,4 @@ def test_pin_and_unpin_message_in_community(main_screen: MainWindow, community_p with step('Verify that the message was unpinned'): assert not message.message_is_pinned assert message.user_name_in_pinned_message == '' - assert messages_screen.tool_bar.is_pin_message_tooltip_visible + assert not messages_screen.tool_bar.is_pin_message_tooltip_visible diff --git a/test/e2e/tests/communities/test_join_community.py b/test/e2e/tests/communities/test_join_community.py index e52f3b828f..727e2424c5 100644 --- a/test/e2e/tests/communities/test_join_community.py +++ b/test/e2e/tests/communities/test_join_community.py @@ -36,7 +36,7 @@ def test_join_community_via_owner_invite(multiple_instance, user_data_one, user_ aut_two.attach() main_window.prepare() profile_popup = main_window.left_panel.open_online_identifier().open_profile_popup_from_online_identifier() - chat_key = profile_popup.get_chat_key_from_profile_link + chat_key = profile_popup.copy_chat_key profile_popup.close() main_window.hide() diff --git a/test/e2e/tests/onboarding/test_onboarding_generate_new_keys.py b/test/e2e/tests/onboarding/test_onboarding_generate_new_keys.py index 12d9fcfa3c..03292b1ffd 100755 --- a/test/e2e/tests/onboarding/test_onboarding_generate_new_keys.py +++ b/test/e2e/tests/onboarding/test_onboarding_generate_new_keys.py @@ -111,9 +111,11 @@ def test_generate_new_keys(main_window, keys_screen, user_name: str, password, u with step('Open user profile from online identifier and check the data'): profile_popup = online_identifier.open_profile_popup_from_online_identifier() - assert profile_popup.user_name == user_name, \ - f'Display name in user profile is wrong, current: {profile_popup.user_name}, expected: {user_name}' - assert profile_popup.get_chat_key_from_profile_link == chat_key, \ - f'Chat key in user profile is wrong, current: {profile_popup.get_chat_key_from_profile_link}, expected: {chat_key}' + profile_popup_user_name = profile_popup.user_name + profile_popup_chat_key = profile_popup.copy_chat_key + assert profile_popup_user_name == user_name, \ + f'Display name in user profile is wrong, current: {profile_popup_user_name}, expected: {user_name}' + assert profile_popup_chat_key == chat_key, \ + f'Chat key in user profile is wrong, current: {profile_popup_chat_key}, expected: {chat_key}' assert profile_popup.get_emoji_hash == emoji_hash_public_key, \ f'Public keys should match when they dont' diff --git a/test/e2e/tests/settings/settings_messaging/test_messaging_settings_accept_request.py b/test/e2e/tests/settings/settings_messaging/test_messaging_settings_accept_request.py index 93c343ca7c..18712c6226 100644 --- a/test/e2e/tests/settings/settings_messaging/test_messaging_settings_accept_request.py +++ b/test/e2e/tests/settings/settings_messaging/test_messaging_settings_accept_request.py @@ -37,7 +37,7 @@ def test_messaging_settings_accepting_request(multiple_instance, user_data_one, aut_two.attach() main_window.prepare() profile_popup = main_window.left_panel.open_online_identifier().open_profile_popup_from_online_identifier() - chat_key = profile_popup.get_chat_key_from_profile_link + chat_key = profile_popup.copy_chat_key profile_popup.close() main_window.hide() diff --git a/test/e2e/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py b/test/e2e/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py index ff940cb53e..ad5d3b0242 100644 --- a/test/e2e/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py +++ b/test/e2e/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py @@ -36,7 +36,7 @@ def test_messaging_settings_identity_verification(multiple_instance, user_data_o aut_two.attach() main_window.prepare() profile_popup = main_window.left_panel.open_online_identifier().open_profile_popup_from_online_identifier() - chat_key = profile_popup.get_chat_key_from_profile_link + chat_key = profile_popup.copy_chat_key profile_popup.close() main_window.hide() diff --git a/test/e2e/tests/settings/settings_messaging/test_messaging_settings_reject_request.py b/test/e2e/tests/settings/settings_messaging/test_messaging_settings_reject_request.py index 7f3f30b6da..a1e0209fe1 100644 --- a/test/e2e/tests/settings/settings_messaging/test_messaging_settings_reject_request.py +++ b/test/e2e/tests/settings/settings_messaging/test_messaging_settings_reject_request.py @@ -32,7 +32,7 @@ def test_messaging_settings_rejecting_request(multiple_instance, user_data_one, main_window.prepare() online_identifier = main_window.left_panel.open_online_identifier() profile_popup = online_identifier.open_profile_popup_from_online_identifier() - chat_key = profile_popup.get_chat_key_from_profile_link + chat_key = profile_popup.copy_chat_key profile_popup.close() main_window.hide()