e2e update to align RN update

Signed-off-by: Serhy <sergii@status.im>
This commit is contained in:
Serhy 2021-06-14 20:52:58 +03:00
parent 5f719ac95b
commit 9502229c09
No known key found for this signature in database
GPG Key ID: 5D7C4B9E2B6F500B
21 changed files with 93 additions and 45 deletions

View File

@ -11,6 +11,7 @@ class TestCreateAccount(SingleDeviceTestCase):
@marks.testrail_id(5356)
@marks.critical
@marks.skip
def test_switch_users_special_char_password_and_add_new_account_logcat(self):
sign_in = SignInView(self.driver)
@ -132,6 +133,7 @@ class TestCreateAccount(SingleDeviceTestCase):
@marks.testrail_id(5363)
@marks.high
@marks.skip
def test_pass_phrase_validation(self):
sign_in = SignInView(self.driver)
sign_in.get_started_button.click_until_presence_of_element(sign_in.access_key_button)

View File

@ -8,6 +8,7 @@ class TestCreateAccount(SingleDeviceTestCase):
@marks.testrail_id(6645)
@marks.critical
@marks.skip
def test_restore_account_migrate_multiaccount_to_keycard(self):
sign_in = SignInView(self.driver)
seed = basic_user['passphrase']
@ -259,7 +260,7 @@ class TestCreateAccount(SingleDeviceTestCase):
sign_in.just_fyi('Check assets after pairing keycard for recovered multiaccount')
wallet_view = sign_in.wallet_button.click()
wallet_view.set_up_wallet()
# wallet_view.set_up_wallet()
for asset in ['ETH', 'LXS']:
if wallet_view.get_asset_amount_by_name(asset) == 0:
self.errors.append("%s value is not restored" % asset)
@ -412,6 +413,7 @@ class TestKeycardCreateMultiaccountMultipleDevice(MultipleDeviceTestCase):
@marks.testrail_id(5689)
@marks.critical
@marks.skip
def test_keycard_create_login_resotore_unlock_same_seed(self):
self.create_drivers(2)
device_1, device_2 = SignInView(self.drivers[0]), SignInView(self.drivers[1])

View File

@ -117,6 +117,7 @@ class TestProfileSingleDevice(SingleDeviceTestCase):
@marks.testrail_id(5502)
@marks.critical
@marks.skip
def test_can_add_existing_ens(self):
home = SignInView(self.driver).recover_access(ens_user['passphrase'])
profile = home.profile_button.click()
@ -157,7 +158,7 @@ class TestProfileSingleDevice(SingleDeviceTestCase):
profile_view.backup_recovery_phrase_button.click()
profile_view.ok_continue_button.click()
recovery_phrase = " ".join(profile_view.get_recovery_phrase().values())
profile_view.back_button.click()
profile_view.close_button.click()
profile_view.back_button.click()
public_key = profile_view.get_public_key_and_username()
wallet_view = profile_view.wallet_button.click()
@ -284,6 +285,7 @@ class TestProfileSingleDevice(SingleDeviceTestCase):
@marks.critical
@marks.testrail_id(5419)
@marks.flaky
@marks.skip
def test_logcat_backup_recovery_phrase(self):
sign_in = SignInView(self.driver)
home = sign_in.create_user()
@ -389,6 +391,7 @@ class TestProfileSingleDevice(SingleDeviceTestCase):
@marks.testrail_id(5738)
@marks.high
@marks.skip
def test_dapps_permissions(self):
home = SignInView(self.driver).create_user()
account_name = home.status_account_name
@ -935,6 +938,7 @@ class TestProfileMultipleDevice(MultipleDeviceTestCase):
@marks.testrail_id(5762)
@marks.high
@marks.skip
def test_pair_devices_sync_one_to_one_contacts_nicknames_public_chat(self):
self.create_drivers(2)
device_1, device_2 = SignInView(self.drivers[0]), SignInView(self.drivers[1])
@ -945,7 +949,7 @@ class TestProfileMultipleDevice(MultipleDeviceTestCase):
device_1_profile.backup_recovery_phrase_button.click()
device_1_profile.ok_continue_button.click()
recovery_phrase = device_1_profile.get_recovery_phrase()
device_1_profile.back_button.click()
device_1_profile.close_button.click()
device_1_profile.get_back_to_home_view()
device_1_name = 'device_%s' % device_1.driver.number
device_2_name = 'device_%s' % device_2.driver.number
@ -969,7 +973,7 @@ class TestProfileMultipleDevice(MultipleDeviceTestCase):
device_1_profile.open_contact_from_profile(basic_user['username'])
nickname = 'my_basic_user'
device_1_chat.set_nickname(nickname)
device_1_profile.back_button.click(2)
device_1_profile.close_button.double_click()
device_2.just_fyi('go to profile > Devices, set device name, discover device 2 to device 1')
device_2_profile.discover_and_advertise_device(device_2_name)
@ -1007,7 +1011,7 @@ class TestProfileMultipleDevice(MultipleDeviceTestCase):
device_1_profile.open_contact_from_profile(transaction_senders['A']['username'])
nickname_after_sync = 'my_transaction sender'
device_1_chat.set_nickname(nickname_after_sync)
device_1_profile.back_button.click()
device_1_profile.close_button.click()
device_1.home_button.click(desired_view='chat')
if not device_2_profile.element_by_text(nickname_after_sync).is_element_displayed(60):
self.errors.append(
@ -1035,6 +1039,7 @@ class TestProfileMultipleDevice(MultipleDeviceTestCase):
@marks.testrail_id(6226)
@marks.critical
@marks.skip
def test_ens_mentions_pn_and_nickname_in_public_and_1_1_chats(self):
self.create_drivers(2)
device_1, device_2 = self.drivers[0], self.drivers[1]

View File

@ -11,6 +11,7 @@ class TestWalletManagement(SingleDeviceTestCase):
@marks.testrail_id(5335)
@marks.high
@marks.skip
def test_wallet_set_up(self):
sign_in = SignInView(self.driver)
sign_in.recover_access(transaction_senders['A']['passphrase'])
@ -80,6 +81,7 @@ class TestWalletManagement(SingleDeviceTestCase):
@marks.testrail_id(5346)
@marks.high
@marks.skip
def test_collectible_from_wallet(self):
passphrase = wallet_users['F']['passphrase']
home = SignInView(self.driver).recover_access(passphrase=passphrase)
@ -102,7 +104,7 @@ class TestWalletManagement(SingleDeviceTestCase):
send_transaction.select_asset_button.click()
if send_transaction.asset_by_name("CryptoKitties").is_element_displayed():
self.errors.append('Collectibles can be sent from wallet')
wallet.back_button.click(2)
wallet.close_button.double_click()
wallet.just_fyi('Check "Open in OpenSea"')
wallet.element_by_translation_id("check-on-opensea").click()
@ -179,6 +181,7 @@ class TestWalletManagement(SingleDeviceTestCase):
@marks.testrail_id(6224)
@marks.critical
@marks.skip
def test_add_account_to_multiaccount_instance_generate_new(self):
home = SignInView(self.driver).create_user()
wallet = home.wallet_button.click()
@ -206,6 +209,7 @@ class TestWalletManagement(SingleDeviceTestCase):
@marks.testrail_id(6244)
@marks.high
@marks.skip
def test_add_and_delete_watch_only_account_to_multiaccount_instance(self):
home = SignInView(self.driver).create_user()
wallet = home.wallet_button.click()

View File

@ -106,7 +106,7 @@ class TestChatManagement(SingleDeviceTestCase):
resolved_ens = '%s.stateofus.eth' % ens_user_ropsten['ens']
if not chat.element_by_text(resolved_ens).is_element_displayed(10):
self.errors.append('ENS name is not resolved after pasting chat key')
home.back_button.click()
home.close_button.click()
home.just_fyi("Check that can paste public key from keyboard and start chat")
home.join_public_chat(home.get_random_chat_name())
@ -530,7 +530,7 @@ class TestChatManagementMultipleDevice(MultipleDeviceTestCase):
chat_1.send_message_button.click()
chat_1.chat_element_by_text(username_2).click()
chat_1.profile_send_message.wait_for_visibility_of_element(20)
chat_1.back_button.click()
chat_1.close_button.click()
chat_2.driver.quit()
device_1.just_fyi('Tap on userpic and check redirect to user profile')
@ -550,7 +550,7 @@ class TestChatManagementMultipleDevice(MultipleDeviceTestCase):
device_1.just_fyi('Set nickname for user without adding him to contacts, check it in public chat')
nickname = 'Name1'
chat_1.set_nickname(nickname)
chat_1.back_button.click()
chat_1.close_button.click()
expected_username = '%s %s' % (nickname, username_2)
if chat_element.username.text != expected_username:
self.errors.append('Username %s in public chat does not match expected %s' % (
@ -561,7 +561,7 @@ class TestChatManagementMultipleDevice(MultipleDeviceTestCase):
chat_1.profile_add_to_contacts.click()
if not chat_1.remove_from_contacts.is_element_displayed():
self.errors.append("'Add to contacts' is not changed to 'Remove from contacts'")
chat_1.back_button.click()
chat_1.close_button.click()
home_2.just_fyi('check that can mention user with nickname in public chat')
chat_1.select_mention_from_suggestion_list(username_in_list=nickname + ' ' + username_2,
@ -580,7 +580,8 @@ class TestChatManagementMultipleDevice(MultipleDeviceTestCase):
userprofile = profile_1.open_contact_from_profile(nickname)
if not userprofile.remove_from_contacts.is_element_displayed():
self.errors.append("'Add to contacts' is not changed to 'Remove from contacts' in profile contacts")
profile_1.get_back_to_home_view()
profile_1.close_button.click()
profile_1.home_button.double_click()
device_1.just_fyi(
'Check that user is added to contacts below "Start new chat" and you redirected to 1-1 on tap')
@ -607,7 +608,7 @@ class TestChatManagementMultipleDevice(MultipleDeviceTestCase):
self.errors.append("Nickname is changed after removing user from contacts")
device_1.just_fyi('Check that user is removed from contact list in profile')
userprofile.back_button.click()
userprofile.close_button.click()
if profile_1.element_by_text(nickname).is_element_displayed():
self.errors.append('List of contacts in profile contains removed user')
profile_1.home_button.click(desired_view='chat')

View File

@ -10,6 +10,7 @@ from views.sign_in_view import SignInView
class TestCommandsMultipleDevices(MultipleDeviceTestCase):
@marks.testrail_id(6253)
@marks.critical
@marks.skip
def test_send_eth_in_1_1_chat_transaction_push(self):
sender = transaction_senders['A']
self.create_drivers(2)

View File

@ -56,7 +56,7 @@ class TestGroupChatMultipleDevice(MultipleDeviceTestCase):
device_2_chat.join_chat_button.click()
for chat in (device_1_chat, device_2_chat):
if not chat.chat_element_by_text(join_system_message).is_element_displayed():
self.errors.append('System message after joining group chat is not shown')
self.drivers[0].fail('System message after joining group chat is not shown')
device_2_chat.home_button.click(desired_view="home")
message_1 = "Message from device: %s" % device_1_chat.driver.number
device_1_chat.send_message(message_1)

View File

@ -179,7 +179,7 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase):
device_2_chat.view_profile_button.click()
if not device_2_chat.remove_from_contacts.is_element_displayed():
self.errors.append("Remove from contacts in not shown after adding contact from 1-1 chat bar")
device_2_chat.back_button.click()
device_2_chat.close_button.click()
device_2_chat.home_button.double_click()
device_2_home.plus_button.click()
device_2_contacts = device_2_home.start_new_chat_button.click()
@ -198,6 +198,7 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase):
@marks.testrail_id(5782)
@marks.critical
@marks.skip
def test_install_pack_and_send_sticker(self):
self.create_drivers(2)
device_1, device_2 = SignInView(self.drivers[0]), SignInView(self.drivers[1])
@ -252,7 +253,7 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase):
self.errors.append('Stickerpack was not installed')
device_2_home.just_fyi('check that can navigate to another user profile via long tap on sticker message')
device2_one_to_one_chat.cross_icon.click()
device2_one_to_one_chat.close_sticker_view_icon.click()
device2_one_to_one_chat.chat_item.long_press_element()
device2_one_to_one_chat.element_by_text('View Details').click()
if not device2_one_to_one_chat.profile_add_to_contacts.is_element_displayed():
@ -318,7 +319,7 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase):
element.scroll_to_element()
if not element.is_element_displayed():
self.drivers[0].fail('Status of another user not shown when open another user profile')
device_2_chat.back_button.click()
device_2_chat.close_button.click()
device_2_home.just_fyi('check options on long-press image for receiver')
device_2_chat.image_chat_item.long_press_element()
@ -389,6 +390,7 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase):
@marks.testrail_id(5373)
@marks.high
@marks.skip
def test_send_and_open_links_with_previews(self):
self.create_drivers(2)
device_1, device_2 = SignInView(self.drivers[0]), SignInView(self.drivers[1])
@ -450,7 +452,7 @@ class TestMessagesOneToOneChatMultiple(MultipleDeviceTestCase):
chat_2.element_by_translation_id("dont-ask").click()
chat_1.element_by_translation_id("enable").wait_and_click()
chat_1.element_by_translation_id("enable-all").wait_and_click()
chat_1.back_button.click()
chat_1.close_button.click()
if not chat_1.get_preview_message_by_text(giphy_url).preview_image:
self.errors.append("No preview is shown for %s" % giphy_url)
for key in preview_urls:
@ -655,6 +657,7 @@ class TestMessagesOneToOneChatSingle(SingleDeviceTestCase):
@marks.testrail_id(5403)
@marks.critical
@marks.skip
def test_start_chat_with_ens_mention_in_one_to_one(self):
home = SignInView(self.driver).create_user()

View File

@ -60,6 +60,7 @@ class TestPublicChatMultipleDevice(MultipleDeviceTestCase):
@marks.testrail_id(5360)
@marks.critical
@marks.skip
def test_unread_messages_counter_public_chat(self):
self.create_drivers(2)
driver_2 = self.drivers[1]

View File

@ -33,7 +33,8 @@ class TestBrowsing(SingleDeviceTestCase):
browsing.element_by_text_part('Свободный контент').wait_for_element(30)
browsing.just_fyi("Check refresh button")
browsing.dapp_tab_button.double_click()
browsing.open_tabs_button.click()
browsing.empty_tab_button.click()
url = 'app.uniswap.org'
element_on_start_page = dapp.element_by_text('ETH')
web_page = dapp.open_url(url)
@ -50,6 +51,7 @@ class TestBrowsing(SingleDeviceTestCase):
@marks.testrail_id(6210)
@marks.high
@marks.skip
def test_open_blocked_secure_not_secure_inlalid_offline_urls(self):
home = SignInView(self.driver).create_user()
dapp = home.dapp_tab_button.click()
@ -65,7 +67,7 @@ class TestBrowsing(SingleDeviceTestCase):
dapp_detail.continue_anyway_button.click()
if dapp_detail.element_by_text('This site is blocked').is_element_displayed():
self.errors.append("Failed to open Dapp after 'Continue anyway' tapped for %s" % url)
home.dapp_tab_button.click()
home.tab.click()
dapp.just_fyi('Checking connection is not secure warning')
web_page = dapp.open_url('http://www.dvwa.co.uk')
@ -99,6 +101,7 @@ class TestBrowsing(SingleDeviceTestCase):
@marks.testrail_id(5390)
@marks.high
@marks.skip
def test_delete_close_all_tabs(self):
home_view = SignInView(self.driver).create_user()
dapp_view = home_view.dapp_tab_button.click()
@ -131,6 +134,7 @@ class TestBrowsing(SingleDeviceTestCase):
@marks.testrail_id(6633)
@marks.high
@marks.skip
def test_browser_managing_bookmarks(self):
home_view = SignInView(self.driver).create_user()
dapp_view = home_view.dapp_tab_button.click()

View File

@ -38,6 +38,7 @@ class TestTransactionDApp(SingleDeviceTestCase):
@marks.testrail_id(5342)
@marks.critical
@marks.skip
def test_sign_message_and_transactions_filters_from_daap(self):
password = 'password_for_daap'
home = SignInView(self.driver).recover_access(passphrase=transaction_senders['W']['passphrase'],

View File

@ -31,6 +31,7 @@ class TestTransactionWalletSingleDevice(SingleDeviceTestCase):
@marks.testrail_id(6290)
@marks.high
@marks.skip
def test_keycard_fetching_balance_after_offline(self):
sender = wallet_users['A']
sign_in_view = SignInView(self.driver)
@ -66,6 +67,7 @@ class TestTransactionWalletSingleDevice(SingleDeviceTestCase):
@marks.testrail_id(6291)
@marks.critical
@marks.skip
def test_keycard_can_see_all_transactions_in_history(self):
address = wallet_users['D']['address']
passphrase = wallet_users['D']['passphrase']

View File

@ -196,7 +196,7 @@ class TestTransactionWalletSingleDevice(SingleDeviceTestCase):
self.errors.append('Transactions senders do not match!')
if tx_to != expected_txs_list[tx_hash]['to']:
self.errors.append('Transactions recipients do not match!')
transactions_details.back_button.click()
transactions_details.close_button.click()
self.errors.verify_no_errors()
@ -455,7 +455,7 @@ class TestTransactionWalletSingleDevice(SingleDeviceTestCase):
if token_view.decimals_input.text != decimals:
self.errors.append('Decimals for custom token was not set')
token_view.add_button.click()
token_view.back_button.click()
token_view.close_button.click()
wallet_view.asset_by_name(symbol).scroll_to_element()
if not wallet_view.asset_by_name(symbol).is_element_displayed():
self.errors.append('Custom token is not shown on Wallet view')
@ -472,6 +472,7 @@ class TestTransactionWalletSingleDevice(SingleDeviceTestCase):
@marks.testrail_id(6328)
@marks.critical
@marks.skip
def test_send_transaction_set_recipient_options(self):
home = SignInView(self.driver).recover_access(wallet_users['D']['passphrase'])
nickname = 'my_some_nickname'
@ -488,7 +489,7 @@ class TestTransactionWalletSingleDevice(SingleDeviceTestCase):
chat.chat_options.click()
chat.view_profile_button.click_until_presence_of_element(chat.remove_from_contacts)
chat.set_nickname(nickname)
chat.back_button.click()
chat.close_button.click()
wallet = home.wallet_button.click()
wallet.set_up_wallet()
wallet.add_account(account_name=account_name)

View File

@ -10,6 +10,7 @@ class TestGroupChatMultipleDevice(MultipleDeviceTestCase):
@marks.testrail_id(3998)
@marks.high
@marks.skip
def test_offline_add_new_group_chat_member(self):
message_before_adding = 'message before adding new user'
message_after_adding = 'message from new member'

View File

@ -18,7 +18,7 @@ from views.base_element import Button, BaseElement, EditBox, Text
class BackButton(Button):
def __init__(self, driver):
super().__init__(driver, accessibility_id="back-button")
super().__init__(driver, accessibility_id="Navigate Up")
def click(self, times_to_click: int = 1):
for _ in range(times_to_click):
@ -58,7 +58,7 @@ class TabButton(Button):
class HomeButton(TabButton):
def __init__(self, driver):
super().__init__(driver, accessibility_id="home-tab-button")
super().__init__(driver, xpath="//*[contains(@content-desc,'tab, 1 out of 5')]")
def navigate(self):
from views.home_view import HomeView
@ -80,7 +80,7 @@ class HomeButton(TabButton):
class DappTabButton(TabButton):
def __init__(self, driver):
super().__init__(driver, accessibility_id="dapp-tab-button")
super().__init__(driver, xpath="//*[contains(@content-desc,'tab, 2 out of 5')]")
def navigate(self):
from views.dapps_view import DappsView
@ -101,7 +101,7 @@ class DappTabButton(TabButton):
class WalletButton(TabButton):
def __init__(self, driver):
super().__init__(driver, accessibility_id="wallet-tab-button")
super().__init__(driver, xpath="//*[contains(@content-desc,'tab, 3 out of 5')]")
def navigate(self):
from views.wallet_view import WalletView
@ -115,7 +115,7 @@ class WalletButton(TabButton):
class ProfileButton(TabButton):
def __init__(self, driver):
super().__init__(driver, accessibility_id="profile-tab-button")
super().__init__(driver, xpath="//*[contains(@content-desc,'5 out of 5')]")
def navigate(self):
from views.profile_view import ProfileView
@ -133,7 +133,7 @@ class ProfileButton(TabButton):
class StatusButton(TabButton):
def __init__(self, driver):
super().__init__(driver, accessibility_id="status-tab-button")
super().__init__(driver, xpath="//*[contains(@content-desc,'tab, 4 out of 5')]")
def navigate(self):
from views.chat_view import ChatView
@ -193,6 +193,14 @@ class AirplaneModeButton(Button):
super(AirplaneModeButton, self).click()
self.driver.press_keycode(4)
class SignInPhraseText(Text):
def __init__(self, driver):
super().__init__(driver, translation_id="this-is-you-signing", suffix="//following-sibling::*[2]/android.widget.TextView")
@property
def list(self):
return self.text.split()
class BaseView(object):
def __init__(self, driver):
@ -224,7 +232,9 @@ class BaseView(object):
self.confirm_button = Button(self.driver, translation_id='confirm', uppercase=True)
self.cross_icon = Button(self.driver, xpath="(//android.widget.ImageView[@content-desc='icon'])[1]")
self.close_sticker_view_icon = Button(self.driver, xpath="//androidx.appcompat.widget.LinearLayoutCompat")
self.native_close_button = Button(self.driver, id="android:id/aerr_close")
self.close_button = Button(self.driver, accessibility_id="back-button")
self.show_roots_button = Button(self.driver, accessibility_id="Show roots")
self.get_started_button = Button(self.driver, translation_id="get-started")
self.ok_got_it_button = Button(self.driver, translation_id="ok-got-it")
@ -234,6 +244,8 @@ class BaseView(object):
self.search_input = EditBox(self.driver, accessibility_id="search-input")
self.share_button = Button(self.driver, accessibility_id="share-my-contact-code-button")
self.qr_code_image = Button(self.driver, accessibility_id="qr-code-image")
self.sign_in_phrase = SignInPhraseText(self.driver)
# external browser
@ -242,7 +254,7 @@ class BaseView(object):
self.apps_button = Button(self.driver, accessibility_id="Apps")
self.status_app_icon = Button(self.driver, translation_id="status")
self.airplane_mode_button = AirplaneModeButton(self.driver)
self.enter_qr_edit_box = EnterQRcodeEditBox(self.driver)
self.etest_nter_qr_edit_box = EnterQRcodeEditBox(self.driver)
self.element_types = {
'base': BaseElement,
@ -597,6 +609,12 @@ class BaseView(object):
self.search_input.click()
self.search_input.send_keys(keyword)
def set_up_wallet_when_sending_tx(self):
self.driver.info("**Setting up wallet**")
phrase = self.sign_in_phrase.text
self.ok_got_it_button.click()
return phrase
# Method-helper
def write_page_source_to_file(self, full_path_to_file):
string_source = self.driver.page_source

View File

@ -86,7 +86,7 @@ class ViewProfileButton(Button):
class ChatOptionsButton(Button):
def __init__(self, driver):
super().__init__(driver, accessibility_id="chat-menu-button")
super().__init__(driver, xpath="(//android.widget.TextView[@content-desc='chat-name-text']/../..//android.widget.TextView)[last()]")
def click(self):
self.click_until_presence_of_element(ChatView(self.driver).clear_history_button)

View File

@ -41,7 +41,7 @@ class DappsView(BaseView):
# Ens dapp
self.ens_name_input = EditBox(self.driver, xpath="//android.widget.EditText")
self.check_ens_name = Button(self.driver, xpath="//android.widget.EditText//following-sibling::android.view.ViewGroup[1]")
self.check_ens_name = Button(self.driver, xpath="(//android.widget.ImageView[@content-desc='icon'])[2]/../..")
# Options on long press
self.delete_bookmark_button = Button(self.driver, accessibility_id="delete-bookmark")

View File

@ -3,7 +3,6 @@ from views.base_element import Text, SilentButton
from views.base_element import Button, EditBox
from views.base_view import BaseView
class AmountEditBox(EditBox, Button):
def __init__(self, driver):
super(AmountEditBox, self).__init__(driver, accessibility_id="amount-input")
@ -136,6 +135,8 @@ class SendTransactionView(BaseView):
def sign_transaction(self, sender_password: str = common_password, keycard=False, default_gas_price=False):
self.driver.info("**Signing transaction (keycard:%s, default_gas_price:%s)**" % (str(keycard), str(default_gas_price)))
if self.sign_in_phrase.is_element_displayed():
self.set_up_wallet_when_sending_tx()
if not default_gas_price:
self.network_fee_button.click()
default_gas_price = self.gas_price_input.text

View File

@ -113,7 +113,7 @@ class SignInView(BaseView):
self.access_key_button = AccessKeyButton(self.driver)
self.generate_key_button = Button(self.driver, translation_id="generate-new-key")
self.your_keys_more_icon = Button(self.driver, accessibility_id="your-keys-more-icon")
self.generate_new_key_button = Button(self.driver, accessibility_id="generate-a-new-key")
self.generate_new_key_button = Button(self.driver, xpath="(//android.widget.ImageView[@content-desc='icon'])[2]")
self.create_password_input = EditBox(self.driver,
xpath="(//android.widget.EditText[@content-desc='password-input'])[1]")
self.confirm_your_password_input = EditBox(self.driver,
@ -135,7 +135,7 @@ class SignInView(BaseView):
# restore from seed phrase
self.seedphrase_input = EditBox(self.driver, xpath="//android.widget.EditText")
self.enter_seed_phrase_button = Button(self.driver, accessibility_id="enter-seed-phrase-button")
self.reencrypt_your_key_button = Button(self.driver, translation_id="re-encrypt-key")
self.reencrypt_your_key_button = Button(self.driver, accessibility_id="onboarding-next-button")
# migrate multiaccount
self.options_button = Button(self.driver, accessibility_id="sign-in-options")

View File

@ -14,15 +14,6 @@ class TransactionHistoryButton(Button):
return TransactionsView(self.driver)
class SignInPhraseText(Text):
def __init__(self, driver):
super().__init__(driver, translation_id="this-is-you-signing", suffix="//following-sibling::*[2]/android.widget.TextView")
@property
def list(self):
return self.text.split()
class AssetCheckBox(SilentButton):
def __init__(self, driver, asset_name):
super().__init__(driver, xpath="//*[@text='%s']" % asset_name)
@ -104,7 +95,6 @@ class WalletView(BaseView):
self.address_text = Text(self.driver, accessibility_id="address-text")
self.sign_in_phrase = SignInPhraseText(self.driver)
self.remind_me_later_button = Button(self.driver, translation_id="remind-me-later")
self.total_amount_text = Text(self.driver, accessibility_id="total-amount-value-text")
@ -187,6 +177,13 @@ class WalletView(BaseView):
return ' '.join([element.text for element in self.sign_in_phrase.find_elements()])
def set_up_wallet(self):
#self.driver.info("**Setting up wallet**")
#phrase = self.sign_in_phrase.text
#self.ok_got_it_button.click()
#return phrase
pass ## Temporary for easier edit of tests
def set_up_wallet_when_sending_tx(self):
self.driver.info("**Setting up wallet**")
phrase = self.sign_in_phrase.text
self.ok_got_it_button.click()
@ -279,7 +276,9 @@ class WalletView(BaseView):
else:
send_transaction_view.set_recipient_address(kwargs.get('recipient'))
if kwargs.get('sign_transaction', True):
send_transaction_view.sign_transaction_button.click_until_presence_of_element(send_transaction_view.network_fee_button)
send_transaction_view.sign_transaction_button.click()
if self.sign_in_phrase.is_element_displayed():
self.set_up_wallet_when_sending_tx()
send_transaction_view.sign_transaction(keycard=kwargs.get('keycard', False),
sender_password=kwargs.get('sender_password', common_password))
return send_transaction_view

View File

@ -27,8 +27,10 @@ class BaseWebView(BaseView):
self.continue_anyway_button = Button(self.driver, translation_id="continue-anyway")
self.open_tabs_button = Button(self.driver, accessibility_id="browser-open-tabs")
self.close_all_button = Button(self.driver, accessibility_id="close-all")
self.empty_tab_button = Button(self.driver, accessibility_id="tab-itemEmpty tab")
self.camera_image_in_dapp = BaseElement(self.driver, class_name="android.widget.Image")
# bookmarks management
self.add_remove_favorites_button = Button(self.driver, accessibility_id="add-remove-fav")
self.bookmark_name_input = EditBox(self.driver, accessibility_id="bookmark-input")