From 0c48f1da88d0616edddd44c8d999e01a41e227a9 Mon Sep 17 00:00:00 2001
From: Churikova Tetiana <churikova.tm@gmail.com>
Date: Tue, 28 Sep 2021 17:50:55 +0200
Subject: [PATCH] e2e: fixes

---
 test/appium/pytest.ini                             | 1 +
 test/appium/tests/atomic/chats/test_communities.py | 2 ++
 test/appium/tests/atomic/chats/test_one_to_one.py  | 6 +++---
 test/appium/views/home_view.py                     | 1 -
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/appium/pytest.ini b/test/appium/pytest.ini
index 6e6cacfefe..3e06c88f43 100644
--- a/test/appium/pytest.ini
+++ b/test/appium/pytest.ini
@@ -7,6 +7,7 @@ markers =
     high: TCs by priority
     medium: TCs by priority
     low: TCs by priority
+    upgrade: upgrade TCs with migrating DB
 
     testrail_case_id: case ID in testrail
     flaky: flaky tests for re-run if necessary
diff --git a/test/appium/tests/atomic/chats/test_communities.py b/test/appium/tests/atomic/chats/test_communities.py
index ba6f22aa6b..5c2966b064 100644
--- a/test/appium/tests/atomic/chats/test_communities.py
+++ b/test/appium/tests/atomic/chats/test_communities.py
@@ -76,6 +76,8 @@ class TestCommunitiesMultipleDevices(MultipleDeviceTestCase):
 
     @marks.testrail_id(695845)
     @marks.medium
+    @marks.skip
+    # TODO: blocked due to 12649
     def test_notification_in_activity_center_for_mention_in_community_and_group_chat(self):
         self.create_drivers(2)
         home_1, home_2 = SignInView(self.drivers[0]).create_user(), SignInView(self.drivers[1]).create_user()
diff --git a/test/appium/tests/atomic/chats/test_one_to_one.py b/test/appium/tests/atomic/chats/test_one_to_one.py
index 94d9b74f44..93db93ebb3 100644
--- a/test/appium/tests/atomic/chats/test_one_to_one.py
+++ b/test/appium/tests/atomic/chats/test_one_to_one.py
@@ -449,7 +449,7 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase):
 
     @marks.testrail_id(695847)
     @marks.medium
-    def test_can_pin_messages_in_ono_to_one_and_group_chats(self):
+    def test_can_pin_messages_in_one_to_one_and_group_chats(self):
         self.create_drivers(2)
         device_1, device_2 = SignInView(self.drivers[0]), SignInView(self.drivers[1])
 
@@ -531,8 +531,8 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase):
         group_chat_2.join_chat_button.click()
         group_chat_1.send_message(message_1)
         group_chat_1.pin_message(message_1)
-        if not (group_chat_1.chat_element_by_text(message_1).pinned_by_label.is_element_present() and
-                group_chat_2.chat_element_by_text(message_1).pinned_by_label.is_element_present()):
+        if not (group_chat_1.chat_element_by_text(message_1).pinned_by_label.is_element_present(30) and
+                group_chat_2.chat_element_by_text(message_1).pinned_by_label.is_element_present(30)):
             self.errors.append("Message is not pinned in group chat!")
 
         home_1.just_fyi("Check that non admin user can not unpin messages")
diff --git a/test/appium/views/home_view.py b/test/appium/views/home_view.py
index e235ef508e..16c4d94c35 100644
--- a/test/appium/views/home_view.py
+++ b/test/appium/views/home_view.py
@@ -223,7 +223,6 @@ class HomeView(BaseView):
             one_to_one_chat.chat_options.click()
             one_to_one_chat.view_profile_button.click()
             one_to_one_chat.set_nickname(nickname)
-            one_to_one_chat.close_button.click()
         self.driver.info("**1-1 chat is created successfully!**")
         return one_to_one_chat