e2e: align with chat optimization

Signed-off-by: Churikova Tetiana <churikova.tm@gmail.com>

test/appium/requirements.txt

@@ -1,10 +1,10 @@
-aiohttp==4.0.0a1
+aiohttp==3.7.4
 allpairspy==2.5.0
 apipkg==1.5
 Appium-Python-Client==1.0.2
 async-timeout==3.0.1
 certifi==2020.11.8
-chardet==4.0.0
+chardet==3.0.4
 cycler==0.10.0
 cytoolz==0.11.0
 emoji==0.5.0
@@ -19,7 +19,7 @@ idna==2.10
 kiwisolver==1.3.1
 lxml==4.6.2
 matplotlib==3.3.3
-multidict==3.1.3
+multidict==5.0.2
 namedlist==1.8
 numpy==1.19.4
 pbkdf2==1.3

test/appium/tests/atomic/chats/test_chats_management.py

@@ -1026,9 +1026,6 @@ class TestChatManagementMultipleDevice(MultipleDeviceTestCase):
                 chat_1.search_user_in_mention_suggestion_list(
                     sender['username']).is_element_displayed()):
             self.errors.append('ENS-owner user is not available in mention suggestion list')
-        device_1.just_fyi('Check there is own username is present in any 1-1 chat')
-        if not chat_1.search_user_in_mention_suggestion_list(own_default_username[1]).is_element_displayed():
-            self.errors.append('Own username is not available in mention suggestion list')
 
         device_1.just_fyi('Check there is no random user in different public chat')
         chat_1.get_back_to_home_view(2)

test/appium/tests/atomic/chats/test_one_to_one.py

@@ -389,7 +389,7 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase):
         chat_1 = home_1.add_contact(public_key_2)
         url_message = 'http://status.im'
         chat_1.send_message(url_message)
-        chat_1.get_back_to_home_view()
+        chat_1.home_button.double_click()
         chat_2 = home_2.get_chat(default_username_1).click()
         chat_2.element_starts_with_text(url_message, 'button').click()
         web_view = chat_2.open_in_status_button.click()
@@ -397,7 +397,7 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase):
             web_view.element_by_text('Private, Secure Communication').find_element()
         except TimeoutException:
             self.errors.append('Device 2: URL was not opened from 1-1 chat')
-        web_view.back_to_home_button.click()
+        home_2.dapp_tab_button.double_click()
         chat_2.home_button.click()
 
         home_1.just_fyi("Check that link can be opened from public chat")

test/appium/tests/atomic/dapps_and_browsing/test_browsing.py

@@ -83,11 +83,10 @@ class TestBrowsing(SingleDeviceTestCase):
         home.dapp_tab_button.double_click()
         browsing_view = dapp.open_url('invalid.takoe')
         browsing_view.element_by_translation_id("web-view-error").wait_for_element(20)
-        browsing_view.cross_icon.click()
+        browsing_view.dapp_tab_button.double_click()
 
         dapp.just_fyi('Checking offline state')
         home.toggle_airplane_mode()
-        home.dapp_tab_button.double_click()
         browsing_view = dapp.open_url('status.im')
         offline_texts = ['Unable to load page', 'ERR_INTERNET_DISCONNECTED']
         for text in offline_texts:

test/appium/views/base_view.py

@@ -45,7 +45,7 @@ class TabButton(Button):
         class Counter(Text):
             def __init__(self, driver, parent_locator):
                 super().__init__(driver,
-                                 xpath="//*[@content-desc='%s']//android.view.ViewGroup[2]/android.widget.TextView" % parent_locator)
+                                 xpath="//*[@content-desc='%s']//android.view.ViewGroup/android.widget.TextView" % parent_locator)
         return Counter(self.driver, self.locator)
 
     @property
@@ -228,7 +228,7 @@ class BaseView(object):
         self.discard_button = Button(self.driver, xpath="//*[@text='DISCARD']")
         self.confirm_button = Button(self.driver, translation_id='confirm', uppercase=True)
 
-        self.cross_icon = Button(self.driver, xpath="(//android.view.ViewGroup[@content-desc='icon'])[1]")
+        self.cross_icon = Button(self.driver, xpath="(//android.widget.ImageView[@content-desc='icon'])[1]")
         self.native_close_button = Button(self.driver, id="android:id/aerr_close")
         self.show_roots_button = Button(self.driver, accessibility_id="Show roots")
         self.get_started_button = Button(self.driver, translation_id="get-started")

test/appium/views/chat_view.py

@@ -433,7 +433,7 @@ class ChatView(BaseView):
         self.send_audio_message_button = Button(self.driver, accessibility_id="send-message-button")
         self.play_pause_audio_message_button = Button(self.driver, accessibility_id="play-pause-audio-message-button")
         self.audio_message_in_chat_timer = Text(self.driver,
-                                                xpath="//android.view.ViewGroup[@content-desc='play-pause-audio-message-button']/../..//android.widget.TextView[1]")
+                                                xpath="//*[@content-desc='play-pause-audio-message-button']/../..//android.widget.TextView[1]")
         self.audio_message_recorded_time = Text(self.driver, accessibility_id="audio-message-recorded-time")
 
         # Group chats

test/appium/views/profile_view.py

@@ -245,7 +245,7 @@ class ProfileView(BaseView):
         ## Network
         self.network_settings_button = Button(self.driver, accessibility_id="network-button")
         self.active_network_name = Text(self.driver, xpath="//android.widget.TextView[contains(@text,'with upstream RPC')]")
-        self.plus_button = Button(self.driver, xpath="(//android.view.ViewGroup[@content-desc='icon'])[2]")
+        self.plus_button = Button(self.driver, xpath="(//android.widget.ImageView[@content-desc='icon'])[2]")
         self.ropsten_chain_button = Button(self.driver, translation_id="ropsten-network")
         self.custom_network_url_input = EditBox(self.driver, translation_id="rpc-url",
                                                 suffix="/following-sibling::*[1]/android.widget.EditText")

test/appium/views/transactions_view.py

@@ -6,7 +6,7 @@ from views.base_view import BaseView
 
 class OptionsButton(Button):
     def __init__(self, driver):
-        super().__init__(driver, xpath="(//android.view.ViewGroup[@content-desc='icon'])[2]")
+        super().__init__(driver, xpath="(//android.widget.ImageView[@content-desc='icon'])[2]")
     def click(self):
         self.click_until_presence_of_element(OptionsButton.CopyTransactionHashButton(self.driver))
 

test/appium/views/web_views/base_web_view.py

@@ -11,7 +11,6 @@ class BaseWebView(BaseView):
         self.progress_bar_icon = Button(self.driver, xpath="//android.widget.ProgressBar")
         self.url_edit_box_lock_icon = Button(self.driver, xpath="'(//android.view.ViewGroup[@content-desc='icon'])[2]")
         self.policy_summary = Button(self.driver, xpath="//*[@content-desc='Policy summary'] | //*[@text='Policy summary']")
-        self.back_to_home_button = Button(self.driver, xpath="(//android.view.ViewGroup[@content-desc='icon'])[1]")
         self.browser_previous_page_button = Button(self.driver, accessibility_id="previous-page-button")
         self.browser_next_page_button = Button(self.driver, accessibility_id="next-page-button")