status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

nightly fixes 

Signed-off-by: Churikova Tetiana <churikova.tm@gmail.com>
This commit is contained in:
Churikova Tetiana 2020-10-28 20:39:02 +01:00
parent ce20eddb99
commit 10dcee3e05
No known key found for this signature in database
GPG Key ID: 0D4EA7B33B47E6D8
5 changed files with 38 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/appium/support/api/network_api.py
View File

@ -118,11 +118,14 @@ class NetworkApi(object):
def wait_for_confirmation_of_transaction(self, address, amount, confirmations=12, token=False):
start_time = time.time()
self.log('Waiting for transaction to have %s confirmations' % confirmations)
while round(time.time() - start_time, ndigits=2) < 900: # should be < idleTimeout capability
transaction = self.find_transaction_by_unique_amount(address, amount, token)
self.log(
'Expected amount of confirmations is %s, in fact %s' % (confirmations, transaction['confirmations']))
if int(transaction['confirmations']) >= confirmations:
return
time.sleep(10)
time.sleep(20)
pytest.fail('Transaction with amount %s was not confirmed, address is %s, still has %s confirmations' % (amount, address, int(transaction['confirmations'])))
def verify_balance_is_updated(self, initial_balance, recipient_address, wait_time=360):

32
test/appium/tests/atomic/transactions/test_keycard_wallet.py
View File

@ -119,21 +119,15 @@ class TestTransactionWalletSingleDevice(SingleDeviceTestCase):
wallet_view.just_fyi("Send transaction to new account")
wallet_view.accounts_status_account.click()
send_transaction = wallet_view.send_transaction_button.click()
send_transaction.amount_edit_box.click()
transaction_amount = send_transaction.get_unique_amount()
send_transaction.amount_edit_box.set_value(transaction_amount)
send_transaction.confirm()
send_transaction.chose_recipient_button.click()
send_transaction.accounts_button.click()
send_transaction.element_by_text(account_name).click()
send_transaction.sign_transaction_button.click()
send_transaction.sign_transaction(keycard=True)
transaction_amount = '0.05'
send_transaction = wallet_view.send_transaction(account_name=account_name,
amount=transaction_amount,
keycard=True)
self.network_api.wait_for_confirmation_of_transaction(status_account_address, transaction_amount)
self.network_api.verify_balance_is_updated('0', status_account_address)
self.network_api.verify_balance_is_updated('0.1', status_account_address)
wallet_view.just_fyi("Verifying previously sent transaction in new account")
wallet_view.back_button.click()
send_transaction.back_button.click()
wallet_view.get_account_by_name(account_name).click()
wallet_view.send_transaction_button.click()
wallet_view.back_button.click()
@ -145,17 +139,11 @@ class TestTransactionWalletSingleDevice(SingleDeviceTestCase):
wallet_view.just_fyi("Sending eth from new account to main account")
updated_balance = self.network_api.get_balance(status_account_address)
transaction_amount_1 = round(float(transaction_amount) * 0.1, 11)
wallet_view.wait_balance_is_changed()
wallet_view.send_transaction_button.click()
send_transaction.amount_edit_box.click()
transaction_amount_1 = round(float(transaction_amount) * 0.05, 11)
send_transaction.amount_edit_box.set_value(str(transaction_amount_1))
send_transaction.confirm()
send_transaction.chose_recipient_button.click()
send_transaction.accounts_button.click()
send_transaction.element_by_text('Status account').click()
send_transaction.sign_transaction_button.click()
send_transaction.sign_transaction(keycard=True)
send_transaction = wallet_view.send_transaction(account_name='Status account',
amount=transaction_amount_1,
keycard=True)
send_transaction.back_button.click()
sub_account_address = wallet_view.get_wallet_address(account_name)[2:]
self.network_api.wait_for_confirmation_of_transaction(sub_account_address, transaction_amount_1)

27
test/appium/tests/atomic/transactions/test_wallet.py
View File

@ -247,16 +247,10 @@ class TestTransactionWalletSingleDevice(SingleDeviceTestCase):
wallet_view.just_fyi("Send transaction to new account")
wallet_view.accounts_status_account.click()
send_transaction = wallet_view.send_transaction_button.click()
send_transaction.amount_edit_box.click()
transaction_amount = send_transaction.get_unique_amount()
send_transaction.amount_edit_box.set_value(transaction_amount)
send_transaction.confirm()
send_transaction.chose_recipient_button.click()
send_transaction.accounts_button.click()
send_transaction.element_by_text(account_name).click()
send_transaction.sign_transaction_button.click()
send_transaction.sign_transaction()
transaction_amount = '0.0%s' % str(random.randint(10000, 99999)) + '1'
wallet_view.send_transaction(account_name=account_name,
amount=transaction_amount)
self.network_api.wait_for_confirmation_of_transaction(status_account_address, transaction_amount)
self.network_api.verify_balance_is_updated('0.1', status_account_address)
@ -273,16 +267,9 @@ class TestTransactionWalletSingleDevice(SingleDeviceTestCase):
wallet_view.just_fyi("Sending eth from new account to main account")
updated_balance = self.network_api.get_balance(status_account_address)
wallet_view.send_transaction_button.click()
send_transaction.amount_edit_box.click()
transaction_amount_1 = round(float(transaction_amount) * 0.05, 11)
send_transaction.amount_edit_box.set_value(str(transaction_amount_1))
send_transaction.confirm()
send_transaction.chose_recipient_button.click()
send_transaction.accounts_button.click()
send_transaction.element_by_text('Status account').click()
send_transaction.sign_transaction_button.click()
send_transaction.sign_transaction()
transaction_amount_1 = round(float(transaction_amount) * 0.1, 12)
send_transaction = wallet_view.send_transaction(account_name='Status account',
amount=transaction_amount_1)
send_transaction.back_button.click()
sub_account_address = wallet_view.get_wallet_address(account_name)[2:]
self.network_api.wait_for_confirmation_of_transaction(status_account_address, transaction_amount)

13
test/appium/views/base_view.py
View File

@ -120,13 +120,20 @@ class HomeButton(TabButton):
from views.home_view import HomeView
return HomeView(self.driver)
def click(self):
def click(self, desired_view='home'):
from views.home_view import PlusButton
self.click_until_presence_of_element(PlusButton(self.driver))
from views.chat_view import ChatMessageInput, ProfileNicknameOtherUser
if desired_view == 'home':
element = PlusButton(self.driver)
elif desired_view == 'chat':
element = ChatMessageInput(self.driver)
elif desired_view == 'other_user_profile':
element = ProfileNicknameOtherUser(self.driver)
self.click_until_presence_of_element(element)
return self.navigate()
class ShareButton(BaseButton):
class ShareButton(BaseButton):
def __init__(self, driver):
super(ShareButton, self).__init__(driver)
self.locator = self.Locator.accessibility_id('share-my-contact-code-button')

9
test/appium/views/wallet_view.py
View File

@ -571,13 +571,18 @@ class WalletView(BaseView):
transaction_amount = str(kwargs.get('amount', send_transaction_view.get_unique_amount()))
send_transaction_view.amount_edit_box.set_value(transaction_amount)
send_transaction_view.set_recipient_address(kwargs.get('recipient'))
if kwargs.get('account_name'):
send_transaction_view.chose_recipient_button.click()
send_transaction_view.accounts_button.click()
send_transaction_view.element_by_text(kwargs.get('account_name')).click()
else:
send_transaction_view.set_recipient_address(kwargs.get('recipient'))
if kwargs.get('sign_transaction', True):
send_transaction_view.sign_transaction_button.click()
send_transaction_view.sign_transaction(keycard=kwargs.get('keycard', False),
default_gas_price=kwargs.get('default_gas_price', False),
sender_password=kwargs.get('sender_password', common_password))
return send_transaction_view
def receive_transaction(self, **kwargs):
self.receive_transaction_button.click()