Merge branch 'master' into chore/fix_false_positive_test

This commit is contained in:
Anastasiya 2024-02-27 11:21:04 +03:00 committed by GitHub
commit d4e12ba146
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 17 additions and 20 deletions

2
ci/Jenkinsfile vendored
View File

@ -66,8 +66,6 @@ pipeline {
} }
environment { environment {
QT_QPA_PLATFORMTHEME = 'qt5ct'
SQUISH_DIR = '/opt/squish-runner-7.2.1' SQUISH_DIR = '/opt/squish-runner-7.2.1'
PYTHONPATH = "${SQUISH_DIR}/lib:${SQUISH_DIR}/lib/python:${PYTHONPATH}" PYTHONPATH = "${SQUISH_DIR}/lib:${SQUISH_DIR}/lib/python:${PYTHONPATH}"
LD_LIBRARY_PATH = "${SQUISH_DIR}/lib:${SQUISH_DIR}/python3/lib:${LD_LIBRARY_PATH}" LD_LIBRARY_PATH = "${SQUISH_DIR}/lib:${SQUISH_DIR}/python3/lib:${LD_LIBRARY_PATH}"

View File

@ -37,18 +37,18 @@ class WalletNetworkNaming(Enum):
LAYER2_OPTIMISIM = 'Optimism' LAYER2_OPTIMISIM = 'Optimism'
LAYER2_ARBITRUM = 'Arbitrum' LAYER2_ARBITRUM = 'Arbitrum'
ETHEREUM_MAINNET_NETWORK_ID = 1 ETHEREUM_MAINNET_NETWORK_ID = 1
ETHEREUM_GOERLI_NETWORK_ID = 5 ETHEREUM_SEPOLIA_NETWORK_ID = 11155111
OPTIMISM_MAINNET_NETWORK_ID = 10 OPTIMISM_MAINNET_NETWORK_ID = 10
OPTIMISM_GOERLI_NETWORK_ID = 420 OPTIMISM_SEPOLIA_NETWORK_ID = 11155420
ARBITRUM_MAINNET_NETWORK_ID = 42161 ARBITRUM_MAINNET_NETWORK_ID = 42161
ARBITRUM_GOERLI_NETWORK_ID = 421613 ARBITRUM_SEPOLIA_NETWORK_ID = 421614
class WalletNetworkDefaultValues(Enum): class WalletNetworkDefaultValues(Enum):
ETHEREUM_LIVE_MAIN = 'https://eth-archival.rpc.grove.city' ETHEREUM_LIVE_MAIN = 'https://eth-archival.rpc.grove.city'
ETHEREUM_TEST_MAIN = 'https://goerli-archival.rpc.grove.city' ETHEREUM_TEST_MAIN = 'https://sepolia-archival.rpc.grove.city'
ETHEREUM_LIVE_FAILOVER = 'https://mainnet.infura.io' ETHEREUM_LIVE_FAILOVER = 'https://mainnet.infura.io'
ETHEREUM_TEST_FAILOVER = 'https://goerli.infura.io' ETHEREUM_TEST_FAILOVER = 'https://sepolia.infura.io'
class WalletEditNetworkErrorMessages(Enum): class WalletEditNetworkErrorMessages(Enum):

View File

@ -236,7 +236,7 @@ class NetworkWalletSettings(WalletSettingsView):
def get_network_item_attribute_by_id_and_attr_name(self, attribute_name, network_id): def get_network_item_attribute_by_id_and_attr_name(self, attribute_name, network_id):
self._wallet_network_item_template.real_name['objectName'] = RegularExpression( self._wallet_network_item_template.real_name['objectName'] = RegularExpression(
f'walletNetworkDelegate_.*_{network_id}') f'walletNetworkDelegate_.*_{network_id}')
return getattr(self._wallet_network_item_template.object, attribute_name) return str(getattr(self._wallet_network_item_template.object, attribute_name))
@allure.step('Open network to check the details') @allure.step('Open network to check the details')
def click_network_item_to_open_edit_view(self, network_id): def click_network_item_to_open_edit_view(self, network_id):

View File

@ -16,12 +16,11 @@ pytestmark = marks
@allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703051', 'Delete community channel') @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703051', 'Delete community channel')
@pytest.mark.case(703049, 703050, 703051) @pytest.mark.case(703049, 703050, 703051)
@pytest.mark.parametrize( @pytest.mark.parametrize(
'channel_name, channel_description, channel_emoji, channel_emoji_image, channel_color, new_channel_name, new_channel_description, new_channel_emoji, new_channel_emoji_image', 'channel_name, channel_description, channel_emoji, channel_emoji_image, channel_color, new_channel_name, new_channel_description, new_channel_emoji',
[('Channel', 'Description', 'sunglasses', '😎', '#4360df', 'New-channel', 'New channel description', 'thumbsup', '👍 ')]) [('Channel', 'Description', 'sunglasses', None, '#4360df', 'New-channel', 'New channel description', 'thumbsup')])
@pytest.mark.critical # @pytest.mark.critical TODO: https://github.com/status-im/desktop-qa-automation/issues/535
def test_create_edit_remove_community_channel(main_screen, channel_name, channel_description, channel_emoji, def test_create_edit_remove_community_channel(main_screen, channel_name, channel_description, channel_emoji, channel_emoji_image,
channel_emoji_image, channel_color, new_channel_name, channel_color, new_channel_name, new_channel_description, new_channel_emoji):
new_channel_description, new_channel_emoji, new_channel_emoji_image):
with step('Create simple community'): with step('Create simple community'):
community_params = constants.community_params community_params = constants.community_params
main_screen.create_community(community_params['name'], community_params['description'], main_screen.create_community(community_params['name'], community_params['description'],

View File

@ -61,13 +61,13 @@ def test_check_password_strength_and_login(keys_screen, main_window, user_accoun
assert create_password_view.get_password_from_first_field(0) == expected_password assert create_password_view.get_password_from_first_field(0) == expected_password
create_password_view.click_hide_icon(0) create_password_view.click_hide_icon(0)
assert create_password_view.get_password_from_first_field(2) == '●●●●●●●●●●' assert create_password_view.get_password_from_first_field(2) == '••••••••••'
create_password_view.click_show_icon(1) create_password_view.click_show_icon(1)
assert create_password_view.get_password_from_confirmation_field(0) == expected_password assert create_password_view.get_password_from_confirmation_field(0) == expected_password
create_password_view.click_hide_icon(0) create_password_view.click_hide_icon(0)
assert create_password_view.get_password_from_confirmation_field(2) == '●●●●●●●●●●' assert create_password_view.get_password_from_confirmation_field(2) == '••••••••••'
with step('Confirm creation of password and set password in confirmation again field'): with step('Confirm creation of password and set password in confirmation again field'):
confirm_password_view = create_password_view.click_create_password() confirm_password_view = create_password_view.click_create_password()
@ -82,4 +82,4 @@ def test_check_password_strength_and_login(keys_screen, main_window, user_accoun
with step('Click show icon to hide password and check that there are dots instead'): with step('Click show icon to hide password and check that there are dots instead'):
create_password_view.click_hide_icon(0) create_password_view.click_hide_icon(0)
assert confirm_password_view.get_password_from_confirmation_again_field(2) == '●●●●●●●●●●' assert confirm_password_view.get_password_from_confirmation_again_field(2) == '••••••••••'

View File

@ -41,11 +41,11 @@ def test_switch_testnet_mode(main_screen: MainWindow):
with step('Verify networks are switched to testnets'): with step('Verify networks are switched to testnets'):
assert networks.get_network_item_attribute_by_id_and_attr_name('title', assert networks.get_network_item_attribute_by_id_and_attr_name('title',
WalletNetworkNaming.ETHEREUM_GOERLI_NETWORK_ID.value) == WalletNetworkNaming.LAYER1_ETHEREUM.value WalletNetworkNaming.ETHEREUM_SEPOLIA_NETWORK_ID.value) == WalletNetworkNaming.LAYER1_ETHEREUM.value
assert networks.get_network_item_attribute_by_id_and_attr_name('title', assert networks.get_network_item_attribute_by_id_and_attr_name('title',
WalletNetworkNaming.OPTIMISM_GOERLI_NETWORK_ID.value) == WalletNetworkNaming.LAYER2_OPTIMISIM.value WalletNetworkNaming.OPTIMISM_SEPOLIA_NETWORK_ID.value) == WalletNetworkNaming.LAYER2_OPTIMISIM.value
assert networks.get_network_item_attribute_by_id_and_attr_name('title', assert networks.get_network_item_attribute_by_id_and_attr_name('title',
WalletNetworkNaming.ARBITRUM_GOERLI_NETWORK_ID.value) == WalletNetworkNaming.LAYER2_ARBITRUM.value WalletNetworkNaming.ARBITRUM_SEPOLIA_NETWORK_ID.value) == WalletNetworkNaming.LAYER2_ARBITRUM.value
# TODO: add verificatin for test net label # TODO: add verificatin for test net label
with step('Turn off Testnet mode in wallet settings'): with step('Turn off Testnet mode in wallet settings'):