chore(@e2e): fixes for tests on windows

Author: anastasiyaig

test/e2e/gui/components/changes_detected_popup.py

@@ -11,38 +11,42 @@ class ChangesDetectedToastMessage(QObject):
     def __init__(self):
         super(ChangesDetectedToastMessage, self).__init__(
             names.mainWindow_settingsDirtyToastMessage_SettingsDirtyToastMessage)
-        self._save_button = Button(names.mainWindow_Save_changes_StatusButton)
+        self.save_button = Button(names.mainWindow_Save_changes_StatusButton)
 
     @allure.step('Save changes')
-    def click_save_changes_button(self):
-        self._save_button.click()
+    def save_changes(self,  max_attempts: int = 4):
+        for attempt in range(1, max_attempts + 1):
+            self.save_button.click()
+            try:
+                self.wait_until_hidden(timeout_msec=configs.timeouts.UI_LOAD_TIMEOUT_MSEC)
+                return
+            except TimeoutError:
+                if attempt < max_attempts:
+                    continue
+                else:
+                    raise
+
 
-    @allure.step('Check if save changes button is visible')
-    def is_save_changes_button_visible(self) -> bool:
-        return self._save_button.is_visible
 
 
 class PermissionsChangesDetectedToastMessage(QObject):
 
     def __init__(self):
         super().__init__(communities_names.editPermissionView_settingsDirtyToastMessage_SettingsDirtyToastMessage)
-        self._update_permission_button = Button(communities_names.editPermissionView_Update_permission_StatusButton)
+        self.update_permission_button = Button(communities_names.editPermissionView_Update_permission_StatusButton)
 
     @allure.step('Update permission')
     def update_permission(self, max_attempts: int = 4):
         for attempt in range(1, max_attempts + 1):
-            self._update_permission_button.click()
+            self.update_permission_button.click()
             try:
-                # Use a shorter timeout per attempt, but allow multiple attempts
-                self.wait_until_hidden(timeout_msec=configs.timeouts.PROCESS_TIMEOUT_SEC * 1000)
-                # If we reach here, the popup is hidden - success!
+                self.wait_until_hidden(timeout_msec=configs.timeouts.UI_LOAD_TIMEOUT_MSEC)
                 return
             except TimeoutError:
                 if attempt < max_attempts:
                     # Continue to next attempt
                     continue
                 else:
-                    # Last attempt failed, re-raise the exception
                     raise
 
 

test/e2e/gui/main_window.py

@@ -84,7 +84,7 @@ def open_messages_screen(self):
         return self.messages_button
 
     @allure.step('Click Gear button and open Settings screen')
-    @open_with_retries(SettingsScreen)
+    @open_with_retries(SettingsScreen, attempts=3, delay=3.0)
     def open_settings(self):
         return self.settings_button
 

test/e2e/gui/screens/messages.py

@@ -55,11 +55,18 @@ def get_chats_names(self) -> typing.List[str]:
         return chats_list
 
     @allure.step('Click chat item')
-    def click_chat_by_name(self, chat_name: str):
+    def click_chat_by_name(self, chat_name: str, attempts: int = 4):
         self._chat_list_item.real_name['objectName'] = chat_name
-        self._chat_list_item.click()
-        skip_message_backup_popup_if_visible()
-        return ChatView()
+        
+        for attempt in range(1, attempts + 1):
+            self._chat_list_item.click()
+            try:
+                return ChatView().wait_until_appears()
+            except Exception as e:
+                if attempt < attempts:
+                    continue
+                else:
+                    raise Exception(f"Failed to open ChatView after {attempts} attempts: {e}")
 
     @allure.step('Click start chat button')
     def start_chat(self):
@@ -160,10 +167,18 @@ def init_ui(self):
                         self.banner_image = QObject(real_name=driver.objectMap.realName(child))
 
     @allure.step('Open community invitation')
-    def open_community_invitation(self):
+    def open_community_invitation(self, attempts: int = 4):
         driver.waitFor(lambda: self.delegate_button.is_visible, configs.timeouts.UI_LOAD_TIMEOUT_MSEC)
-        self.delegate_button.click()
-        return CommunityScreen().wait_until_appears()
+        
+        for attempt in range(1, attempts + 1):
+            self.delegate_button.click()
+            try:
+                return CommunityScreen().wait_until_appears()
+            except Exception as e:
+                if attempt < attempts:
+                    continue
+                else:
+                    raise Exception(f"Failed to open CommunityScreen after {attempts} attempts: {e}")
 
     def open_banned_community_invitation(self):
         driver.waitFor(lambda: self.delegate_button.is_visible, configs.timeouts.UI_LOAD_TIMEOUT_MSEC)

test/e2e/helpers/chat_helper.py

@@ -4,20 +4,28 @@
 import time
 import allure
 
+import configs
 from gui.components.community.enable_message_backup_popup import EnableMessageBackupPopup
 
 
 @allure.step('Skip Enable Messages backup popup')
-def skip_message_backup_popup_if_visible():
+def skip_message_backup_popup_if_visible(attempts = 4):
     """
     Skip the message backup popup if it's visible.
-    This is a common operation that appears in multiple places throughout the codebase.
     """
-    # Small delay to ensure popup has time to appear
-    time.sleep(0.1)
 
     message_back_up_popup = EnableMessageBackupPopup()
-    if message_back_up_popup.is_visible:
+    if not message_back_up_popup.is_visible:
+        return
+
+    for attempt in range(1, attempts + 1):
         message_back_up_popup.skip_button.click()
-        # Small delay after clicking to ensure action is processed
-        time.sleep(0.1)
+        try:
+            message_back_up_popup.wait_until_hidden(timeout_msec=configs.timeouts.UI_LOAD_TIMEOUT_MSEC)
+            return
+        except Exception as e:
+            if attempt < attempts:
+                continue
+            else:
+                raise Exception(f"Failed to close EnableMessageBackupPopup after {attempts} attempts: {e}")
+

test/e2e/scripts/utils/decorators.py

@@ -43,11 +43,21 @@ def decorator(func):
         @wraps(func)
         def wrapper(self, *args, **kwargs):
             last_exception = None
+            # TODO: https://github.com/status-im/status-desktop/issues/18888
+            # Workaround for app freeze when opening settings
+            is_settings_screen = screen_class.__name__ == 'SettingsScreen'
+            
             for attempt in range(1, attempts + 1):
                 try:
                     LOG.info(f'Attempt #{attempt} to open {screen_class.__name__}')
                     button = func(self, *args, **kwargs)
+                    # if is_settings_screen:
+                        # # Additional wait before click for SettingsScreen due to app freeze issue
+                        # time.sleep(3)
                     button.click()
+                    # if is_settings_screen:
+                        # # Additional wait after click for SettingsScreen due to app freeze issue
+                        # time.sleep(3)
                     popup = screen_class().wait_until_appears()
                     return popup
                 except Exception as e:

test/e2e/tests/crtitical_tests_prs/test_create_edit_join_community_pin_unpin_message.py

@@ -6,6 +6,7 @@
 from configs import get_platform
 from constants.community import Channel
 from gui.main_window import MainWindow
+from helpers.chat_helper import skip_message_backup_popup_if_visible
 from helpers.multiple_instances_helper import (
     authorize_user_in_aut, get_chat_key, send_contact_request_from_settings, 
     accept_contact_request_from_settings, switch_to_aut
@@ -129,6 +130,7 @@ def test_create_edit_join_community_pin_unpin_message(multiple_instances):
             switch_to_aut(aut_one, main_screen)
             messages_view = main_screen.left_panel.open_messages_screen()
             chat = messages_view.left_panel.click_chat_by_name(user_two.name)
+            skip_message_backup_popup_if_visible()
             chat.click_community_invite(new_name, 0)
 
         with step(f'User {user_one.name}, verify welcome community popup'):

test/e2e/tests/crtitical_tests_prs/test_messaging_1x1_chat.py

@@ -2,12 +2,10 @@
 import string
 import time
 
-import allure
 import pytest
 from allure_commons._allure import step
 
 import driver
-from configs import get_platform
 from constants.messaging import Messaging
 from constants.wallet import WalletAddress
 from ext.test_files.base64_images import BASE_64_IMAGE_JPEG
@@ -81,6 +79,8 @@ def test_1x1_chat_add_contact_in_settings(multiple_instances):
 
         with step(f'User {user_two.name}, accept contact request from {user_one.name}'):
             contacts_settings.accept_contact_request(user_one.name)
+            skip_message_backup_popup_if_visible()
+
 
         with step(f'Verify that contact appeared in contacts list of {user_two.name} in messaging settings'):
             # Test is on a chat screen, so we need to open settings from left panel

test/e2e/tests/crtitical_tests_prs/test_messaging_group_chat.py

@@ -141,6 +141,7 @@ def test_group_chat_add_contact_in_ac(multiple_instances, community_name, domain
 
         with step(f'Check group members and message for {user_two.name}'):
             switch_to_aut(aut_two, main_window)
+            skip_message_backup_popup_if_visible()
 
             assert driver.waitFor(lambda: group_chat_new_name in messages_screen.left_panel.get_chats_names,
                                   10000), f'{group_chat_new_name} is not present in chats list for {aut_two}'
@@ -207,7 +208,7 @@ def test_group_chat_add_contact_in_ac(multiple_instances, community_name, domain
             with step('Wait until link preview is ready'):
                 assert driver.waitFor(
                     lambda: domain_link_2 == messages_screen.group_chat.get_link_preview_bubble_description(),
-                    configs.timeouts.UI_LOAD_TIMEOUT_MSEC)
+                    15000)
 
             with step(f'Paste image to the same message'):
                 messages_screen.group_chat.choose_image(str(path))
@@ -261,9 +262,9 @@ def test_group_chat_add_contact_in_ac(multiple_instances, community_name, domain
             main_window.minimize()
 
         with step(f'Check group members and message for {user_three.name}'):
-            switch_to_aut(aut_three, main_window)
-
             with step(f'Check that {user_three.name} is not a member of a group'):
+                switch_to_aut(aut_three, main_window)
+                skip_message_backup_popup_if_visible()
                 assert driver.waitFor(lambda: group_chat_new_name in messages_screen.left_panel.get_chats_names,
                                       10000), f'{group_chat_new_name} is not present in chats list for {aut_three}'
                 messages_screen.left_panel.click_chat_by_name(group_chat_new_name)

test/e2e/tests/settings/settings_profile/test_settings_profile_edit.py

@@ -27,18 +27,14 @@ def test_set_name_bio_social_links(main_screen: MainWindow, aut: AUT, user_accou
         new_user_name = random_name_string()
         profile_settings.set_name(new_user_name)
         profile_settings.set_bio(bio)
-        ChangesDetectedToastMessage().click_save_changes_button()
-        assert ChangesDetectedToastMessage().is_visible is False, \
-            f'Bottom floating buttons are not hidden'
+        ChangesDetectedToastMessage().save_changes()
         assert \
             main_screen.left_panel.open_online_identifier().open_profile_popup_from_online_identifier().user_name \
             == new_user_name, \
             f'Display name was not applied after changing'
         main_screen.left_panel.click()
         profile_settings.set_social_links(links)
-        ChangesDetectedToastMessage().click_save_changes_button()
-        assert ChangesDetectedToastMessage().is_visible is False, \
-            f'Bottom floating buttons are not hidden'
+        ChangesDetectedToastMessage().save_changes()
         assert len(profile_settings.get_social_links) > 0, f'No social links were added'
 
     with step('Restart application'):