chore(e2e): new onboarding tests changes

test/e2e/README.md

@@ -5,8 +5,6 @@
 1. **MacOS**: https://www.notion.so/Mac-arch-x64-and-Intel-50ea48dae1d4481b882afdbfad38e95a
 2. **Linux**: https://www.notion.so/Linux-21f7abd2bb684a0fb10057848760a889
 3. **Windows**: https://www.notion.so/Windows-fbccd2b09b784b32ba4174233d83878d
-
-**NOTE:** when MacOS and Linux are proven to be working, Windows guide could be outdated (no one yet set up Windows)
 
 ## Which build to use
 
@@ -45,7 +43,7 @@ expected to fail in report with a reference to the ticket. At the same time, if
 it will be shown as XPASS (unexpectedly passing) in report, which will indicate the initial bug is gone
 - `skip`, used to just skip tests for various reasons, normally with a ticket linked
 - `flaky`, used to mark the tests that are normally passing but sometimes fail. If such test passes, then
-if will be shown as passed in report normally. If the test fails, then the total run wont be failed, but 
+if will be shown as passed in report normally. If the test fails, then the total run won't be failed, but 
 the corresponding test will be marked as `xfail` in the report. It is done for a few tests that are not super
 stable yet, but passes most of the time. This mark should be used with caution and in case of real need only.
 - `timeout(timeout=180, method="thread")`, to catch excessively long test durations like deadlocked or hanging tests.

test/e2e/configs/__init__.py

@@ -1,5 +1,4 @@
 import logging
-import os
 
 from os import path
 from scripts.utils.system_path import SystemPath

test/e2e/constants/user.py

@@ -1,11 +1,8 @@
-import random
-import string
 from collections import namedtuple
 from dataclasses import dataclass, field
 from typing import Optional
 
 import configs
-from constants import ColorCodes
 from scripts.tools.image import Image
 from scripts.utils.generators import random_name_string, random_password_string, random_community_name, \
     random_community_description, random_community_introduction, random_community_leave_message, random_community_tags, \

test/e2e/driver/aut.py

@@ -1,4 +1,3 @@
-import os
 import time
 
 import allure

test/e2e/fixtures/aut.py

@@ -4,12 +4,10 @@
 import pytest
 import logging
 import constants
-from configs import get_platform
 from constants.user import *
 from driver.aut import AUT
 from gui.main_window import MainWindow
 from scripts.utils import system_path
-from scripts.utils.local_system import get_pid_by_process_name, kill_process
 from scripts.utils.system_path import SystemPath
 
 LOG = logging.getLogger(__name__)

test/e2e/fixtures/squish.py

@@ -1,4 +1,3 @@
-import allure
 import pytest
 import logging
 

test/e2e/gui/components/activity_center.py

@@ -81,14 +81,12 @@ def click_activity_center_button(self, text: str):
     def find_contact_request_in_list(
             self, contact: str, timeout_sec: int = configs.timeouts.MESSAGING_TIMEOUT_SEC):
         started_at = time.monotonic()
-        request = None
-        while request is None:
+        while time.monotonic() - started_at < timeout_sec:
             requests = self.contact_items
             for _request in requests:
                 if _request.contact_request == contact:
-                    request = _request
-            assert time.monotonic() - started_at < timeout_sec, f'Contact: {contact} not found in {requests}'
-        return request
+                    return _request
+        raise TimeoutError(f'Timed out after {timeout_sec} seconds: Contact request "{contact}" not found.')
 
     @allure.step('Accept contact request')
     def accept_contact_request(self, request):

test/e2e/gui/components/change_password_popup.py

@@ -1,5 +1,3 @@
-import allure
-
 import driver
 from constants.settings import PasswordView
 from gui.components.base_popup import BasePopup

test/e2e/gui/components/community/community_channel_popups.py

@@ -6,7 +6,6 @@
 from gui.elements.check_box import CheckBox
 from gui.elements.text_edit import TextEdit
 from gui.objects_map import names
-from gui.screens.community_settings import PermissionsSettingsView
 
 
 class ChannelPopup(BasePopup):

test/e2e/gui/components/community/leave_community_confirmation.py

@@ -1,5 +1,3 @@
-import allure
-
 from gui.components.base_popup import BasePopup
 from gui.elements.button import Button
 from gui.objects_map import communities_names

test/e2e/gui/components/community/new_permission_popup.py

@@ -1,8 +1,4 @@
 import allure
-
-import configs
-import driver
-from driver.objects_access import walk_children
 from gui.elements.button import Button
 from gui.elements.check_box import CheckBox
 from gui.elements.object import QObject

test/e2e/gui/components/community/tags_select_popup.py

@@ -9,7 +9,6 @@
 from gui.components.base_popup import BasePopup
 from gui.elements.button import Button
 from gui.elements.object import QObject
-from gui.elements.text_edit import TextEdit
 from gui.objects_map import names
 
 

test/e2e/gui/components/context_menu.py

@@ -1,6 +1,6 @@
 import allure
 
-from gui.components.community.community_category_popup import CategoryPopup, EditCategoryPopup
+from gui.components.community.community_category_popup import EditCategoryPopup
 from gui.components.community.invite_contacts import InviteContactsPopup
 from gui.components.community.leave_community_confirmation import LeaveCommunityConfirmationPopup
 from gui.components.delete_popup import DeleteCategoryPopup

test/e2e/gui/components/messaging/link_preview_options_popup.py

@@ -2,7 +2,6 @@
 
 import configs
 from gui.components.base_popup import BasePopup
-from gui.elements.button import Button
 from gui.elements.object import QObject
 from gui.objects_map import names
 

test/e2e/gui/components/onboarding/beta_consent_popup.py

@@ -1,6 +1,5 @@
 import allure
 
-from gui.components.base_popup import BasePopup
 from gui.elements.button import Button
 from gui.elements.check_box import CheckBox
 from gui.elements.object import QObject

test/e2e/gui/components/onboarding/login_by_syncing_checklist.py

@@ -0,0 +1,21 @@
+from gui.components.base_popup import BasePopup
+from gui.elements.button import Button
+from gui.objects_map import onboarding_names
+from gui.elements.check_box import CheckBox
+
+
+class LogInBySyncingChecklist(BasePopup):
+    def __init__(self):
+        super().__init__()
+        self.connect_both_devices_option = CheckBox(onboarding_names.connectBothDevicesOption)
+        self.make_sure_you_are_logged_option = CheckBox(onboarding_names.makeSureYouAreLoggedOption)
+        self.disable_the_firewall_option = CheckBox(onboarding_names.disableTheFirewallOption)
+        self.cancel_button = Button(onboarding_names.cancelButton)
+        self.continue_button = Button(onboarding_names.continueButton)
+
+    def complete(self):
+        self.connect_both_devices_option.set(True)
+        self.make_sure_you_are_logged_option.set(True)
+        self.disable_the_firewall_option.set(True)
+        assert self.continue_button.is_enabled
+        self.continue_button.click()

test/e2e/gui/components/onboarding/login_users_list_popup.py

@@ -0,0 +1,28 @@
+import driver
+from gui.components.base_popup import BasePopup
+from gui.elements.button import Button
+from gui.elements.object import QObject
+from gui.objects_map import onboarding_names
+
+
+class OnboardingLoginUsersPopup(BasePopup):
+    def __init__(self):
+        super().__init__()
+        self.user_login_item = QObject(onboarding_names.userLoginItem)
+        self.create_profile_button = Button(onboarding_names.createProfileButton)
+        self.login_button = Button(onboarding_names.returningLoginButton)
+
+    def select_user_by_name(self, user_name):
+        raw_data = driver.findAllObjects(self.user_login_item.real_name)
+        if not raw_data:
+            raise ValueError(f"Can't find {user_name} in list of users as the list is empty")
+        for _user in raw_data:
+            name_label = str(QObject(_user).object.label)
+            if name_label == user_name:
+                try:
+                    QObject(_user).click()
+                    return self
+                except RuntimeError as e:
+                    raise RuntimeError(f'Could not click user with user name "{user_name}": {e}')
+        else:
+            raise ValueError(f'User "{user_name}" was not found')

test/e2e/gui/components/onboarding/share_usage_data_popup.py

@@ -1,18 +1,21 @@
-import allure
-
 from gui.components.base_popup import BasePopup
 from gui.elements.button import Button
 from gui.elements.object import QObject
-from gui.objects_map import names
+from gui.objects_map import names, onboarding_names
 
 
-class ShareUsageDataPopup(QObject):
+# this is old modal shown on relogin
+class ShareUsageDataPopup(BasePopup):
 
     def __init__(self):
-        super().__init__(names.share_usage_data_StatusButton)
-        self._not_now_button = Button(names.not_now_StatusButton )
-        self._share_usage_data_button = Button(names.share_usage_data_StatusButton)
+        super().__init__()
+        self.not_now_button = Button(names.not_now_StatusButton)
+        self.share_usage_data_button = Button(names.share_usage_data_StatusButton)
+
 
-    @allure.step('Click not now button')
-    def skip(self):
-        self._not_now_button.click()
+# this is new modal shown for initial onboarding
+class HelpUsImproveStatusView(QObject):
+    def __init__(self):
+        super().__init__(onboarding_names.helpUsImproveStatusPage)
+        self.share_usage_data_button = Button(onboarding_names.shareUsageDataButton)
+        self.not_now_button = Button(onboarding_names.notNowButton)

test/e2e/gui/components/online_identifier.py

@@ -1,10 +1,7 @@
-import time
-
 import allure
 import pyperclip
 
 import configs
-import constants
 import driver
 from gui.components.profile_popup import ProfilePopup
 from gui.elements.button import Button

test/e2e/gui/components/settings/sync_new_device_popup.py

@@ -15,7 +15,7 @@ def __init__(self):
         self._copy_button = Button(names.copy_SyncCodeStatusButton)
         self._done_button = Button(names.done_SyncCodeStatusButton)
         self._sync_code_field = TextEdit(names.syncCodeInput_StatusPasswordInput)
-        self._close_button = Button(names.close_StatusButton)
+        self._close_button = Button(names.close_SyncCodeStatusFlatRoundButton)
         self._error_message = QObject(names.errorView_SyncingErrorMessage)
 
     @property

test/e2e/gui/components/share_profile_popup.py

@@ -1,7 +1,6 @@
 import allure
 
 import configs
-import driver
 from gui.components.base_popup import BasePopup
 from gui.elements.button import Button
 from gui.elements.object import QObject

test/e2e/gui/components/signing_phrase_popup.py

@@ -1,14 +1,14 @@
 import allure
 
+from gui.components.base_popup import BasePopup
 from gui.elements.button import Button
-from gui.elements.object import QObject
 from gui.objects_map import names
 
 
-class SigningPhrasePopup(QObject):
+class SigningPhrasePopup(BasePopup):
 
     def __init__(self):
-        super().__init__(names.signPhrase_Ok_Button)
+        super().__init__()
         self.ok_got_it_button = Button(names.signPhrase_Ok_Button)
 
     @allure.step('Confirm signing phrase in popup')

test/e2e/gui/components/wallet/asset_context_menu_popup.py

@@ -1,9 +1,7 @@
-import time
+
 
 import allure
 
-import configs
-import driver
 from gui.components.base_popup import BasePopup
 from gui.components.wallet.send_popup import SendPopup
 from gui.elements.object import QObject

test/e2e/gui/components/wallet/bridge_popup.py

@@ -2,7 +2,6 @@
 
 import configs.timeouts
 from gui.components.base_popup import BasePopup
-from gui.elements.button import Button
 from gui.elements.object import QObject
 from gui.objects_map import names
 

test/e2e/gui/components/wallet/popup_delete_account_from_settings.py

@@ -1,13 +1,9 @@
-import allure
-
-import configs
 from gui.components.base_popup import BasePopup
-from gui.elements.button import Button
-from gui.elements.check_box import CheckBox
-from gui.elements.text_label import TextLabel
 from gui.objects_map import names
 from gui.screens.settings_wallet import *
-from gui.elements.object import QObject
+from gui.elements.button import Button
+from gui.elements.text_label import TextLabel
+from gui.elements.check_box import CheckBox
 
 
 class RemoveAccountConfirmationSettings(BasePopup):

test/e2e/gui/components/wallet/send_popup.py

@@ -5,7 +5,7 @@
 
 import configs.timeouts
 import driver
-from driver.objects_access import wait_for_template, walk_children
+from driver.objects_access import walk_children
 from gui.components.base_popup import BasePopup
 from gui.components.wallet.token_selector_popup import TokenSelectorPopup
 from gui.elements.button import Button

test/e2e/gui/components/wallet/testnet_mode_popup.py

@@ -1,5 +1,3 @@
-import allure
-
 from gui.components.base_popup import BasePopup
 from gui.elements.button import Button
 from gui.objects_map import names

test/e2e/gui/components/wallet/token_selector_popup.py

@@ -1,10 +1,4 @@
 import random
-import time
-
-
-import configs
-import driver
-from gui.components.base_popup import BasePopup
 from gui.components.wallet.send_popup import *
 from gui.elements.button import Button
 from gui.elements.object import QObject

test/e2e/gui/components/wallet/wallet_account_popups.py

@@ -1,5 +1,3 @@
-import time
-
 import configs.timeouts
 from constants.wallet import *
 from gui.screens.settings_keycard import KeycardSettingsView

test/e2e/gui/elements/button.py

@@ -1,9 +1,4 @@
 import logging
-import typing
-
-import allure
-
-import driver
 from gui.elements.object import QObject
 
 LOG = logging.getLogger(__name__)

test/e2e/gui/elements/object.py

@@ -6,7 +6,6 @@
 
 import configs
 import driver
-from driver import isFrozen
 from scripts.tools.image import Image
 
 LOG = logging.getLogger(__name__)
@@ -22,10 +21,9 @@ def __init__(self, real_name: [str, dict] = None):
     @allure.step('Get object {0}')
     def object(self):
         try:
-            obj = driver.waitForObject(self.real_name, configs.timeouts.UI_LOAD_TIMEOUT_MSEC)
-        except LookupError:
-            raise LookupError(f"Object {self.real_name} was not found within {configs.timeouts.UI_LOAD_TIMEOUT_MSEC}")
-        return obj
+            return driver.waitForObject(self.real_name, configs.timeouts.UI_LOAD_TIMEOUT_MSEC)
+        except LookupError as e:
+            raise LookupError(f"Object {self.real_name} was not found within {configs.timeouts.UI_LOAD_TIMEOUT_MSEC} ms") from e
 
     def set_text_property(self, text):
         self.object.forceActiveFocus()
@@ -94,8 +92,8 @@ def checkState(self) -> int:
     @allure.step('Get visible {0}')
     def is_visible(self) -> bool:
         try:
-            return driver.waitForObject(self.real_name, 0).visible
-        except (AttributeError, LookupError, RuntimeError):
+            return driver.waitForObject(self.real_name, 200).visible
+        except (LookupError, RuntimeError, AttributeError):
             return False
 
     @property
@@ -178,14 +176,19 @@ def right_click(
 
     @allure.step('Wait until appears {0}')
     def wait_until_appears(self, timeout_msec: int = configs.timeouts.UI_LOAD_TIMEOUT_MSEC):
-        assert driver.waitFor(lambda: self.is_visible, timeout_msec), f'Object {self} is not visible'
+        condition = driver.waitFor(lambda: self.is_visible, timeout_msec)
+        if not condition:
+            raise TimeoutError(f'Object {self} is not visible within {timeout_msec} ms')
         LOG.info('%s: is visible', self)
         return self
 
     @allure.step('Wait until hidden {0}')
     def wait_until_hidden(self, timeout_msec: int = configs.timeouts.UI_LOAD_TIMEOUT_MSEC):
-        assert driver.waitFor(lambda: not self.is_visible, timeout_msec), f'Object {self} is not hidden'
+        condition = driver.waitFor(lambda: not self.is_visible, timeout_msec)
+        if not condition:
+            raise TimeoutError(f'Timeout reached: Object {self} is not hidden within {timeout_msec} ms')
         LOG.info('%s: is hidden', self)
+        return self
 
     @classmethod
     def wait_for(cls, condition, timeout_msec: int = configs.timeouts.UI_LOAD_TIMEOUT_MSEC) -> bool: