diff --git a/gui/screens/messages.py b/gui/screens/messages.py index 5ca1e17..817aeb6 100644 --- a/gui/screens/messages.py +++ b/gui/screens/messages.py @@ -35,22 +35,10 @@ class LeftPanel(QObject): self._chat_list_item = QObject(messaging_names.scrollView_StatusChatListItem) @property - @allure.step('Get contacts') - def chats(self) -> typing.List[str]: + @allure.step('Get chats by chats list') + def get_chats_names(self) -> typing.List[str]: return self._chats_list.get_values('objectName') - @allure.step('Open chat') - def get_chats_list(self): - started_at = time.monotonic() - chats_list = [] - while True: - for obj in driver.findAllObjects(self._chat_list_item.real_name): - chats_list.append(str(obj.name)) - if time.monotonic() - started_at > 10 and len(chats_list) == 0: - raise LookupError('Chats list is empty') - else: - return chats_list - @allure.step('Click chat item') def click_chat_by_name(self, chat_name: str): self._chat_list_item.real_name['objectName'] = chat_name diff --git a/tests/messages/test_messaging_group_chat.py b/tests/messages/test_messaging_group_chat.py index c40ed1a..3fc685f 100644 --- a/tests/messages/test_messaging_group_chat.py +++ b/tests/messages/test_messaging_group_chat.py @@ -37,7 +37,8 @@ def test_group_chat(multiple_instances, user_data_one, user_data_two, user_data_ main_window = MainWindow() messages_screen = MessagesScreen() - with multiple_instances(user_data=user_data_one) as aut_one, multiple_instances(user_data=user_data_two) as aut_two, multiple_instances( + with multiple_instances(user_data=user_data_one) as aut_one, multiple_instances( + user_data=user_data_two) as aut_two, multiple_instances( user_data=user_data_three) as aut_three: with step(f'Launch multiple instances with authorized users {user_one.name}, {user_two.name}, {user_three}'): for aut, account in zip([aut_one, aut_two, aut_three], [user_one, user_two, user_three]): @@ -100,7 +101,7 @@ def test_group_chat(multiple_instances, user_data_one, user_data_two, user_data_ with step(f'Check group members and message for {user_two.name}'): aut_two.attach() main_window.prepare() - assert group_chat_new_name in messages_screen.left_panel.get_chats_list(), \ + assert group_chat_new_name in messages_screen.left_panel.get_chats_names, \ f'{group_chat_new_name} is not present in chats list for {aut_two}' messages_screen.left_panel.click_chat_by_name(group_chat_new_name) @@ -123,7 +124,7 @@ def test_group_chat(multiple_instances, user_data_one, user_data_two, user_data_ messages_screen.left_panel.open_leave_group_popup(group_chat_new_name).confirm_leaving() with step('Check that group name is not displayed on left panel'): - assert group_chat_new_name not in messages_screen.left_panel.get_chats_list() + assert group_chat_new_name not in messages_screen.left_panel.get_chats_names main_window.hide() with step(f'Check group members and message for {user_three.name}'): @@ -131,7 +132,7 @@ def test_group_chat(multiple_instances, user_data_one, user_data_two, user_data_ main_window.prepare() with step(f'Check that {user_three.name} is not a member of a group'): - assert group_chat_new_name in messages_screen.left_panel.get_chats_list(), \ + assert group_chat_new_name in messages_screen.left_panel.get_chats_names, \ 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) gray_message_text = messages_screen.group_chat.gray_text_from_message_area @@ -140,22 +141,22 @@ def test_group_chat(multiple_instances, user_data_one, user_data_two, user_data_ with step('Verify members in a group members list'): assert user_one.name in messages_screen.right_panel.members - assert user_two.name in messages_screen.right_panel.members is False + assert user_two.name in messages_screen.right_panel.members assert user_three.name in messages_screen.right_panel.members is False - assert len(messages_screen.right_panel.members) == 2 # it has to be 2 since user3 is kicked and not + assert len(messages_screen.right_panel.members) == 2 # it has to be 2 since user3 is kicked and not # receiving any updates from that moment with step('Leave group'): messages_screen.group_chat.leave_group().confirm_leaving() with step('Check that group name is not displayed on left panel'): - assert group_chat_new_name not in messages_screen.left_panel.get_chats_list() + assert group_chat_new_name not in messages_screen.left_panel.get_chats_names main_window.hide() with step(f'Get back to {aut_one} and check members list'): aut_one.attach() main_window.prepare() - assert group_chat_new_name in messages_screen.left_panel.get_chats_list(), \ + assert group_chat_new_name in messages_screen.left_panel.get_chats_names, \ f'{group_chat_new_name} is not present in chats list for {aut_one}' messages_screen.left_panel.click_chat_by_name(group_chat_new_name) assert user_one.name in messages_screen.right_panel.members @@ -165,4 +166,4 @@ def test_group_chat(multiple_instances, user_data_one, user_data_two, user_data_ messages_screen.group_chat.leave_group().confirm_leaving() with step('Check that group name is not displayed on left panel'): - assert group_chat_new_name in messages_screen.left_panel.get_chats_list() is False + assert group_chat_new_name in messages_screen.left_panel.get_chats_names is False diff --git a/tests/settings/settings_messaging/test_messaging_settings_accept_request.py b/tests/settings/settings_messaging/test_messaging_settings_accept_request.py index 8836acb..5f2df4a 100644 --- a/tests/settings/settings_messaging/test_messaging_settings_accept_request.py +++ b/tests/settings/settings_messaging/test_messaging_settings_accept_request.py @@ -95,11 +95,11 @@ def test_messaging_settings_accepting_request(multiple_instances): with step(f'Verify that 1X1 chat with {user_two.name} appeared for {user_one.name}'): messages_screen = main_window.left_panel.open_messages_screen() - assert user_two.name in messages_screen.left_panel.get_chats_list() + assert user_two.name in messages_screen.left_panel.get_chats_names main_window.hide() with step(f'Verify that 1X1 chat with {user_one.name} appeared for {user_two.name}'): aut_two.attach() main_window.prepare() messages_screen = main_window.left_panel.open_messages_screen() - assert user_one.name in messages_screen.left_panel.get_chats_list() + assert user_one.name in messages_screen.left_panel.get_chats_names