Skip to content

Commit

Permalink
Fix e2e keycard
Browse files Browse the repository at this point in the history
Signed-off-by: Serhy <sergii@status.im>
  • Loading branch information
Serhy committed Jul 7, 2020
1 parent d134136 commit 4dda209
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion test/appium/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def debug(text: str):
used_fleet = staging_fleet

mailserver_ams = 'mail-01.do-ams3'
mailserver_hk = 'mail-02.ac-cn-hongkong-c'
mailserver_hk = 'mail-01.ac-cn-hongkong-c'
mailserver_gc = 'mail-01.gc-us-central1-a'
mailserver_ams_01 = 'mail-01.do-ams3.{}'.format(used_fleet)
camera_access_error_text = "To grant the required camera permission, please go to your system settings " \
Expand Down
6 changes: 4 additions & 2 deletions test/appium/tests/atomic/account_management/test_keycard.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ def test_keycard_interruption_creating_onboarding_flow(self):
@marks.medium
def test_keycard_interruption_access_key_onboarding_flow(self):
sign_in = SignInView(self.driver)
sign_in.get_started_button.click()

recover_access = sign_in.access_key_button.click()
recover_access.enter_seed_phrase_button.click()
Expand Down Expand Up @@ -194,6 +195,7 @@ def test_keycard_interruption_access_key_onboarding_flow(self):
if default_username != basic_user['username']:
self.errors.append('Default username %s does not match expected' % default_username)
profile_view.logout()
sign_in.sign_in(keycard=True)

home = sign_in.sign_in(keycard=True)
if not home.wallet_button.is_element_displayed(10):
self.errors.append("Failed to login to Keycard account")
self.errors.verify_no_errors()
17 changes: 9 additions & 8 deletions test/appium/tests/atomic/chats/test_keycard_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,26 @@ class TestCommandsMultipleDevices(MultipleDeviceTestCase):
@marks.testrail_id(6293)
@marks.critical
def test_keycard_send_eth_in_1_1_chat(self):
recipient = transaction_recipients['A']
sender = transaction_senders['A']
self.create_drivers(2)
device_1, device_2 = SignInView(self.drivers[0]), SignInView(self.drivers[1])
home_1 = device_1.recover_access(passphrase=sender['passphrase'], keycard=True)
home_2 = device_2.recover_access(passphrase=recipient['passphrase'], keycard=True)
home_2 = device_2.create_user(keycard=True)
recipient_public_key, recipient_username = home_2.get_public_key_and_username(return_username=True)
wallet_1, wallet_2 = home_1.wallet_button.click(), home_2.wallet_button.click()
for wallet in (wallet_1, wallet_2):
wallet.set_up_wallet()
wallet.home_button.click()

chat_1 = home_1.add_contact(recipient['public_key'])
chat_1 = home_1.add_contact(recipient_public_key)
amount = chat_1.get_unique_amount()

home_1.just_fyi('Send %s ETH in 1-1 chat and check it for sender and receiver: Address requested' % amount)
chat_1.commands_button.click()
send_transaction = chat_1.send_command.click()
if not send_transaction.get_username_in_transaction_bottom_sheet_button(recipient['username']).is_element_displayed():
self.driver.fail('%s is not shown in "Send Transaction" bottom sheet' % recipient['username'])
send_transaction.get_username_in_transaction_bottom_sheet_button(recipient['username']).click()
if not send_transaction.get_username_in_transaction_bottom_sheet_button(recipient_username).is_element_displayed():
self.driver.fail('%s is not shown in "Send Transaction" bottom sheet' % recipient_username)
send_transaction.get_username_in_transaction_bottom_sheet_button(recipient_username).click()
if send_transaction.scan_qr_code_button.is_element_displayed():
self.driver.fail('Recipient is editable in bootom sheet when send ETH from 1-1 chat')
send_transaction.amount_edit_box.set_value(amount)
Expand Down Expand Up @@ -123,7 +123,8 @@ def test_keycard_request_and_receive_stt_in_1_1_chat_offline(self):
amount = chat_2.get_unique_amount()
asset_name = 'STT'
profile_2 = wallet_2.profile_button.click()
profile_2.logout()
profile_2.airplane_mode_button.click()
device_2.home_button.click()
chat_element = home_1.get_chat(sender['username'])
chat_element.wait_for_visibility_of_element(30)
chat_1 = chat_element.click()
Expand All @@ -142,7 +143,7 @@ def test_keycard_request_and_receive_stt_in_1_1_chat_offline(self):
self.driver.fail('No incoming transaction in 1-1 chat is shown for recipient after requesting STT')

home_2.just_fyi('Check that transaction message is fetched from offline and sign transaction')
device_2.sign_in(keycard=True)
profile_2.airplane_mode_button.click()
home_2.connection_status.wait_for_invisibility_of_element(30)
home_2.get_chat(recipient_username).click()
chat_2_sender_message = chat_2.chat_element_by_text('↑ Outgoing transaction')
Expand Down

0 comments on commit 4dda209

Please sign in to comment.