diff --git a/test/appium/tests/atomic/account_management/test_keycard.py b/test/appium/tests/atomic/account_management/test_keycard.py index 2a8805457d..20e16c2185 100644 --- a/test/appium/tests/atomic/account_management/test_keycard.py +++ b/test/appium/tests/atomic/account_management/test_keycard.py @@ -61,7 +61,7 @@ class TestCreateAccount(SingleDeviceTestCase): sign_in.confirm_button.click() keycard = sign_in.move_and_reset_button.click() keycard.begin_setup_button.click() - keycard.connect_card_button.click() + keycard.connect_card_button.wait_and_click() keycard.enter_default_pin() keycard.enter_default_pin() if not sign_in.element_by_translation_id("migration-successful").is_element_displayed(30): @@ -126,7 +126,7 @@ class TestCreateAccount(SingleDeviceTestCase): sign_in.migration_password_input.set_value(common_password) sign_in.confirm_button.click() keycard.begin_setup_button.click() - keycard.connect_card_button.click() + keycard.connect_card_button.wait_and_click() keycard.enter_default_pin() keycard.enter_default_pin() if not sign_in.element_by_translation_id("migration-successful").is_element_displayed(30): @@ -187,7 +187,7 @@ class TestCreateAccount(SingleDeviceTestCase): keycard_flow = sign_in.keycard_storage_button.click() keycard_flow.next_button.click() keycard_flow.begin_setup_button.click() - keycard_flow.connect_card_button.click() + keycard_flow.connect_card_button.wait_and_click() keycard_flow.enter_another_pin() keycard_flow.cancel_button.click() @@ -246,7 +246,7 @@ class TestCreateAccount(SingleDeviceTestCase): sign_in.just_fyi('Cancel on PIN code setup stage') keycard_flow.next_button.click() keycard_flow.begin_setup_button.click() - keycard_flow.connect_card_button.click() + keycard_flow.connect_card_button.wait_and_click() keycard_flow.enter_another_pin() keycard_flow.cancel_button.click() diff --git a/test/appium/tests/atomic/account_management/test_profile.py b/test/appium/tests/atomic/account_management/test_profile.py index 6c7e7c9c12..04edbe4af4 100644 --- a/test/appium/tests/atomic/account_management/test_profile.py +++ b/test/appium/tests/atomic/account_management/test_profile.py @@ -754,9 +754,9 @@ class TestProfileMultipleDevice(MultipleDeviceTestCase): profile_1.just_fyi('Check profile image updated in group chat invite') home_1.get_back_to_home_view() new_group_chat = 'new_gr' - home_1.create_group_chat(user_names_to_add=[default_username_2], group_chat_name=new_group_chat) home_2.click_system_back_button() home_2.open_notification_bar() + home_1.create_group_chat(user_names_to_add=[default_username_2], group_chat_name=new_group_chat) invite = group_chat_2.pn_invited_to_group_chat(default_username_1, new_group_chat) home_2.get_pn(invite).wait_for_visibility_of_element(30) diff --git a/test/appium/tests/atomic/chats/test_group_chat.py b/test/appium/tests/atomic/chats/test_group_chat.py index 025ac1328a..900e0bfd8c 100644 --- a/test/appium/tests/atomic/chats/test_group_chat.py +++ b/test/appium/tests/atomic/chats/test_group_chat.py @@ -35,17 +35,16 @@ class TestGroupChatMultipleDevice(MultipleDeviceTestCase): home_1.add_contact(key_2) home_1.get_back_to_home_view() home_2.put_app_to_background() - + home_2.open_notification_bar() chat_1 = home_1.create_group_chat([username_2], chat_name) home_2.just_fyi('check that PN invite to group chat is received and after tap you are redirected to group chat') - home_2.open_notification_bar() pns = [chat_1.pn_invited_to_group_chat(username_1, chat_name), chat_1.pn_wants_you_to_join_to_group_chat(username_1, chat_name)] for pn in pns: if not home_2.get_pn(pn).is_element_displayed(30): self.errors.append('%s is not shown after invite to group chat' % pn) - group_invite_pn = home_2.get_pn(pns[1]) + group_invite_pn = home_2.get_pn(pns[0]) if not group_invite_pn.group_chat_icon.is_element_displayed(30): self.errors.append('No icon is shown for PN for group invite') @@ -255,9 +254,9 @@ class TestGroupChatMultipleDevice(MultipleDeviceTestCase): chat.changed_group_name_system_message(device_1_username, new_chat_name)).is_element_displayed(): self.errors.append('Message about changing chat name is not shown') - device_2.just_fyi('Check that you can navigate to renamed chat') + device_2.just_fyi('Check that you can see renamed chat') device_2_chat.back_button.click() - home_2.get_chat(new_chat_name).click() + home_2.get_chat(new_chat_name).wait_for_visibility_of_element(60) self.errors.verify_no_errors() diff --git a/test/appium/tests/atomic/dapps_and_browsing/test_browsing.py b/test/appium/tests/atomic/dapps_and_browsing/test_browsing.py index a7dafee22e..92d4fd91cb 100644 --- a/test/appium/tests/atomic/dapps_and_browsing/test_browsing.py +++ b/test/appium/tests/atomic/dapps_and_browsing/test_browsing.py @@ -290,8 +290,6 @@ class TestBrowsing(SingleDeviceTestCase): urls = { 'https://cdn.dribbble.com/users/45534/screenshots/3142450/logo_dribbble.png': 'url1.png', - 'https://thebitcoinpub-91d3.kxcdn.com/uploads/default/original/2X/d/db97611b41a96cb7642b06636b82c0800678b140.jpg': - 'url2.png', 'https://steemitimages.com/DQmYEjeBuAKVRa3b3ZqwLicSHaPUm7WFtQqohGaZdA9ghjx/images%20(4).jpeg': 'url3.png' } 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 24075c6fb9..81a436fc2d 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 @@ -324,7 +324,7 @@ class TestGroupChatMultipleDevice(MultipleDeviceTestCase): message = 'after removing member' chats[0].send_message(message) for chat in (chats[0], chats[2]): - if not chat.chat_element_by_text(message).is_element_displayed(): + if not chat.chat_element_by_text(message).is_element_displayed(30): self.errors.append("Message '%s' was not received after removing member" % message) if chats[1].chat_element_by_text(message).is_element_displayed(): self.errors.append("Message '%s' was received by removed member" % message) diff --git a/test/appium/views/home_view.py b/test/appium/views/home_view.py index 368f5a73f1..42c527ffb8 100644 --- a/test/appium/views/home_view.py +++ b/test/appium/views/home_view.py @@ -165,7 +165,7 @@ class PushNotificationElement(SilentButton): class GroupChatIconElement(BaseElement): def __init__(self, driver, parent_locator): super().__init__(driver, - xpath="%s/../../../*[@resource-id='android:id/right_icon_container']" % parent_locator) + xpath="%s/../../../../*[@resource-id='android:id/right_icon_container']" % parent_locator) return GroupChatIconElement(self.driver, self.locator) @@ -316,6 +316,7 @@ class HomeView(BaseView): self.plus_button.click_until_presence_of_element(self.join_public_chat_button, attempts=5) self.join_public_chat_button.wait_for_visibility_of_element(5) chat_view = self.join_public_chat_button.click() + chat_view.chat_name_editbox.wait_for_visibility_of_element(20) chat_view.chat_name_editbox.click() chat_view.chat_name_editbox.send_keys(chat_name) time.sleep(2) diff --git a/test/appium/views/keycard_view.py b/test/appium/views/keycard_view.py index 52ed2d7af2..ed09fc40e6 100644 --- a/test/appium/views/keycard_view.py +++ b/test/appium/views/keycard_view.py @@ -67,6 +67,6 @@ class KeycardView(BaseView): def confirm_pin_and_proceed(self): self.next_button.click() self.begin_setup_button.click() - self.connect_card_button.click() + self.connect_card_button.wait_and_click() self.enter_default_pin() self.enter_default_pin()