chore: fix validations for members role community channel test

test/e2e/gui/components/context_menu.py

@@ -1,7 +1,7 @@
 import allure
 
 from gui.elements.object import QObject
-from gui.objects_map import names
+from gui.objects_map import names, communities_names
 
 
 class ContextMenu(QObject):
@@ -15,6 +15,16 @@ class ContextMenu(QObject):
         self._context_hide_include_in_total_balance = QObject(names.contextMenuItem_HideInclude)
         self._context_edit_saved_address_option = QObject(names.contextSavedAddressEdit)
         self._context_delete_saved_address_option = QObject(names.contextSavedAddressDelete)
+        self._edit_channel_context_item = QObject(communities_names.edit_Channel_StatusMenuItem)
+        self._delete_channel_context_item = QObject(communities_names.delete_Channel_StatusMenuItem)
+
+    @allure.step('Is edit channel option present in context menu')
+    def is_edit_channel_option_present(self):
+        return self._edit_channel_context_item.exists
+
+    @allure.step('Is delete channel option present in context menu')
+    def is_delete_channel_option_present(self):
+        return self._delete_channel_context_item.exists
 
     @allure.step('Select in context menu')
     def select(self, value: str):

test/e2e/gui/screens/community.py

@@ -95,7 +95,8 @@ class ToolBar(QObject):
         self._options_list = List(names.o_StatusListView)
         self._edit_channel_context_item = QObject(communities_names.edit_Channel_StatusMenuItem)
         self._channel_icon = QObject(communities_names.statusToolBar_statusSmartIdenticonLetter_StatusLetterIdenticon)
-        self._channel_name = TextLabel(communities_names.statusToolBar_statusChatInfoButtonNameText_TruncatedTextWithTooltip)
+        self._channel_name = TextLabel(
+            communities_names.statusToolBar_statusChatInfoButtonNameText_TruncatedTextWithTooltip)
         self._channel_description = TextLabel(communities_names.statusToolBar_TruncatedTextWithTooltip)
         self._delete_channel_context_item = QObject(communities_names.delete_Channel_StatusMenuItem)
         self._channel_header = QObject(communities_names.statusToolBar_chatInfoBtnInHeader_StatusChatInfoButton)
@@ -135,15 +136,15 @@ class ToolBar(QObject):
     @allure.step('Open more options dropdown')
     def open_more_options_dropdown(self):
         self._more_options_button.click()
-        return self
+        return ContextMenu()
 
     @allure.step('Get visibility state of edit item')
     def is_edit_item_visible(self) -> bool:
-        return self._edit_channel_context_item.is_visible
+        return self._edit_channel_context_item.exists
 
     @allure.step('Get visibility state of delete item')
     def is_delete_item_visible(self) -> bool:
-        return self._delete_channel_context_item.is_visible
+        return self._delete_channel_context_item.exists
 
 
 class CategoryItem:
@@ -188,13 +189,15 @@ class LeftPanel(QObject):
         super().__init__(communities_names.mainWindow_communityColumnView_CommunityColumnView)
         self._community_info_button = Button(communities_names.mainWindow_communityHeaderButton_StatusChatInfoButton)
         self._community_logo = QObject(communities_names.mainWindow_identicon_StatusSmartIdenticon)
-        self._name_text_label = TextLabel(communities_names.mainWindow_statusChatInfoButtonNameText_TruncatedTextWithTooltip)
+        self._name_text_label = TextLabel(
+            communities_names.mainWindow_statusChatInfoButtonNameText_TruncatedTextWithTooltip)
         self._members_text_label = TextLabel(communities_names.mainWindow_Members_TruncatedTextWithTooltip)
         self._general_channel_item = QObject(communities_names.scrollView_general_StatusChatListItem)
         self._add_channels_button = Button(communities_names.add_channels_StatusButton)
         self._channel_list_item = QObject(communities_names.channel_listItem)
         self._channel_icon_template = QObject(communities_names.channel_identicon_StatusSmartIdenticon)
-        self._channel_or_category_button = Button(communities_names.mainWindow_createChannelOrCategoryBtn_StatusBaseText)
+        self._channel_or_category_button = Button(
+            communities_names.mainWindow_createChannelOrCategoryBtn_StatusBaseText)
         self._create_channel_menu_item = Button(communities_names.create_channel_StatusMenuItem)
         self._create_category_menu_item = Button(communities_names.create_category_StatusMenuItem)
         self._join_community_button = Button(communities_names.mainWindow_Join_Community_StatusButton)
@@ -203,7 +206,8 @@ class LeftPanel(QObject):
         self._create_category_button = Button(communities_names.add_categories_StatusFlatButton)
         self._delete_category_item = QObject(communities_names.delete_Category_StatusMenuItem)
         self._edit_category_item = QObject(communities_names.edit_Category_StatusMenuItem)
-        self._add_channel_inside_category_item = QObject(communities_names.scrollView_addButton_StatusChatListCategoryItemButton)
+        self._add_channel_inside_category_item = QObject(
+            communities_names.scrollView_addButton_StatusChatListCategoryItemButton)
         self._more_button = Button(communities_names.scrollView_menuButton_StatusChatListCategoryItemButton)
         self._arrow_button = Button(communities_names.scrollView_toggleButton_StatusChatListCategoryItemButton)
 
@@ -276,7 +280,6 @@ class LeftPanel(QObject):
             else:
                 raise er
 
-
     @allure.step('Get visibility state of create channel or category button')
     def is_create_channel_or_category_button_visible(self) -> bool:
         return self._channel_or_category_button.is_visible
@@ -300,7 +303,7 @@ class LeftPanel(QObject):
     @allure.step('Open general channel context menu')
     def open_general_channel_context_menu(self):
         self._general_channel_item.open_context_menu()
-        ContextMenu().wait_until_appears()
+        return ContextMenu()
 
     @allure.step('Open category context menu')
     def open_category_context_menu(self):
@@ -390,8 +393,10 @@ class Chat(QObject):
 
     def __init__(self):
         super().__init__(communities_names.mainWindow_ChatColumnView)
-        self._channel_icon = QObject(communities_names.chatMessageViewDelegate_channelIdentifierSmartIdenticon_StatusSmartIdenticon)
+        self._channel_icon = QObject(
-        self._channel_name_label = TextLabel(communities_names.chatMessageViewDelegate_channelIdentifierNameText_StyledText)
+            communities_names.chatMessageViewDelegate_channelIdentifierSmartIdenticon_StatusSmartIdenticon)
+        self._channel_name_label = TextLabel(
+            communities_names.chatMessageViewDelegate_channelIdentifierNameText_StyledText)
         self._channel_welcome_label = TextLabel(communities_names.chatMessageViewDelegate_Welcome)
         self._channel_identifier_view = QObject(messaging_names.chatMessageViewDelegate_ChannelIdentifierView)
 

test/e2e/tests/communities/test_communities_channels.py

@@ -16,7 +16,8 @@ pytestmark = marks
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703051', 'Delete community channel')
 @pytest.mark.case(703049, 703050, 703051)
 @pytest.mark.parametrize(
-    'channel_name, channel_description, channel_emoji, channel_emoji_image, channel_color, new_channel_name, new_channel_description, new_channel_emoji',
+    'channel_name, channel_description, channel_emoji, channel_emoji_image, channel_color, new_channel_name, '
+    'new_channel_description, new_channel_emoji',
     [('Channel', 'Description', 'sunglasses', None, '#4360df', 'New-channel', 'New channel description', 'thumbsup')])
 # @pytest.mark.critical TODO: https://github.com/status-im/desktop-qa-automation/issues/535
 def test_create_edit_remove_community_channel(main_screen, channel_name, channel_description, channel_emoji, channel_emoji_image,
@@ -87,19 +88,24 @@ def test_member_role_cannot_add_edit_and_delete_channels(main_screen: MainWindow
         with step('Right-click a channel on the left navigation bar'):
             community_screen.left_panel.right_click_on_panel()
         with step('Verify that context menu does not appear'):
-            assert not ContextMenu().is_visible
+            assert ContextMenu().is_visible is False, \
+                f"Context menu should not appear"
 
     with step('Verify that member cannot edit and delete channel'):
         with step('Right-click on general channel in the left navigation bar'):
-            community_screen.left_panel.open_general_channel_context_menu()
+            general_channel_context_menu = community_screen.left_panel.open_general_channel_context_menu()
-        with step('Verify that edit item is not present in context menu'):
+        with step('Verify that edit item is not present in channel context menu'):
-            assert not community_screen.tool_bar.is_edit_item_visible()
+            assert general_channel_context_menu.is_edit_channel_option_present() is False, \
-        with step('Verify that delete item is not present in context menu'):
+                f'Edit channel option is present when it should not'
-            assert not community_screen.tool_bar.is_delete_item_visible()
+        with step('Verify that delete item is not present in channel context menu'):
+            assert general_channel_context_menu.is_delete_channel_option_present() is False, \
+                f'Delete channel option is present when it should not'
 
-        with step('Open more options context menu'):
+        with step('Open context menu from the tool bar'):
-            more_options_dropdown = community_screen.tool_bar.open_more_options_dropdown()
+            more_options = community_screen.tool_bar.open_more_options_dropdown()
         with step('Verify that edit item is not present in context menu'):
-            assert not more_options_dropdown.is_edit_item_visible()
+            assert more_options.is_edit_channel_option_present() is False, \
+                f'Edit channel option is present when it should not'
         with step('Verify that delete item is not present in context menu'):
-            assert not more_options_dropdown.is_delete_item_visible()
+            assert more_options.is_delete_channel_option_present() is False, \
+                f'Delete channel option is present when it should not'