diff --git a/test/e2e/tests/communities/test_communities.py b/test/e2e/tests/communities/test_communities.py index 0438839b98..4bb41e6e98 100644 --- a/test/e2e/tests/communities/test_communities.py +++ b/test/e2e/tests/communities/test_communities.py @@ -130,14 +130,17 @@ def test_edit_community(main_screen: MainWindow, params): @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703252', 'Kick user') @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703254', 'Edit chat - Delete any message') @pytest.mark.case(703252, 703252) -def test_community_admin_kick_member_and_delete_message(multiple_instances): - user_one: UserAccount = constants.user_account_one - user_two: UserAccount = constants.user_account_two +@pytest.mark.parametrize('user_data_one, user_data_two', [ + (configs.testpath.TEST_USER_DATA / 'group_chat_user_1', configs.testpath.TEST_USER_DATA / 'group_chat_user_2') +]) +def test_community_admin_kick_member_and_delete_message(multiple_instances, user_data_one, user_data_two): + user_one: UserAccount = constants.group_chat_user_1 + user_two: UserAccount = constants.group_chat_user_2 community_params = deepcopy(constants.community_params) community_params['name'] = f'{datetime.now():%d%m%Y_%H%M%S}' main_screen = MainWindow() - with multiple_instances() as aut_one, multiple_instances() as aut_two: + with multiple_instances(user_data=user_data_one) as aut_one, multiple_instances(user_data=user_data_two) as aut_two: with step(f'Launch multiple instances with authorized users {user_one.name} and {user_two.name}'): for aut, account in zip([aut_one, aut_two], [user_one, user_two]): aut.attach() @@ -145,37 +148,11 @@ def test_community_admin_kick_member_and_delete_message(multiple_instances): main_screen.authorize_user(account) main_screen.hide() - with step(f'User {user_two.name}, get chat key'): - aut_two.attach() - main_screen.prepare() - profile_popup = main_screen.left_panel.open_online_identifier().open_profile_popup_from_online_identifier() - chat_key = profile_popup.copy_chat_key - profile_popup.close() - main_screen.hide() - - with step(f'User {user_one.name}, send contact request to {user_two.name}'): - aut_one.attach() - main_screen.prepare() - settings = main_screen.left_panel.open_settings() - messaging_settings = settings.left_panel.open_messaging_settings() - contacts_settings = messaging_settings.open_contacts_settings() - contact_request_popup = contacts_settings.open_contact_request_form() - contact_request_popup.send(chat_key, f'Hello {user_two.name}') - main_screen.hide() - - with step(f'User {user_two.name}, accept contact request from {user_one.name}'): - aut_two.attach() - main_screen.prepare() - settings = main_screen.left_panel.open_settings() - messaging_settings = settings.left_panel.open_messaging_settings() - contacts_settings = messaging_settings.open_contacts_settings() - contacts_settings.accept_contact_request(user_one.name) - with step(f'User {user_two.name}, create community and invite {user_one.name}'): - with step('Enable creation of community option'): - settings = main_screen.left_panel.open_settings() - settings.left_panel.open_advanced_settings().enable_creation_of_communities() - + aut_two.attach() + main_screen.prepare() + settings = main_screen.left_panel.open_settings() + settings.left_panel.open_advanced_settings().enable_creation_of_communities() community = main_screen.create_community(community_params['name'], community_params['description'], community_params['intro'], community_params['outro'], community_params['logo']['fp'], community_params['banner']['fp']) diff --git a/test/e2e/tests/communities/test_communities_pin_and_unpin_messages.py b/test/e2e/tests/communities/test_communities_pin_and_unpin_messages.py index f06591fcc7..b11c4b50d7 100644 --- a/test/e2e/tests/communities/test_communities_pin_and_unpin_messages.py +++ b/test/e2e/tests/communities/test_communities_pin_and_unpin_messages.py @@ -25,14 +25,17 @@ pytestmark = marks 'Edit chat - Remove pinned message (when any member can pin is disabled)') @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703510', 'Join community via owner invite') @pytest.mark.case(703255, 703256, 703510) -def test_join_community_and_pin_unpin_message(multiple_instances): - user_one: UserAccount = constants.user_account_one - user_two: UserAccount = constants.user_account_two +@pytest.mark.parametrize('user_data_one, user_data_two', [ + (configs.testpath.TEST_USER_DATA / 'group_chat_user_1', configs.testpath.TEST_USER_DATA / 'group_chat_user_2') +]) +def test_join_community_and_pin_unpin_message(multiple_instances, user_data_one, user_data_two): + user_one: UserAccount = constants.group_chat_user_1 + user_two: UserAccount = constants.group_chat_user_2 community_params = deepcopy(constants.community_params) community_params['name'] = f'{datetime.now():%d%m%Y_%H%M%S}' main_screen = MainWindow() - with multiple_instances() as aut_one, multiple_instances() as aut_two: + with multiple_instances(user_data=user_data_one) as aut_one, multiple_instances(user_data=user_data_two) as aut_two: with step(f'Launch multiple instances with authorized users {user_one.name} and {user_two.name}'): for aut, account in zip([aut_one, aut_two], [user_one, user_two]): aut.attach() @@ -40,36 +43,11 @@ def test_join_community_and_pin_unpin_message(multiple_instances): main_screen.authorize_user(account) main_screen.hide() - with step(f'User {user_two.name}, get chat key'): - aut_two.attach() - main_screen.prepare() - profile_popup = main_screen.left_panel.open_online_identifier().open_profile_popup_from_online_identifier() - chat_key = profile_popup.copy_chat_key - profile_popup.close() - main_screen.hide() - - with step(f'User {user_one.name}, send contact request to {user_two.name}'): - aut_one.attach() - main_screen.prepare() - settings = main_screen.left_panel.open_settings() - messaging_settings = settings.left_panel.open_messaging_settings() - contacts_settings = messaging_settings.open_contacts_settings() - contact_request_popup = contacts_settings.open_contact_request_form() - contact_request_popup.send(chat_key, f'Hello {user_two.name}') - main_screen.hide() - - with step(f'User {user_two.name}, accept contact request from {user_one.name}'): - aut_two.attach() - main_screen.prepare() - settings = main_screen.left_panel.open_settings() - messaging_settings = settings.left_panel.open_messaging_settings() - contacts_settings = messaging_settings.open_contacts_settings() - contacts_settings.accept_contact_request(user_one.name) - with step(f'User {user_two.name}, create community and invite {user_one.name}'): - with step('Enable creation of community option'): - settings = main_screen.left_panel.open_settings() - settings.left_panel.open_advanced_settings().enable_creation_of_communities() + aut_two.attach() + main_screen.prepare() + settings = main_screen.left_panel.open_settings() + settings.left_panel.open_advanced_settings().enable_creation_of_communities() community = main_screen.create_community(community_params['name'], community_params['description'], community_params['intro'], community_params['outro'], community_params['logo']['fp'], community_params['banner']['fp']) diff --git a/test/e2e/tests/messages/test_messaging_group_chat.py b/test/e2e/tests/messages/test_messaging_group_chat.py index 22f63e9f32..7c41416ce8 100644 --- a/test/e2e/tests/messages/test_messaging_group_chat.py +++ b/test/e2e/tests/messages/test_messaging_group_chat.py @@ -100,7 +100,7 @@ def test_group_chat(multiple_instances, user_data_one, user_data_two, user_data_ aut_two.attach() main_window.prepare() assert driver.waitFor(lambda: group_chat_new_name in messages_screen.left_panel.get_chats_names, - 10000), f'{group_chat_new_name} is not present in chats list for {aut_two}' + 15000), f'{group_chat_new_name} is not present in chats list for {aut_two}' messages_screen.left_panel.click_chat_by_name(group_chat_new_name) with step('Verify members in a group members list'): @@ -135,7 +135,7 @@ def test_group_chat(multiple_instances, user_data_one, user_data_two, user_data_ with step(f'Check that {user_three.name} is not a member of a group'): assert driver.waitFor(lambda: group_chat_new_name in messages_screen.left_panel.get_chats_names, - 10000), f'{group_chat_new_name} is not present in chats list for {aut_three}' + 15000), f'{group_chat_new_name} is not present in chats list for {aut_three}' messages_screen.left_panel.click_chat_by_name(group_chat_new_name) gray_message_text = messages_screen.group_chat.gray_text_from_message_area assert gray_message_text == Messaging.YOU_NEED_TO_BE_A_MEMBER.value diff --git a/test/e2e/tests/online_identifier/test_online_identifier.py b/test/e2e/tests/online_identifier/test_online_identifier.py index 1623d0d7d2..387e77eb21 100644 --- a/test/e2e/tests/online_identifier/test_online_identifier.py +++ b/test/e2e/tests/online_identifier/test_online_identifier.py @@ -41,14 +41,17 @@ def test_change_own_display_name(main_screen: MainWindow, user_account, new_name @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703003', 'Switch state to online') @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703004', 'Switch state to automatic') @pytest.mark.case(703002, 703003, 703004) -def test_switch_state_to_offline_online_automatic(multiple_instances): - user_one: UserAccount = constants.user_with_random_attributes_1 - user_two: UserAccount = constants.user_with_random_attributes_2 +@pytest.mark.parametrize('user_data_one, user_data_two', [ + (configs.testpath.TEST_USER_DATA / 'group_chat_user_1', configs.testpath.TEST_USER_DATA / 'group_chat_user_2') +]) +def test_switch_state_to_offline_online_automatic(multiple_instances, user_data_one, user_data_two): + user_one: UserAccount = constants.group_chat_user_1 + user_two: UserAccount = constants.group_chat_user_2 community_params = deepcopy(constants.community_params) community_params['name'] = f'{datetime.now():%d%m%Y_%H%M%S}' main_screen = MainWindow() - with multiple_instances(user_data=None) as aut_one, multiple_instances(user_data=None) as aut_two: + with multiple_instances(user_data=user_data_one) as aut_one, multiple_instances(user_data=user_data_two) as aut_two: with step(f'Launch multiple instances with authorized users {user_one.name} and {user_two.name}'): for aut, account in zip([aut_one, aut_two], [user_one, user_two]): aut.attach() @@ -56,39 +59,14 @@ def test_switch_state_to_offline_online_automatic(multiple_instances): main_screen.authorize_user(account) main_screen.hide() - with step(f'User {user_two.name}, get chat key'): - aut_two.attach() - main_screen.prepare() - profile_popup = main_screen.left_panel.open_online_identifier().open_profile_popup_from_online_identifier() - chat_key = profile_popup.copy_chat_key - profile_popup.close() - main_screen.hide() - - with step(f'User {user_one.name}, send contact request to {user_two.name}'): - aut_one.attach() - main_screen.prepare() - settings = main_screen.left_panel.open_settings() - messaging_settings = settings.left_panel.open_messaging_settings() - contacts_settings = messaging_settings.open_contacts_settings() - contact_request_popup = contacts_settings.open_contact_request_form() - contact_request_popup.send(chat_key, f'Hello {user_two.name}') - main_screen.hide() - - with step(f'User {user_two.name}, accept contact request from {user_one.name}'): - aut_two.attach() - main_screen.prepare() - settings = main_screen.left_panel.open_settings() - messaging_settings = settings.left_panel.open_messaging_settings() - contacts_settings = messaging_settings.open_contacts_settings() - contacts_settings.accept_contact_request(user_one.name) - with step(f'User {user_two.name}, create community and invite {user_one.name}'): - with step('Enable creation of community option'): - settings = main_screen.left_panel.open_settings() - settings.left_panel.open_advanced_settings().enable_creation_of_communities() + aut_two.attach() + main_screen.prepare() + settings = main_screen.left_panel.open_settings() + settings.left_panel.open_advanced_settings().enable_creation_of_communities() community = main_screen.create_community(community_params['name'], community_params['description'], - community_params['intro'], community_params['outro'], - community_params['logo']['fp'], community_params['banner']['fp']) + community_params['intro'], community_params['outro'], + community_params['logo']['fp'], community_params['banner']['fp']) community.left_panel.invite_people_to_community([user_one.name], 'Message') main_screen.hide() @@ -96,6 +74,7 @@ def test_switch_state_to_offline_online_automatic(multiple_instances): aut_one.attach() main_screen.prepare() messages_view = main_screen.left_panel.open_messages_screen() + time.sleep(2) chat = messages_view.left_panel.click_chat_by_name(user_two.name) community_screen = chat.accept_community_invite(community_params['name'], '0')