From ca2ed9d37edf1e305268a68d0fe544ad71d00257 Mon Sep 17 00:00:00 2001 From: Yevheniia Berdnyk Date: Mon, 3 Jul 2023 12:20:30 +0300 Subject: [PATCH] e2e: fixes for backup users and unread indicator tests --- .../tests/critical/test_public_chat_browsing.py | 17 ++++++++--------- test/appium/views/dbs/waku_backup/user.py | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/test/appium/tests/critical/test_public_chat_browsing.py b/test/appium/tests/critical/test_public_chat_browsing.py index 99e032a288..783390605f 100644 --- a/test/appium/tests/critical/test_public_chat_browsing.py +++ b/test/appium/tests/critical/test_public_chat_browsing.py @@ -388,10 +388,10 @@ class TestCommunityOneDeviceMerged(MultipleSharedDeviceTestCase): else: chat = self.home.get_chat_view() chat.profile_send_message_button.click() - shown_name_text = chat.user_name_text_new_UI.text - if shown_name_text in waku_user.contacts: - waku_user.contacts.remove(shown_name_text) - continue + for name in waku_user.contacts: + if chat.element_starts_with_text(name).is_element_displayed(sec=20): + waku_user.contacts.remove(name) + continue if waku_user.contacts: self.errors.append( "Contact(s) was (were) not restored from backup: %s!" % ", ".join(waku_user.contacts)) @@ -814,11 +814,10 @@ class TestCommunityMultipleDeviceMerged(MultipleSharedDeviceTestCase): def test_community_mark_all_messages_as_read(self): self.channel_1.click_system_back_button_until_element_is_shown() self.home_1.communities_tab.click() - if not self.channel_2.chat_message_input.is_element_displayed(): - self.channel_2.click_system_back_button_until_element_is_shown() - self.home_2.communities_tab.click() - self.home_2.get_chat(self.community_name, community=True).click() - self.community_2.get_channel(self.channel_name).click() + self.channel_2.click_system_back_button_until_element_is_shown() + self.home_2.communities_tab.click() + self.home_2.get_chat(self.community_name, community=True).click() + self.community_2.get_channel(self.channel_name).click() self.channel_2.send_message(self.text_message) community_1_element = self.community_1.get_chat(self.community_name) if not community_1_element.new_messages_public_chat.is_element_displayed(90): diff --git a/test/appium/views/dbs/waku_backup/user.py b/test/appium/views/dbs/waku_backup/user.py index 5c3fea28f7..a5eda744b6 100644 --- a/test/appium/views/dbs/waku_backup/user.py +++ b/test/appium/views/dbs/waku_backup/user.py @@ -7,5 +7,5 @@ communities = { 'member_closed': 'test_comm_enc', 'member_pending': 'RC1 testing community' } -contacts = ['Test_contact', 'my-custom-nickname'] +contacts = ['Test_contact', 'MyCustomNickname'] blocked_user = 'Clear Flat Milkweedbug' \ No newline at end of file