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 7990eab76e..326b89c738 100644 --- a/test/appium/tests/atomic/chats/test_one_to_one.py +++ b/test/appium/tests/atomic/chats/test_one_to_one.py @@ -327,7 +327,7 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase): device_1_status = 'Hey hey hey' timeline = device_1.status_button.click() timeline.set_new_status(device_1_status, image=True) - for element in timeline.element_by_text(device_1_status), timeline.image_chat_item: + for element in timeline.element_by_text(device_1_status), timeline.image_message_in_chat: if not element.is_element_displayed(): self.drivers[0].fail('Status is not set') @@ -346,13 +346,13 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase): device_1_chat.chat_message_input.set_value(image_description) device_1_chat.send_message_button.click() device_1_chat.chat_message_input.click() - for message in device_1_chat.image_chat_item, device_1_chat.chat_element_by_text(image_description): + for message in device_1_chat.image_message_in_chat, device_1_chat.chat_element_by_text(image_description): if not message.is_element_displayed(): self.errors.append('Image or description is not shown in chat after sending for sender') device_1_chat.show_images_button.click() device_1_chat.image_from_gallery_button.click() device_1_chat.click_system_back_button() - device_1_chat.image_chat_item.long_press_element() + device_1_chat.image_message_in_chat.long_press_element() for element in device_1_chat.reply_message_button, device_1_chat.save_image_button: if not element.is_element_displayed(): self.errors.append('Save and reply are not available on long-press on own image messages') @@ -361,21 +361,21 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase): device_2_home.just_fyi('check image, description and options for receiver') device_2_chat = device_2_home.get_chat(device_1_username).click() - for message in device_2_chat.image_chat_item, device_2_chat.chat_element_by_text(image_description): + for message in device_2_chat.image_message_in_chat, device_2_chat.chat_element_by_text(image_description): if not message.is_element_displayed(): self.errors.append('Image or description is not shown in chat after sending for receiver') device_2_home.just_fyi('View user profile and check status') device_2_chat.chat_options.click() timeline_device_1 = device_2_chat.view_profile_button.click() - for element in timeline_device_1.element_by_text(device_1_status), timeline_device_1.image_chat_item: + for element in timeline_device_1.element_by_text(device_1_status), timeline_device_1.image_message_in_chat: element.scroll_to_element() if not element.is_element_displayed(): self.drivers[0].fail('Status of another user not shown when open another user profile') device_2_chat.close_button.click() device_2_home.just_fyi('check options on long-press image for receiver') - device_2_chat.image_chat_item.long_press_element() + device_2_chat.image_message_in_chat.long_press_element() for element in (device_2_chat.reply_message_button, device_2_chat.save_image_button): if not element.is_element_displayed(): self.errors.append('Save and reply are not available on long-press on received image messages') diff --git a/test/appium/tests/atomic/test_upgrade.py b/test/appium/tests/atomic/test_upgrade.py index 7acde32fbd..1b933df17b 100644 --- a/test/appium/tests/atomic/test_upgrade.py +++ b/test/appium/tests/atomic/test_upgrade.py @@ -55,7 +55,7 @@ class TestUpgradeApplication(SingleDeviceTestCase): not_contact_chat = home.get_chat(not_contact).click() if not not_contact_chat.add_to_contacts.is_element_displayed(): self.errors.append('Add to contacts is not shown in 1-1 chat') - images = not_contact_chat.image_chat_item.find_elements() + images = not_contact_chat.image_message_in_chat.find_elements() if len(images) != 2: self.errors.append('%s images are shown instead of 2' % str(len(images))) for message in chats[not_contact]['messages']: @@ -437,7 +437,7 @@ class TestUpgradeMultipleApplication(MultipleDeviceTestCase): chat_name = group.make_admin['name'] [chat_1, chat_2] = [home.get_chat(chat_name).click() for home in (home_1, home_2)] for chat in [chat_1, chat_2]: - if not chat.image_chat_item.is_element_displayed(): + if not chat.image_message_in_chat.is_element_displayed(): self.errors.append("Image in group chat is not shown after upgrade") if not chat.audio_message_in_chat_timer.is_element_displayed(): self.errors.append('Timer is not shown for audiomessage in group chat') @@ -488,7 +488,7 @@ class TestUpgradeMultipleApplication(MultipleDeviceTestCase): device_1.just_fyi("Check status") timeline = home_1.status_button.click() statuses = group.timeline - for element in timeline.element_by_text(statuses['text']), timeline.image_chat_item, timeline.element_by_text(statuses['link']): + for element in timeline.element_by_text(statuses['text']), timeline.image_message_in_chat, timeline.element_by_text(statuses['link']): if not element.is_element_displayed(): self.errors.append("Status is not shown after upgrade!") timeline.element_by_text(statuses['link']).click() diff --git a/test/appium/tests/atomic/transactions/test_wallet.py b/test/appium/tests/atomic/transactions/test_wallet.py index 49b6f38907..14bfb1ad68 100644 --- a/test/appium/tests/atomic/transactions/test_wallet.py +++ b/test/appium/tests/atomic/transactions/test_wallet.py @@ -177,6 +177,7 @@ class TestTransactionWalletSingleDevice(SingleDeviceTestCase): wallet.set_up_wallet() for asset in ('ETH', 'MDS', 'STT'): wallet.wait_balance_is_changed(asset) + wallet.accounts_status_account.scroll_to_element(direction='up') wallet.accounts_status_account.click() transaction = wallet.transaction_history_button.click() if not wallet.element_by_translation_id("transactions-history-empty").is_element_displayed(): diff --git a/test/appium/tests/atomic/zzz_multiple_drivers_tests/test_multiple_driver_tests.py b/test/appium/tests/atomic/zzz_multiple_drivers_tests/test_multiple_driver_tests.py index ee8c8bc032..13a96e0372 100644 --- a/test/appium/tests/atomic/zzz_multiple_drivers_tests/test_multiple_driver_tests.py +++ b/test/appium/tests/atomic/zzz_multiple_drivers_tests/test_multiple_driver_tests.py @@ -228,7 +228,7 @@ class TestGroupChatMultipleDevice(MultipleDeviceTestCase): device_1_chat.send_message_button.click() device_1_chat.chat_message_input.click() for chat in device_1_chat, device_2_chat, device_3_chat: - if not chat.image_chat_item.is_element_displayed(60): + if not chat.image_message_in_chat.is_element_displayed(60): self.errors.append('Image is not shown in chat after sending for %s' % chat.driver.number) device_1.just_fyi('Send audio message to group chat and verify it on all devices') device_1_chat.record_audio_message(message_length_in_seconds=3) diff --git a/test/appium/views/chat_view.py b/test/appium/views/chat_view.py index 0faaae79ca..0bf33bc3f2 100644 --- a/test/appium/views/chat_view.py +++ b/test/appium/views/chat_view.py @@ -573,10 +573,9 @@ class ChatView(BaseView): self.show_images_button = Button(self.driver, accessibility_id="show-photo-icon") self.take_photo_button = Button(self.driver, accessibility_id="take-picture") self.image_from_gallery_button = Button(self.driver, accessibility_id="open-gallery") - self.image_message_in_chat = Button(self.driver, accessibility_id="image-message") self.first_image_from_gallery = Button(self.driver, xpath="//*[@content-desc='open-gallery']/following-sibling::android.view.ViewGroup[1]") - self.image_message_in_chat = Button(self.driver, accessibility_id="message-image") + self.image_message_in_chat = Button(self.driver, accessibility_id="image-message") self.save_image_button = Button(self.driver, translation_id="save") self.recent_image_in_gallery = Button(self.driver, xpath="//*[contains(@resource-id,'thumbnail')]")