e2e fixes

Signed-off-by: Churikova Tetiana <churikova.tm@gmail.com>
This commit is contained in:
Churikova Tetiana 2020-09-23 13:48:20 +02:00
parent 1969f9dfe0
commit b8298dce44
No known key found for this signature in database
GPG Key ID: 0D4EA7B33B47E6D8
7 changed files with 47 additions and 44 deletions

View File

@ -814,39 +814,40 @@ class TestProfileMultipleDevice(MultipleDeviceTestCase):
profile_1.get_back_to_home_view() profile_1.get_back_to_home_view()
profile_1.home_button.click() profile_1.home_button.click()
profile_1.just_fyi('start chat with user2 and check that all messages are delivered') # TODO: disabled due to 10065
chat_1 = home_1.add_contact(public_key) # profile_1.just_fyi('start chat with user2 and check that all messages are delivered')
message = 'test message' # chat_1 = home_1.add_contact(public_key)
chat_1.chat_message_input.send_keys(message) # message = 'test message'
chat_1.send_message_button.click() # chat_1.chat_message_input.send_keys(message)
chat_2 = home_2.get_chat(username_1).click() # chat_1.send_message_button.click()
chat_2.chat_element_by_text(message).wait_for_visibility_of_element() # chat_2 = home_2.get_chat(username_1).click()
message_1 = 'new message' # chat_2.chat_element_by_text(message).wait_for_visibility_of_element()
chat_2.chat_message_input.send_keys(message_1) # message_1 = 'new message'
chat_2.send_message_button.click() # chat_2.chat_message_input.send_keys(message_1)
chat_1.chat_element_by_text(message_1).wait_for_visibility_of_element() # chat_2.send_message_button.click()
# chat_1.chat_element_by_text(message_1).wait_for_visibility_of_element()
profile_1.just_fyi('delete custom mailserver') #
chat_1.profile_button.click() # profile_1.just_fyi('delete custom mailserver')
profile_1.sync_settings_button.click() # chat_1.profile_button.click()
profile_1.mail_server_button.click() # profile_1.sync_settings_button.click()
profile_1.element_by_text(mailserver).scroll_to_element() # profile_1.mail_server_button.click()
profile_1.element_by_text(mailserver).click() # profile_1.element_by_text(mailserver).scroll_to_element()
profile_1.confirm_button.click() # profile_1.element_by_text(mailserver).click()
profile_1.element_by_text(server_name).scroll_to_element() # profile_1.confirm_button.click()
profile_1.element_by_text(server_name).click() # profile_1.element_by_text(server_name).scroll_to_element()
profile_1.mail_server_delete_button.scroll_to_element() # profile_1.element_by_text(server_name).click()
profile_1.mail_server_delete_button.click() # profile_1.mail_server_delete_button.scroll_to_element()
profile_1.mail_server_confirm_delete_button.click() # profile_1.mail_server_delete_button.click()
if profile_1.element_by_text(server_name).is_element_displayed(): # profile_1.mail_server_confirm_delete_button.click()
self.errors.append('Deleted custom mailserver is shown') # if profile_1.element_by_text(server_name).is_element_displayed():
profile_1.get_back_to_home_view() # self.errors.append('Deleted custom mailserver is shown')
profile_1.relogin() # profile_1.get_back_to_home_view()
chat_1.profile_button.click() # profile_1.relogin()
profile_1.sync_settings_button.click() # chat_1.profile_button.click()
profile_1.mail_server_button.click() # profile_1.sync_settings_button.click()
if profile_1.element_by_text(server_name).is_element_displayed(): # profile_1.mail_server_button.click()
self.errors.append('Deleted custom mailserver is shown after relogin') # if profile_1.element_by_text(server_name).is_element_displayed():
# self.errors.append('Deleted custom mailserver is shown after relogin')
self.errors.verify_no_errors() self.errors.verify_no_errors()
@ -946,7 +947,7 @@ class TestProfileMultipleDevice(MultipleDeviceTestCase):
device_2_profile = device_2_home.get_profile_view() device_2_profile = device_2_home.get_profile_view()
device_2_profile.discover_and_advertise_device(device_2_name) device_2_profile.discover_and_advertise_device(device_2_name)
device_1_profile.discover_and_advertise_device(device_1_name) 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.get_toggle_device_by_name(device_2_name).wait_and_click()
device_1_profile.sync_all_button.click() device_1_profile.sync_all_button.click()
device_1_profile.sync_all_button.wait_for_visibility_of_element(15) device_1_profile.sync_all_button.wait_for_visibility_of_element(15)
@ -1097,7 +1098,7 @@ class TestProfileMultipleDevice(MultipleDeviceTestCase):
home_1.just_fyi('check ENS name wallet address and public key') home_1.just_fyi('check ENS name wallet address and public key')
profile_1.element_by_text(user_1['ens']).click() profile_1.element_by_text(user_1['ens']).click()
for text in ('10 SNT, deposit unlocked', user_1['address'].lower(), user_1['public_key'] ): for text in ('10 SNT, deposit unlocked', user_1['address'].lower(), user_1['public_key'] ):
if not profile_1.element_by_text_part(text).is_element_displayed(): if not profile_1.element_by_text_part(text).is_element_displayed(40):
self.errors.append('%s text is not shown' % text) self.errors.append('%s text is not shown' % text)
dapp_view_1.get_back_to_home_view() dapp_view_1.get_back_to_home_view()
profile_1.home_button.click() profile_1.home_button.click()

View File

@ -33,6 +33,7 @@ class TestWalletManagement(SingleDeviceTestCase):
send_transaction = wallet.send_transaction_button.click() send_transaction = wallet.send_transaction_button.click()
send_transaction.amount_edit_box.set_value('0') send_transaction.amount_edit_box.set_value('0')
send_transaction.set_recipient_address('0x%s' % basic_user['address']) send_transaction.set_recipient_address('0x%s' % basic_user['address'])
send_transaction.next_button.click_until_presence_of_element(send_transaction.sign_transaction_button)
send_transaction.sign_transaction_button.click() send_transaction.sign_transaction_button.click()
for text in texts: for text in texts:
if not wallet.element_by_text_part(text).is_element_displayed(): if not wallet.element_by_text_part(text).is_element_displayed():
@ -221,7 +222,7 @@ class TestWalletManagement(SingleDeviceTestCase):
signin_view = SignInView(self.driver) signin_view = SignInView(self.driver)
home_view = signin_view.recover_access(passphrase=passphrase) home_view = signin_view.recover_access(passphrase=passphrase)
profile = home_view.profile_button.click() profile = home_view.profile_button.click()
profile.switch_network('Mainnet with upstream RPC') profile.switch_network()
wallet_view = profile.wallet_button.click() wallet_view = profile.wallet_button.click()
wallet_view.set_up_wallet() wallet_view.set_up_wallet()
wallet_view.accounts_status_account.click() wallet_view.accounts_status_account.click()

View File

@ -342,7 +342,7 @@ class TestGroupChatMultipleDevice(MultipleDeviceTestCase):
if device_1_chat.profile_block_contact.is_element_displayed(): if device_1_chat.profile_block_contact.is_element_displayed():
self.errors.append("Admin is redirected to own profile on tapping own username from group info") self.errors.append("Admin is redirected to own profile on tapping own username from group info")
group_info_view.get_user_from_group_info(device_2_username).click() group_info_view.get_user_from_group_info(device_2_username).click()
if not device_1_chat.profile_block_contact.is_element_displayed(): if not device_1_chat.profile_details.is_element_displayed():
self.errors.append("Admin is not redirected to user profile on tapping member username from group info") self.errors.append("Admin is not redirected to user profile on tapping member username from group info")
device_1_chat.back_button.click() device_1_chat.back_button.click()

View File

@ -928,10 +928,10 @@ class TestMessagesOneToOneChatSingle(SingleDeviceTestCase):
chat_view.ok_button.click() chat_view.ok_button.click()
if url_data[key].get('username'): if url_data[key].get('username'):
if key == 'own_profile_key': if key == 'own_profile_key':
if chat_view.profile_block_contact.is_element_displayed(): if chat_view.profile_nickname.is_element_displayed():
self.errors.append('In %s case was not redirected to own profile' % key) self.errors.append('In %s case was not redirected to own profile' % key)
else: else:
if not chat_view.profile_block_contact.is_element_displayed(): if not chat_view.profile_nickname.is_element_displayed():
self.errors.append('In %s case block user button is not shown' % key) self.errors.append('In %s case block user button is not shown' % key)
if not chat_view.element_by_text(url_data[key]['username']).is_element_displayed(): if not chat_view.element_by_text(url_data[key]['username']).is_element_displayed():
self.errors.append('In %s case username not shown' % key) self.errors.append('In %s case username not shown' % key)

View File

@ -926,7 +926,7 @@ class ChatView(BaseView):
def view_profile_long_press(self, message = str): def view_profile_long_press(self, message = str):
self.chat_element_by_text(message).long_press_element() self.chat_element_by_text(message).long_press_element()
self.view_profile_by_avatar_button.click() self.view_profile_by_avatar_button.click()
self.profile_block_contact.wait_for_visibility_of_element(5) self.profile_details.wait_for_visibility_of_element(5)
def move_to_messages_by_time_marker(self, marker='Today'): def move_to_messages_by_time_marker(self, marker='Today'):
self.driver.info("Moving to messages by time marker: '%s'" % marker) self.driver.info("Moving to messages by time marker: '%s'" % marker)

View File

@ -707,10 +707,10 @@ class ProfileView(BaseView):
self.network_settings_button.click() self.network_settings_button.click()
network_button = NetworkSettingsButton.NetworkButton(self.driver, network) network_button = NetworkSettingsButton.NetworkButton(self.driver, network)
network_button.click() network_button.click()
self.connect_button.click() self.connect_button.click_until_presence_of_element(self.confirm_button)
self.confirm_button.click()
from views.sign_in_view import SignInView from views.sign_in_view import SignInView
signin_view = SignInView(self.driver) signin_view = SignInView(self.driver)
self.confirm_button.click_until_absense_of_element(self.confirm_button)
signin_view.sign_in() signin_view.sign_in()
def open_contact_from_profile(self, username): def open_contact_from_profile(self, username):
@ -780,7 +780,8 @@ class ProfileView(BaseView):
def logout(self): def logout(self):
self.logout_button.click() self.logout_button.click()
return self.logout_dialog.logout_button.click() self.logout_dialog.logout_button.click()
self.logout_button.wait_for_invisibility_of_element(30)
def mail_server_by_name(self, server_name): def mail_server_by_name(self, server_name):
return MailServerElement(self.driver, server_name) return MailServerElement(self.driver, server_name)

View File

@ -308,7 +308,7 @@ class SignInView(BaseView):
def sign_in(self, password=common_password, keycard=False, position=1): def sign_in(self, password=common_password, keycard=False, position=1):
# self.rooted_device_continue() # self.rooted_device_continue()
self.multi_account_on_login_button.wait_for_visibility_of_element(10) self.multi_account_on_login_button.wait_for_visibility_of_element(30)
self.get_multiaccount_by_position(position).click() self.get_multiaccount_by_position(position).click()
if keycard: if keycard: