From be37b1683e961b56fedd12e030d222689cc80ade Mon Sep 17 00:00:00 2001 From: Churikova Tetiana Date: Fri, 30 Apr 2021 16:11:52 +0200 Subject: [PATCH] e2e: fix for progress bar and testrail for e2e Signed-off-by: Churikova Tetiana --- test/appium/support/testrail_report.py | 9 ++++-- test/appium/tests/atomic/test_upgrade.py | 29 ++++++++++++++++++- test/appium/tests/users.py | 2 ++ test/appium/views/chat_view.py | 2 +- test/appium/views/dapps_view.py | 3 +- test/appium/views/upgrade_dbs/chats/data.py | 32 ++++++++++++++++++--- 6 files changed, 68 insertions(+), 9 deletions(-) diff --git a/test/appium/support/testrail_report.py b/test/appium/support/testrail_report.py index 30d9fadaf4..4ae8a87475 100644 --- a/test/appium/support/testrail_report.py +++ b/test/appium/support/testrail_report.py @@ -86,6 +86,7 @@ class TestrailReport(BaseTestReport): test_cases['high'] = 735 test_cases['medium'] = 736 test_cases['low'] = 737 + test_cases['upgrade'] = 881 case_ids = list() for arg in argv: if "run_testrail_ids" in arg: @@ -95,10 +96,14 @@ class TestrailReport(BaseTestReport): if 'critical or high' in argv: for case in self.get_cases([test_cases['critical'], test_cases['high']]): case_ids.append(case['id']) + elif 'upgrade' in argv and 'not upgrade' not in argv: + for case in self.get_cases([test_cases['upgrade']]): + case_ids.append(case['id']) else: for phase in test_cases: - for case in self.get_cases([test_cases[phase]]): - case_ids.append(case['id']) + if phase != 'upgrade': + for case in self.get_cases([test_cases[phase]]): + case_ids.append(case['id']) return case_ids def add_results(self): diff --git a/test/appium/tests/atomic/test_upgrade.py b/test/appium/tests/atomic/test_upgrade.py index 4d9a96485e..27a0c48f16 100644 --- a/test/appium/tests/atomic/test_upgrade.py +++ b/test/appium/tests/atomic/test_upgrade.py @@ -1,5 +1,5 @@ from tests import marks -from tests.base_test_case import SingleDeviceTestCase +from tests.base_test_case import SingleDeviceTestCase, MultipleDeviceTestCase from tests.users import upgrade_users from views.sign_in_view import SignInView import views.upgrade_dbs.chats.data as chat_data @@ -119,4 +119,31 @@ class TestUpgradeApplication(SingleDeviceTestCase): self.errors.verify_no_errors() +@marks.upgrade +class TestUpgradeMultipleApplication(MultipleDeviceTestCase): + + @marks.testrail_id(6285) + @marks.skip + def test_unread_previews_public_chat_upgrade(self): + self.create_drivers(2) + device_1, device_2 = SignInView(self.drivers[0]), SignInView(self.drivers[1]) + device_2.create_user() + device_1.just_fyi("Import db, upgrade") + home = device_1.import_db(user=upgrade_users['chats'], import_db_folder_name='chats') + + device_1.just_fyi("**Check messages in 1-1 chat**") + command_username = 'Royal Defensive Solenodon' + messages = chat_data.chats[command_username]['messages'] + chat = home.get_chat(command_username).click() + if chat.add_to_contacts.is_element_displayed(): + self.errors.append('User is deleted from contacts after upgrade') + chat.scroll_to_start_of_history() + if chat.audio_message_in_chat_timer.text != messages['audio']['length']: + self.errors.append('Timer is not shown for audiomessage') + import time + time.sleep(100) + #device_1.just_fyi("Check messages in Activity centre") + # device_2.just_fyi("Create new multiaccount and send new message to device 1") + # device_1.just_fyi("Respond to message and check it is shown on device 2") + self.errors.verify_no_errors() diff --git a/test/appium/tests/users.py b/test/appium/tests/users.py index 88948b7a3b..e427f399ba 100644 --- a/test/appium/tests/users.py +++ b/test/appium/tests/users.py @@ -41,6 +41,8 @@ upgrade_users = dict() upgrade_users['chats'] = dict() upgrade_users['chats']['passphrase'] = 'identify level pink lift choose winner hour onion style festival rather salmon' +upgrade_users['chats']['public_key'] = '0x045d8a344ffee0c5ce187d0248a9b8ffc4a12493c9d9e8b9a395f38' \ + '825ebe55ac2350d9e7090e39e6c8d7020aaa799aefe563f1db5b6151370eae246558772ad9e' wallet_users = dict() diff --git a/test/appium/views/chat_view.py b/test/appium/views/chat_view.py index a7bad2b53c..11774aaeff 100644 --- a/test/appium/views/chat_view.py +++ b/test/appium/views/chat_view.py @@ -656,7 +656,7 @@ class ChatView(BaseView): return self.history_start_icon.find_element() except NoSuchElementException: size = self.driver.get_window_size() - self.driver.swipe(500, size["height"] * 0.1, 500, size["height"] * 0.8) + self.driver.swipe(500, size["height"] * 0.25, 500, size["height"] * 0.8) else: raise Exception('Start of chat history is not reached!') diff --git a/test/appium/views/dapps_view.py b/test/appium/views/dapps_view.py index 1bb240eb15..a826569020 100644 --- a/test/appium/views/dapps_view.py +++ b/test/appium/views/dapps_view.py @@ -57,7 +57,8 @@ class DappsView(BaseView): self.enter_url_editbox.click() self.enter_url_editbox.send_keys(url) self.confirm() - self.progress_bar.wait_for_invisibility_of_element(50) + from views.web_views.base_web_view import BaseWebView + BaseWebView(self.driver).wait_for_d_aap_to_load() return self.get_base_web_view() def get_browser_entry(self, name): diff --git a/test/appium/views/upgrade_dbs/chats/data.py b/test/appium/views/upgrade_dbs/chats/data.py index 96d1436268..673f85479c 100644 --- a/test/appium/views/upgrade_dbs/chats/data.py +++ b/test/appium/views/upgrade_dbs/chats/data.py @@ -34,18 +34,42 @@ chats = { 'messages':{'long': 'Папирус (др.-греч. πάπῡρος, лат. papyrus), или би́блиос (др.-греч. βιβλίος), также ха́рта', 'tag': '#what-is-going-on', 'reply': 'reply', - 'mention': 'All Whopping Dassierat be my friend'}, - 'first_timastamp': 'Mar 25, 2021' + 'mention': 'All Whopping Dassierat be my friend'} }, 'Thoughtful Stupendous Graywolf': { 'preview':'hey Thoughtful Stupendous Graywolf !', 'messages':{ }, - - }, 'Royal Defensive Solenodon': { 'preview':'Request address for transaction accepted', + 'messages': { + 'audio': { + 'length':'00:10', + 'timestamp' : '1:02 PM' + }, + 'incoming_ETH_shared':{ + 'value':'0.01 ETH', + 'status': "Shared 'Ethereum account'" + }, + 'incoming_ETH_confirmed': { + 'value': '0.1 ETH', + 'status': "Confirmed" + }, + 'incoming_ETH_declined': { + 'value': '20 ETH', + 'status': "Transaction declined" + }, + 'incoming_STT_confirmed': { + 'value': '200 STT', + 'status': "Confirmed" + }, + 'outgoing_STT_sign': { + 'value': '200 STT', + 'status': "Address request accepted", + 'action': 'Sign and send' + }, + } } } \ No newline at end of file