diff --git a/test/appium/tests/atomic/chats/test_chats_management.py b/test/appium/tests/atomic/chats/test_chats_management.py index 60c9ee6951..863d1f4163 100644 --- a/test/appium/tests/atomic/chats/test_chats_management.py +++ b/test/appium/tests/atomic/chats/test_chats_management.py @@ -277,8 +277,7 @@ class TestChatManagement(SingleDeviceTestCase): @marks.testrail_id(6319) @marks.medium def test_deny_access_camera_and_gallery(self): - sign_in = SignInView(self.driver) - home = sign_in.create_user() + home = SignInView(self.driver).create_user() home.just_fyi("Denying access to camera in universal qr code scanner") home.plus_button.click() @@ -297,18 +296,19 @@ class TestChatManagement(SingleDeviceTestCase): contacts_view.ok_button.click() home.get_back_to_home_view() - home.just_fyi("Denying access to gallery at attempt to send image") + # TODO: blocked due to 11354 + # home.just_fyi("Denying access to gallery at attempt to send image") chat = home.add_contact(basic_user['public_key']) - chat.show_images_button.click() - chat.deny_button.click() - chat.image_from_gallery_button.click() - chat.deny_button.click() - contacts_view.element_by_text(photos_access_error_text).wait_for_visibility_of_element(3) - contacts_view.ok_button.click() - home.get_back_to_home_view() + # chat.show_images_button.click() + # chat.deny_button.click() + # chat.image_from_gallery_button.click() + # chat.deny_button.click() + # contacts_view.element_by_text(photos_access_error_text).wait_for_visibility_of_element(3) + # contacts_view.ok_button.click() + # home.get_back_to_home_view() home.just_fyi("Denying access to audio at attempt to record audio") - chat = home.get_chat(basic_user['username']).click() + # chat = home.get_chat(basic_user['username']).click() chat.audio_message_button.click() chat.deny_button.click() contacts_view.element_by_text(recorded_error).wait_for_visibility_of_element(3) diff --git a/test/appium/tests/atomic/chats/test_group_chat.py b/test/appium/tests/atomic/chats/test_group_chat.py index 51419d470a..491b520844 100644 --- a/test/appium/tests/atomic/chats/test_group_chat.py +++ b/test/appium/tests/atomic/chats/test_group_chat.py @@ -444,13 +444,12 @@ class TestGroupChatMultipleDevice(MultipleDeviceTestCase): @marks.testrail_id(6317) @marks.medium - def test_pair_devices_group_chat_different_messages(self): + def test_pair_devices_group_chat_different_messages_nicknames(self): self.create_drivers(3) device_1, device_2, device_3 = SignInView(self.drivers[0]), SignInView(self.drivers[1]), SignInView(self.drivers[2]) device_1_home = device_1.create_user() - device_1_home.profile_button.click() - device_1_profile = device_1_home.get_profile_view() + device_1_profile = device_1_home.profile_button.click() device_1_profile.settings_button.click() device_1_profile.privacy_and_security_button.click() device_1_profile.backup_recovery_phrase_button.click() @@ -464,7 +463,8 @@ class TestGroupChatMultipleDevice(MultipleDeviceTestCase): device_1_name, device_2_name, group_chat_name = 'creator', 'paired', 'some group chat' device_1.just_fyi('Add contact, start group chat') - device_1_home.add_contact(device_3_chat_key) + nickname = 'my_tester' + device_1_home.add_contact(device_3_chat_key,nickname=nickname) device_1_home.back_button.click() device_1_chat = device_1_home.create_group_chat([device_3_username], group_chat_name) device_3_chat = device_3_home.get_chat(group_chat_name).click() @@ -472,22 +472,33 @@ class TestGroupChatMultipleDevice(MultipleDeviceTestCase): device_2.just_fyi('Go to profile > Devices, set device name, discover device 2 to device 1') device_2_home = device_2.recover_access(passphrase=' '.join(recovery_phrase.values())) - device_2_profile = device_2_home.get_profile_view() + device_2_profile = device_2_home.profile_button.click() device_2_profile.discover_and_advertise_device(device_2_name) + device_1.profile_button.click() device_1_profile.discover_and_advertise_device(device_1_name) device_1_profile.get_toggle_device_by_name(device_2_name).click() device_1_profile.sync_all_button.click() device_1_profile.sync_all_button.wait_for_visibility_of_element(15) + device_1_profile.click_system_back_button(2) device_1.just_fyi('Send message to group chat and verify it on all devices') text_message = 'some text' - [device.home_button.click() for device in (device_1_profile, device_2_profile)] + device_1_profile.home_button.click(desired_view='chat') + device_2_profile.home_button.click() device_1_chat.send_message(text_message) device_2_chat = device_2_home.get_chat(group_chat_name).click() for chat in device_1_chat, device_2_chat, device_3_chat: if not chat.chat_element_by_text(text_message).is_element_displayed(): self.errors.append('Message was sent, but it is not shown') + device_3.just_fyi('Send message to group chat as member and verify nickname on it') + message_from_member = 'member1' + device_3_chat.send_message(message_from_member) + device_1_chat.chat_element_by_text(message_from_member).wait_for_visibility_of_element(20) + for chat in device_1_chat, device_2_chat: + if not chat.chat_element_by_text(message_from_member).username != '%s %s' % (nickname, device_3_username): + self.errors.append('Nickname is not shown in group chat') + device_1.just_fyi('Send image to group chat and verify it on all devices') device_1_chat.show_images_button.click() device_1_chat.allow_button.click() @@ -508,7 +519,6 @@ class TestGroupChatMultipleDevice(MultipleDeviceTestCase): device_1.just_fyi('Send sticker to group chat and verify it on all devices') device_1_chat.profile_button.click() - device_1_profile.click_system_back_button(2) device_1_profile.switch_network() device_1_home.get_chat(group_chat_name).click() device_1_chat.show_stickers_button.click() diff --git a/test/appium/views/home_view.py b/test/appium/views/home_view.py index 411e737552..078fe3c198 100644 --- a/test/appium/views/home_view.py +++ b/test/appium/views/home_view.py @@ -204,7 +204,7 @@ class HomeView(BaseView): def get_username_below_start_new_chat_button(self, username_part): return UserNameBelowNewChatButton(self.driver, username_part) - def add_contact(self, public_key, add_in_contacts=True): + def add_contact(self, public_key, add_in_contacts=True, nickname=''): self.plus_button.click_until_presence_of_element(self.start_new_chat_button) contacts_view = self.start_new_chat_button.click() contacts_view.public_key_edit_box.click() @@ -213,6 +213,11 @@ class HomeView(BaseView): contacts_view.confirm_until_presence_of_element(one_to_one_chat.chat_message_input) if add_in_contacts: one_to_one_chat.add_to_contacts.click() + if nickname: + 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.back_button.click() return one_to_one_chat def start_1_1_chat(self, username):