Fix tests and disable non-relevant

status-im · Feb 5, 2020 · 4d8aff2 · 4d8aff2
1 parent f9c15be
commit 4d8aff2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/test/appium/tests/atomic/account_management/test_profile.py b/test/appium/tests/atomic/account_management/test_profile.py
@@ -226,6 +226,8 @@ def test_can_add_existing_ens(self):
 
     @marks.testrail_id(5475)
     @marks.low
+    @marks.skip
+    # TODO: skip until profile picture change feature is enabled
     def test_change_profile_picture_several_times(self):
         sign_in_view = SignInView(self.driver)
         sign_in_view.create_user()
@@ -392,6 +394,8 @@ def test_log_level_and_fleet(self):
 
     @marks.testrail_id(5468)
     @marks.medium
+    @marks.skip
+    # TODO: skip until profile picture change feature is enabled
     def test_deny_camera_access_changing_profile_photo(self):
         sign_in = SignInView(self.driver)
         sign_in.create_user()
@@ -408,6 +412,8 @@ def test_deny_camera_access_changing_profile_photo(self):
 
     @marks.testrail_id(5469)
     @marks.medium
+    @marks.skip
+    # TODO: skip until profile picture change feature is enabled
     def test_deny_device_storage_access_changing_profile_photo(self):
         sign_in = SignInView(self.driver)
         sign_in.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
@@ -278,7 +278,7 @@ def test_message_marked_as_sent_in_1_1_chat(self):
         self.errors.verify_no_errors()
 
     @marks.testrail_id(5362)
-    @marks.critical
+    @marks.medium
     def test_unread_messages_counter_1_1_chat(self):
         self.create_drivers(2)
         device_1, device_2 = SignInView(self.drivers[0]), SignInView(self.drivers[1])
@@ -308,7 +308,7 @@ def test_unread_messages_counter_1_1_chat(self):
         if device_1_home.home_button.counter.is_element_displayed():
             self.errors.append('New messages counter is shown on Home button for already seen message')
 
-        if chat_element.new_messages_counter.is_element_displayed():
+        if chat_element.new_messages_counter.text == '1':
             self.errors.append('New messages counter is shown on chat element for already seen message')
         self.errors.verify_no_errors()
 

diff --git a/test/appium/tests/atomic/chats/test_public.py b/test/appium/tests/atomic/chats/test_public.py
@@ -117,7 +117,7 @@ def test_unread_messages_counter_public_chat(self):
         if home_1.home_button.counter.is_element_displayed():
             self.errors.append('New messages counter is shown on Home button for already seen message')
 
-        if chat_element.new_messages_counter.is_element_displayed():
+        if chat_element.new_messages_counter.text == '1':
             self.errors.append('New messages counter is shown on chat element for already seen message')
         self.errors.verify_no_errors()
 

diff --git a/test/appium/views/home_view.py b/test/appium/views/home_view.py
@@ -113,9 +113,8 @@ def __init__(self, driver, parent_locator: str):
                 # TODO: commented until accessibility-id will be added back
                 # locator_str = "//*[@content-desc='unread-messages-count-text']"
                 # self.locator = self.Locator.xpath_selector(parent_locator + locator_str)
-                locator_str = "/android.view.ViewGroup[2]//android.widget.TextView"
-                self.locator = self.Locator.xpath_selector(parent_locator + locator_str)
-
+                locator_str = "//android.widget.TextView)[last()]"
+                self.locator = self.Locator.xpath_selector("(" + parent_locator + locator_str)
 
         return UnreadMessagesCountText(self.driver, self.locator.value)