diff --git a/test/appium/tests/activity_center/test_activity_center.py b/test/appium/tests/activity_center/test_activity_center.py index 28ab66043a..3ad0fbe9be 100644 --- a/test/appium/tests/activity_center/test_activity_center.py +++ b/test/appium/tests/activity_center/test_activity_center.py @@ -350,12 +350,6 @@ class TestActivityMultipleDevicePR(MultipleSharedDeviceTestCase): if reply_element.is_element_displayed(): self.errors.append("Reply is still shown after removing from activity centre!") - self.home_1.just_fyi("Reset filter to show all AC notifications again") - self.home_1.reply_activity_tab_button.click() - self.home_1.mention_activity_tab_button.click() - self.home_1.all_activity_tab_button.click() - self.home_1.close_activity_centre.click() - self.errors.verify_no_errors() diff --git a/test/appium/tests/critical/chats/test_1_1_public_chats.py b/test/appium/tests/critical/chats/test_1_1_public_chats.py index 337e833b53..75e875fc3e 100644 --- a/test/appium/tests/critical/chats/test_1_1_public_chats.py +++ b/test/appium/tests/critical/chats/test_1_1_public_chats.py @@ -668,9 +668,9 @@ class TestOneToOneChatMultipleSharedDevicesNewUiTwo(MultipleSharedDeviceTestCase self.home_2.just_fyi("Deleting chat via delete button and check it will not reappear after relaunching app") self.home_2.delete_chat_long_press(username=self.username_1) if self.home_2.get_chat_from_home_view(self.username_1).is_element_displayed(): - self.errors.append('Deleted %s chat is shown, but the chat has been deleted' % self.username_1) + self.errors.append("Deleted '%s' chat is shown, but the chat has been deleted" % self.username_1) self.home_2.reopen_app() if self.home_2.get_chat_from_home_view(self.username_1).is_element_displayed(15): self.errors.append( - 'Deleted chat %s is shown after re-login, but the chat has been deleted' % self.username_1) + "Deleted chat '%s' is shown after re-login, but the chat has been deleted" % self.username_1) self.errors.verify_no_errors() diff --git a/test/appium/tests/critical/chats/test_public_chat_browsing.py b/test/appium/tests/critical/chats/test_public_chat_browsing.py index 7a38432736..085cf6b46b 100644 --- a/test/appium/tests/critical/chats/test_public_chat_browsing.py +++ b/test/appium/tests/critical/chats/test_public_chat_browsing.py @@ -71,7 +71,6 @@ class TestCommunityOneDeviceMerged(MultipleSharedDeviceTestCase): self.errors.verify_no_errors() @marks.testrail_id(702846) - @marks.xfail(reason="Issue #18075", run=False) def test_community_navigate_to_channel_when_relaunch(self): text_message = 'some_text' if not self.channel.chat_message_input.is_element_displayed(): diff --git a/test/appium/tests/critical/test_deep_and_universal_links.py b/test/appium/tests/critical/test_deep_and_universal_links.py index 2776da2b26..6957e9f8c4 100644 --- a/test/appium/tests/critical/test_deep_and_universal_links.py +++ b/test/appium/tests/critical/test_deep_and_universal_links.py @@ -92,6 +92,7 @@ class TestDeepLinksOneDevice(MultipleSharedDeviceTestCase): self.errors.verify_no_errors() @marks.testrail_id(704614) + @marks.skip # ToDo: the feature is not ready yet def test_links_open_universal_links_from_other_apps(self): app_package = self.driver.current_package self.home.just_fyi("Opening a profile URL from google search bar when user is still logged in") diff --git a/test/appium/views/chat_view.py b/test/appium/views/chat_view.py index a98fb8f2ee..48570a6345 100644 --- a/test/appium/views/chat_view.py +++ b/test/appium/views/chat_view.py @@ -291,7 +291,8 @@ class ChatElementByText(Text): try: self.driver.info("Trying to access image inside message with text '%s'" % self.message_text) ChatElementByText(self.driver, self.message_text).wait_for_sent_state(60) - return Button(self.driver, xpath="%s//*[@content-desc='image-message']" % self.locator) + return Button(self.driver, + xpath="%s//android.widget.ImageView[@content-desc='image-message']" % self.locator) except NoSuchElementException: self.driver.fail("No image is found in message!") diff --git a/test/appium/views/elements_templates/saucelabs_sauce_chat.png b/test/appium/views/elements_templates/saucelabs_sauce_chat.png index 368484d058..d064a4994a 100644 Binary files a/test/appium/views/elements_templates/saucelabs_sauce_chat.png and b/test/appium/views/elements_templates/saucelabs_sauce_chat.png differ diff --git a/test/appium/views/home_view.py b/test/appium/views/home_view.py index 32f3e2816e..2db4479ffd 100644 --- a/test/appium/views/home_view.py +++ b/test/appium/views/home_view.py @@ -276,7 +276,8 @@ class HomeView(BaseView): # Options on long tap self.chats_menu_invite_friends_button = Button(self.driver, accessibility_id="chats-menu-invite-friends-button") - self.delete_chat_button = Button(self.driver, translation_id="close-chat") + self.close_chat_button = Button(self.driver, accessibility_id="close-chat") + self.confirm_closing_chat_button = Button(self.driver, accessibility_id="Confirm") self.clear_history_button = Button(self.driver, accessibility_id="clear-history") self.mute_chat_button = MuteButton(self.driver, accessibility_id="mute-chat") self.mute_community_button = MuteButton(self.driver, accessibility_id="mute-community") @@ -521,8 +522,8 @@ class HomeView(BaseView): def delete_chat_long_press(self, username): self.driver.info("Deleting chat '%s' by long press" % username) self.get_chat(username).long_press_element() - self.delete_chat_button.click() - self.delete_chat_button.click() + self.close_chat_button.click() + self.confirm_closing_chat_button.click() def leave_chat_long_press(self, username): self.driver.info("Leaving chat '%s' by long press" % username)