From 280063b68792693d55fff0b0015726a45eaecd50 Mon Sep 17 00:00:00 2001 From: Serhy Date: Thu, 16 Jan 2020 17:47:04 +0200 Subject: [PATCH] pdate e2e and fleet in e2e env Signed-off-by: Serhy --- .env.e2e | 2 +- .../atomic/chats/test_chats_management.py | 8 ++++---- .../atomic/dapps_and_browsing/test_dapps.py | 14 ++++++++++++-- test/appium/views/chat_view.py | 4 ++-- .../multi_account_color.png | Bin 2015 -> 2005 bytes test/appium/views/sign_in_view.py | 4 ++-- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.env.e2e b/.env.e2e index 4d66ddc772..613798bfac 100644 --- a/.env.e2e +++ b/.env.e2e @@ -3,7 +3,7 @@ DEFAULT_NETWORK=testnet_rpc ERC20_CONTRACT_WARNINGS=1 ETHEREUM_DEV_CLUSTER=1 EXTENSIONS=0 -FLEET=eth.staging +FLEET=eth.prod GROUP_CHATS_ENABLED=1 LOG_LEVEL_STATUS_GO=info LOG_LEVEL=debug diff --git a/test/appium/tests/atomic/chats/test_chats_management.py b/test/appium/tests/atomic/chats/test_chats_management.py index 62b5db1e6a..79c6e11112 100644 --- a/test/appium/tests/atomic/chats/test_chats_management.py +++ b/test/appium/tests/atomic/chats/test_chats_management.py @@ -234,12 +234,12 @@ class TestChatManagement(SingleDeviceTestCase): chat_view.just_fyi("Clear quotes from both chats") chat_view.cancel_reply_button.click() - if chat_view.tiny_reply_icon_in_message_input.is_element_displayed(): + if chat_view.cancel_reply_button.is_element_displayed(): self.errors.append("Message quote kept in public chat input after it's cancelation") chat_view.get_back_to_home_view(times_to_click_on_back_btn=1) home.get_chat_with_user(dummy_user["username"]).click() chat_view.cancel_reply_button.click() - if chat_view.tiny_reply_icon_in_message_input.is_element_displayed(): + if chat_view.cancel_reply_button.is_element_displayed(): self.errors.append("Message quote kept in 1-1 chat input after it's cancelation") self.errors.verify_no_errors() @@ -482,7 +482,7 @@ class TestChatManagementMultipleDevice(MultipleDeviceTestCase): device_1_chat = home_1.add_contact(device_2_public_key) device_1_chat.send_message(message_from_sender) device_1_chat.quote_message(message_from_sender) - if device_1_chat.quote_username_in_message_input.text != "You": + if device_1_chat.quote_username_in_message_input.text != "↪ You": self.errors.append("'You' is not displayed in reply quote snippet replying to own message") reply_to_message_from_sender = message_from_sender + " reply" device_1_chat.send_message(reply_to_message_from_sender) @@ -505,7 +505,7 @@ class TestChatManagementMultipleDevice(MultipleDeviceTestCase): chat_public_1, chat_public_2 = home_1.get_chat_view(), home_2.get_chat_view() chat_public_1.send_message(message_from_sender) chat_public_2.quote_message(message_from_sender) - if chat_public_2.quote_username_in_message_input.text != device_1_username: + if chat_public_2.quote_username_in_message_input.text != ("↪ " + device_1_username): self.errors.append(" %s is not displayed in reply quote snippet replying to own message " % device_1_username) device_1.just_fyi('Message receiver verifies reply is present in received message') diff --git a/test/appium/tests/atomic/dapps_and_browsing/test_dapps.py b/test/appium/tests/atomic/dapps_and_browsing/test_dapps.py index 988d3fee7f..ae9dfb6cf0 100644 --- a/test/appium/tests/atomic/dapps_and_browsing/test_dapps.py +++ b/test/appium/tests/atomic/dapps_and_browsing/test_dapps.py @@ -48,7 +48,7 @@ class TestDApps(SingleDeviceTestCase): wallet_view.just_fyi('create new account in multiaccount') wallet_view.set_up_wallet() status_account = 'Status account' - account_name = 'subaccount' + account_name = 'Subaccount' wallet_view.add_account(account_name) address = wallet_view.get_wallet_address(account_name) @@ -78,7 +78,6 @@ class TestDApps(SingleDeviceTestCase): if not status_test_dapp.element_by_text(account_name).is_element_displayed(): self.errors.append("No expected account %s is shown in authorize web3 popup for wallet" % account_name) status_test_dapp.allow_button.click() - status_test_dapp.allow_button.click() dapp_view.profile_button.click() profile_view.element_by_text(test_dapp_name).click() for text in 'Chat key', account_name: @@ -93,6 +92,17 @@ class TestDApps(SingleDeviceTestCase): if not send_transaction_view.element_by_text(address).is_element_displayed(): self.errors.append("Wallet address %s in not shown in 'From' on Send Transaction screen" % address) + sign_in_view.just_fyi('Relogin and check multiaccount loads fine') + send_transaction_view.cancel_button.click() + sign_in_view.profile_button.click() + sign_in_view.get_back_to_home_view() + sign_in_view.relogin() + sign_in_view.wallet_button.click() + if not wallet_view.element_by_text(account_name).is_element_displayed(): + self.errors.append("Subaccount is gone after relogin in Wallet!") + sign_in_view.dapp_tab_button.click() + if not dapp_view.element_by_text(account_name).is_element_displayed(): + self.errors.append("Subaccount is not selected after relogin in Dapps!") self.errors.verify_no_errors() @marks.testrail_id(5654) diff --git a/test/appium/views/chat_view.py b/test/appium/views/chat_view.py index d262217c41..1583f890fc 100644 --- a/test/appium/views/chat_view.py +++ b/test/appium/views/chat_view.py @@ -25,8 +25,8 @@ class TinyReplyIconInMessageInput(BaseElement): class QuoteUsernameInMessageInput(BaseText): def __init__(self, driver): super().__init__(driver) - self.locator = self.Locator.xpath_selector("//android.view.ViewGroup[@content-desc='tiny-reply-icon']/" - "../android.widget.TextView[1]") + self.locator = self.Locator.xpath_selector("//android.view.ViewGroup[@content-desc='cancel-message-reply']/" + "..//android.widget.TextView[1]") class CancelReplyButton(BaseEditBox): diff --git a/test/appium/views/elements_templates/multi_account_color.png b/test/appium/views/elements_templates/multi_account_color.png index ae7e7c9d50af82d4b02c6c29da8b9bd5f64a2cca..a05b725510756ed9a00b1b7c6423480737caf0af 100644 GIT binary patch delta 2004 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