chore(@e2e): changes to support new activity center

Author: anastasiyaig

test/e2e/gui/components/activity_center.py

@@ -9,70 +9,77 @@
 from gui.elements.button import Button
 from gui.elements.object import QObject
 from gui.elements.scroll import Scroll
-from gui.objects_map import names
+from gui.objects_map import names, activity_center_names
 from scripts.tools.image import Image
 
 
 class ContactRequest:
 
     def __init__(self, obj):
         self.object = obj
-        self.contact_request: typing.Optional[Image] = None
-        self._accept_button: typing.Optional[Button] = None
-        self._decline_button: typing.Optional[Button] = None
-        self._notification_request_state: typing.Optional[Image] = None
+        self.contact_request: typing.Optional[str] = None
+        self.accept_button: typing.Optional[Button] = None
+        self.decline_button: typing.Optional[Button] = None
+        self.more_button: typing.Optional[Button] = None
+        self.notification_request_state: typing.Optional[str] = None
         self.init_ui()
 
     def __repr__(self):
         return self.contact_request
 
     def init_ui(self):
+        self.accept_button = Button(activity_center_names.activityCenterContactRequestAcceptButton)
+        self.decline_button = Button(activity_center_names.activityCenterContactRequestDeclineButton)
+        self.more_button = Button(activity_center_names.activityCenterContactRequestMoreButton)
+        
+        # get header text
+        try:
+            header_obj = QObject(activity_center_names.activityCenterContactRequestHeader)
+            self.contact_request = str(header_obj.object.primaryText) if hasattr(header_obj.object, 'primaryText') else None
+        except Exception:
+            self.contact_request = None
+
         for child in walk_children(self.object):
-            if str(getattr(child, 'objectName', '')) == 'acceptBtn':
-                self._accept_button = Button(real_name=driver.objectMap.realName(child))
-            elif str(getattr(child, 'objectName', '')) == 'declineBtn':
-                self._decline_button = Button(real_name=driver.objectMap.realName(child))
-            elif str(getattr(child, 'objectName', '')) == 'StatusMessageHeader_DisplayName':
-                self.contact_request = str(child.text)
-            elif str(getattr(child, 'id', '')) == 'textItem':
-                self._notification_request_state = str(child.text)
+            if str(getattr(child, 'id', '')) == 'textItem':
+                self.notification_request_state = str(child.text)
+                break
 
     @allure.step('Accept request')
     def accept(self):
-        assert self._accept_button is not None, 'Button not found'
-        self._accept_button.click()
+        assert self.accept_button is not None, 'Button not found'
+        self.accept_button.click()
 
     @allure.step('Decline request')
     def decline(self):
-        assert self._decline_button is not None, 'Button not found'
-        self._decline_button.click()
+        assert self.decline_button is not None, 'Button not found'
+        self.decline_button.click()
 
 
 class ActivityCenter(QObject):
 
     def __init__(self):
-        super(ActivityCenter, self).__init__(names.activityCenterPopup)
+        super().__init__(activity_center_names.activityCenterLeftPanel)
         self.activity_center_button = Scroll(names.activityCenterStatusFlatButton)
-        self.notification_contact_request = QObject(names.o_ActivityNotificationContactRequest)
-        self.activity_center_panel = QObject(names.activityCenterTopBar_ActivityCenterPopupTopBarPanel)
-        self.activity_center_contact_request = QObject(names.activityCenterContactRequest)
+        self.activity_center_contact_request = QObject(activity_center_names.activityCenterContactRequest)
+        self.scroll = Scroll(activity_center_names.activityCenterScrollView)
+        self.navigation_button = Button(activity_center_names.activityCenterNavigationButton)
 
     @property
     @allure.step('Get contact items')
     def contact_items(self) -> typing.List[ContactRequest]:
         return [ContactRequest(item) for item in driver.findAllObjects(self.activity_center_contact_request.real_name)]
 
-    @allure.step('Wait until appears {0}')
-    def wait_until_appears(self, timeout_msec: int = configs.timeouts.UI_LOAD_TIMEOUT_MSEC):
-        self.activity_center_panel.wait_until_appears(timeout_msec)
-        return self
-
+    # TODO: navigation buttons are the same so its hard to click a certain button
     @allure.step('Click activity center button')
     def click_activity_center_button(self, text: str):
-        for button in driver.findAllObjects(self.activity_center_button.real_name):
-            if str(getattr(button, 'text', '')) == str(text):
-                driver.mouseClick(button)
-                break
+        started_at = time.monotonic()
+        self.activity_center_button.real_name['text'] = text
+
+        while not self.activity_center_button.is_visible:
+            if time.monotonic() - started_at > 5:
+                raise TimeoutError(f'Activity center button with text "{text}" not found after {5} seconds')
+            self.navigation_button.click()
+        self.activity_center_button.click()
         return self
 
     @allure.step('Find contact request')
@@ -89,3 +96,24 @@ def find_contact_request_in_list(
     @allure.step('Accept contact request')
     def accept_contact_request(self, request):
         return request.accept()
+
+    def vertical_scroll_down(self, element: QObject, timeout_sec: int = 5):
+        started_at = time.monotonic()
+        while not element.is_visible:
+            driver.mouse.scroll(self.object, self.object.width / 2, self.object.height / 2, 0, -30, 1, 0.1)
+            if time.monotonic() - started_at > timeout_sec:
+                raise LookupError(f'Object not found: {element}')
+
+    def horizontal_scroll_right(self, element: QObject, timeout_sec: int = 5):
+        started_at = time.monotonic()
+        while not element.is_visible:
+            driver.mouse.scroll(self.object, self.object.width / 2, self.object.height / 2, 30, 0, 1, 0.1)
+            if time.monotonic() - started_at > timeout_sec:
+                raise LookupError(f'Object not found: {element}')
+
+    def horizontal_scroll_left(self, element: QObject, timeout_sec: int = 5):
+        started_at = time.monotonic()
+        while not element.is_visible:
+            driver.mouse.scroll(self.object, self.object.width / 2, self.object.height / 2, -30, 0, 1, 0.1)
+            if time.monotonic() - started_at > timeout_sec:
+                raise LookupError(f'Object not found: {element}')

test/e2e/gui/elements/scroll.py

@@ -26,3 +26,12 @@ def vertical_scroll_up(self, element: QObject, timeout_sec: int = 5):
             driver.mouse.scroll(self.object, self.object.width / 2, self.object.height / 2, 0, 30, 1, 0.1)
             if time.monotonic() - started_at > timeout_sec:
                 raise LookupError(f'Object not found: {element}')
+
+    @allure.step('Scroll horizontal right to object {1}')
+    def horizontal_scroll_right(self, element: QObject, timeout_sec: int = 5):
+        started_at = time.monotonic()
+        while not element.is_visible:
+            driver.mouse.scroll(self.object, self.object.width / 2, self.object.height / 2, 30, 0, 1, 0.1)
+            if time.monotonic() - started_at > timeout_sec:
+                raise LookupError(f'Object not found: {element}')
+

test/e2e/gui/main_window.py

@@ -10,6 +10,7 @@
 from configs.timeouts import APP_LOAD_TIMEOUT_MSEC
 from constants import UserAccount, CommunityData, Color
 from constants.dock_buttons import DockButtons
+from gui.components.activity_center import ActivityCenter
 from gui.components.introduce_yourself_popup import IntroduceYourselfPopup
 from gui.components.context_menu import ContextMenu
 from gui.components.toast_message import ToastMessage
@@ -42,6 +43,12 @@ def __init__(self):
         self.community_template_button = Button(names.statusCommunityMainNavBarListView_CommunityNavBarButton)
         self.settings_button = Button(names.settingsGearButton)
         self.wallet_button = Button(names.mainWalletButton)
+        self.activity_center_button = Button(names.activityCenterButton)
+
+    @allure.step('Click notifications button and open activity center')
+    @open_with_retries(ActivityCenter)
+    def open_activity_center(self):
+        return self.activity_center_button
 
     @allure.step('Click Home button and open Home screen')
     @open_with_retries(HomeScreen)

test/e2e/gui/objects_map/activity_center_names.py

@@ -0,0 +1,16 @@
+from gui.objects_map.names import statusDesktop_mainWindow
+from objectmaphelper import *
+
+# Map for activity center
+
+activityCenterLeftPanel = {"container": statusDesktop_mainWindow, "objectName": "activityCenterLeftPanel", "type": "ColumnLayout", "visible": True}
+activityCenterListView = {"container": statusDesktop_mainWindow, "id": "listView", "type": "StatusListView", "unnamed": 1, "visible": True}
+activityCenterListLoader = {"container": activityCenterListView, "index": 0, "type": "Loader", "unnamed": 1, "visible": True}
+activityCenterContactRequest = {"container": activityCenterListLoader, "type": "ActivityNotificationContactRequest", "unnamed": 1, "visible": True}
+activityCenterContactRequestAcceptButton = {"container": activityCenterListLoader, "objectName": "acceptBtn", "type": "StatusFlatRoundButton", "visible": True}
+activityCenterContactRequestDeclineButton = {"container": activityCenterListLoader, "objectName": "declineBtn", "type": "StatusFlatRoundButton", "visible": True}
+activityCenterContactRequestMoreButton = {"container": activityCenterListLoader, "objectName": "moreBtn", "type": "StatusFlatRoundButton", "visible": True}
+activityCenterContactRequestHeader = {"container": activityCenterContactRequest, "type": "NotificationBaseHeaderRow", "unnamed": 1, "visible": True}
+activityCenterScrollView = {"container": statusDesktop_mainWindow, "type": "StatusScrollView", "unnamed": 1, "visible": True}
+activityCenterGroupButton = {"container": activityCenterScrollView, "objectName": "activityCenterGroupButton", "type": "StatusFlatButton", "visible": True}
+activityCenterNavigationButton = {"container": activityCenterLeftPanel, "type": "StatusNavigationButton", "visible": True}

test/e2e/gui/objects_map/names.py

@@ -53,6 +53,7 @@
                            "type": "StatusNavBarTabButton", "visible": True}
 settingsGearButton = {"container": communitiesSettingsNavBarList, "objectName": "Settings-navbar",
                       "type": "StatusNavBarTabButton", "visible": True}
+activityCenterButton = {"container": communitiesSettingsNavBarList, "objectName": "Activity Center-navbar", "type": "StatusNavBarTabButton", "visible": True}
 
 # Online identifier
 onlineIdentifierButton = {"container": mainWindow_LeftPanelNavBar, "objectName": "statusProfileNavBarTabButton",

test/e2e/gui/screens/messages.py

@@ -91,7 +91,6 @@ def __init__(self):
         self.confirm_button = Button(messaging_names.statusToolBar_Confirm_StatusButton)
         self.status_button = Button(messaging_names.statusToolBar_Cancel_StatusButton)
         self.contact_tag = QObject(messaging_names.statusToolBar_StatusTagItem)
-        self.notifications_button = Button(messaging_names.statusToolBar_notificationButton_StatusActivityCenterButton)
 
     @allure.step('Remove member by clicking close icon on member tag')
     def click_contact_close_icon(self, member):
@@ -102,11 +101,6 @@ def click_contact_close_icon(self, member):
                         driver.mouseClick(child)
                         break
 
-    @allure.step('Open activity center')
-    def open_activity_center(self):
-        self.notifications_button.click()
-        return ActivityCenter().wait_until_appears()
-
     @allure.step('Open Pinned messages popup')
     def open_pinned_messages_popup(self):
         self.pinned_message_tooltip.click()

test/e2e/tests/crtitical_tests_prs/test_messaging_group_chat.py

@@ -63,10 +63,9 @@ def test_group_chat_add_contact_in_ac(multiple_instances, community_name, domain
         with step(f'User {user_two.name}, accept contact request from {user_one.name} via activity center'):
             aut_two.attach()
             main_window.prepare()
-            activity_center = ToolBar().open_activity_center()
+            activity_center = main_window.left_panel.open_activity_center()
             request = activity_center.find_contact_request_in_list(user_one.name)
-            activity_center.click_activity_center_button(
-                'Contact requests').accept_contact_request(request)
+            activity_center.accept_contact_request(request)
             main_window.left_panel.click()
             main_window.hide()
 
@@ -88,10 +87,9 @@ def test_group_chat_add_contact_in_ac(multiple_instances, community_name, domain
         with step(f'User {user_three.name}, accept contact request from {user_one.name} via activity center'):
             aut_three.attach()
             main_window.prepare()
-            activity_center = ToolBar().open_activity_center()
+            activity_center = main_window.left_panel.open_activity_center()
             request = activity_center.find_contact_request_in_list(user_one.name, configs.timeouts.APP_LOAD_TIMEOUT_MSEC)
-            activity_center.click_activity_center_button(
-                'Contact requests').accept_contact_request(request)
+            activity_center.accept_contact_request(request)
             main_window.left_panel.click()
             main_window.hide()
 

ui/app/AppLayouts/ActivityCenter/ActivityCenterLayout.qml

@@ -59,6 +59,9 @@ StatusSectionLayout {
     }
 
     leftPanel: ColumnLayout {
+
+        objectName: "activityCenterLeftPanel"
+
         id: leftPanel
         anchors.fill: parent
         spacing: 0