Skip to content

Commit 154fc42

Browse files
committed
chore(@e2e): do not use native object for main window
1 parent ad0f1c7 commit 154fc42

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

test/e2e/driver/toplevel_window.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
def maximize(object_name):
88
def _maximize() -> bool:
99
try:
10-
window = toplevelwindow.ToplevelWindow.byName(object_name)
11-
squish.setWindowState(window.nativeObject, squish.WindowState.Maximize)
10+
window = toplevelwindow.ToplevelWindow.byName(object_name).window
11+
squish.setWindowState(window, squish.WindowState.Maximize)
1212
return True
1313
except RuntimeError:
1414
return False
@@ -19,8 +19,8 @@ def _maximize() -> bool:
1919
def minimize(object_name):
2020
def _minimize() -> bool:
2121
try:
22-
window = toplevelwindow.ToplevelWindow.byName(object_name)
23-
squish.setWindowState(window.nativeObject, squish.WindowState.Minimize)
22+
window = toplevelwindow.ToplevelWindow.byName(object_name).window
23+
squish.setWindowState(window, squish.WindowState.Minimize)
2424
return True
2525
except RuntimeError:
2626
return False

test/e2e/gui/elements/window.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ class Window(QObject):
1313

1414
def prepare(self) -> 'Window':
1515
self.maximize()
16-
self.on_top_level()
16+
self.set_focus()
17+
# self.on_top_level()
1718
return self
1819

1920
@property

test/e2e/tests/communities/test_communities_kick_ban.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import time
22

3-
import allure
43
import pytest
54
from allure_commons._allure import step
65

76
import driver
8-
from configs import get_platform
97
from constants import UserAccount, RandomUser, RandomCommunity, CommunityData
108
from constants.community import ToastMessages
119
from gui.screens.community import MembersListPanel
@@ -17,7 +15,7 @@
1715

1816
@pytest.mark.case(703252, 703252, 736991)
1917
@pytest.mark.communities
20-
@pytest.mark.skipif(get_platform() != 'Windows', reason='Does not work on Linux anymore, needs investigation')
18+
# TODO: investigate the reason of failures on CI https://github.com/status-im/status-desktop/issues/19284
2119
def test_community_admin_ban_kick_member_and_delete_message(multiple_instances):
2220
user_one: UserAccount = RandomUser()
2321
user_two: UserAccount = RandomUser()
@@ -32,9 +30,11 @@ def test_community_admin_ban_kick_member_and_delete_message(multiple_instances):
3230

3331
with step(f'User {user_two.name}, get chat key'):
3432
chat_key = get_chat_key(aut_two, main_screen)
33+
main_screen.minimize()
3534

3635
with step(f'User {user_one.name}, send contact request to {user_two.name}'):
3736
send_contact_request_from_settings(aut_one, main_screen, chat_key, f'Hello {user_two.name}')
37+
main_screen.minimize()
3838

3939
with step(f'User {user_two.name}, accept contact request from {user_one.name}'):
4040
accept_contact_request_from_settings(aut_two, main_screen, user_one.name)
@@ -44,7 +44,7 @@ def test_community_admin_ban_kick_member_and_delete_message(multiple_instances):
4444
community_screen = main_screen.left_panel.select_community(community.name)
4545
add_members = community_screen.left_panel.open_add_members_popup()
4646
add_members.invite([user_one.name], message=random_text_message())
47-
main_screen.hide()
47+
main_screen.minimize()
4848

4949

5050
with step(f'User {user_one.name}, accept invitation from {user_two.name}'):
@@ -62,7 +62,7 @@ def test_community_admin_ban_kick_member_and_delete_message(multiple_instances):
6262
welcome_popup.join().authenticate(user_one.password)
6363
assert driver.waitFor(lambda: not community_screen.left_panel.is_join_community_visible,
6464
10000), 'Join community button not hidden'
65-
main_screen.hide()
65+
main_screen.minimize()
6666

6767
with step(f'User {user_two.name}, ban {user_one.name} from the community'):
6868
switch_to_aut(aut_two, main_screen)
@@ -82,7 +82,7 @@ def test_community_admin_ban_kick_member_and_delete_message(multiple_instances):
8282
with step(f'User {user_two.name}, see {user_one.name} in banned members list'):
8383
community_screen.right_panel.click_banned_button()
8484
assert driver.waitFor(lambda: user_one.name not in members_list, timeout)
85-
main_screen.hide()
85+
main_screen.minimize()
8686

8787
with step(f'User {user_one.name} tries to join community when being banned by {user_two.name}'):
8888
switch_to_aut(aut_one, main_screen)
@@ -92,7 +92,7 @@ def test_community_admin_ban_kick_member_and_delete_message(multiple_instances):
9292
assert banned_community_screen.banned_title() == f"You've been banned from {community.name}"
9393
main_screen.left_panel.open_community_context_menu(community.name).leave_community_option.click()
9494
# TODO: think of better check here assert not main_screen.left_panel.communities()
95-
main_screen.hide()
95+
main_screen.minimize()
9696

9797

9898
with step(f'User {user_two.name}, unban {user_one.name} in banned members list'):
@@ -101,7 +101,7 @@ def test_community_admin_ban_kick_member_and_delete_message(multiple_instances):
101101
# toast_messages = main_screen.wait_for_toast_notifications()
102102
# assert user_one.name + ToastMessages.UNBANNED_USER_TOAST.value + community.name in toast_messages, \
103103
# f"{user_one.name + ToastMessages.UNBANNED_USER_TOAST.value + community.name} is not found in {toast_messages}"
104-
main_screen.hide()
104+
main_screen.minimize()
105105

106106
with step(f'User {user_one.name} joins community again'):
107107
switch_to_aut(aut_one, main_screen)
@@ -121,7 +121,7 @@ def test_community_admin_ban_kick_member_and_delete_message(multiple_instances):
121121
welcome_popup.join().authenticate(user_one.password)
122122
assert driver.waitFor(lambda: not community_screen.left_panel.is_join_community_visible,
123123
10000), 'Join community button not hidden'
124-
main_screen.hide()
124+
main_screen.minimize()
125125

126126
with step(f'User {user_two.name}, kick {user_one.name} from the community'):
127127
switch_to_aut(aut_two, main_screen)
@@ -136,7 +136,7 @@ def test_community_admin_ban_kick_member_and_delete_message(multiple_instances):
136136

137137
with step(f'User {user_two.name}, does not see {user_one.name} in members list'):
138138
assert driver.waitFor(lambda: user_one.name not in community_screen.right_panel.members, timeout)
139-
main_screen.hide()
139+
main_screen.minimize()
140140

141141
with step(f'User {user_one.name} can rejoin community after being kicked'):
142142
switch_to_aut(aut_one, main_screen)

test/e2e/tests/crtitical_tests_prs/test_create_edit_join_community_pin_unpin_message.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,15 +170,15 @@ def test_create_edit_join_community_pin_unpin_message(multiple_instances):
170170
with step(f'Hover message {second_message_text} and pin it'):
171171
message = messages_screen.chat.find_message_by_text(second_message_text, 0)
172172
message.hover_message().pin_message()
173-
main_screen.minimize()
173+
174174

175175
with step(f'User {user_one.name} see the {second_message_text} as pinned'):
176176
switch_to_aut(aut_one, main_screen)
177177
message = messages_screen.chat.find_message_by_text(second_message_text, 1)
178178
assert driver.waitFor(lambda: message.message_is_pinned, configs.timeouts.APP_LOAD_TIMEOUT_MSEC)
179179
assert message.pinned_info_text + message.user_name_in_pinned_message == 'Pinned by' + user_two.name
180180
assert message.get_message_color() == ColorCodes.ORANGE.value
181-
main_screen.minimize()
181+
182182

183183
with step(f'User {user_two.name} unpin message from pinned messages popup'):
184184
switch_to_aut(aut_two, main_screen)

test/e2e/tests/crtitical_tests_prs/test_messaging_1x1_chat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def test_1x1_chat_add_contact_in_settings(multiple_instances):
138138
f"Message text is not found in last message"
139139
assert message_object.delegate_button.object.isEdited, \
140140
f"Message status was not changed to edited"
141-
main_window.minimize()
141+
142142

143143
with step(f'User {user_two.name} opens 1x1 chat with {user_one.name}'):
144144
switch_to_aut(aut_two, main_window)

0 commit comments

Comments
 (0)