Skip to content

Commit 8eaf2b9

Browse files
committed
fixes tsets
1 parent 5a3b6c3 commit 8eaf2b9

File tree

1 file changed

+26
-14
lines changed

1 file changed

+26
-14
lines changed

services/web/server/tests/unit/with_dbs/01/groups/test_groups_handlers_users.py

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -236,23 +236,28 @@ async def test_add_remove_users_from_group(
236236
"delete": False,
237237
}
238238
for i in range(num_new_users):
239-
update_group_user_url = client.app.router["update_group_user"].url_for(
240-
gid=f"{assigned_group['gid']}", uid=f"{created_users_list[i]['id']}"
239+
group_id = assigned_group["gid"]
240+
user_id = created_users_list[i]["id"]
241+
is_private = created_users_list[i].get("is_private", False)
242+
243+
url = client.app.router["update_group_user"].url_for(
244+
gid=f"{group_id}", uid=f"{user_id}"
241245
)
242246
resp = await client.patch(
243-
f"{update_group_user_url}", json={"accessRights": MANAGER_ACCESS_RIGHTS}
247+
f"{url}", json={"accessRights": MANAGER_ACCESS_RIGHTS}
244248
)
245249
data, error = await assert_status(resp, expected.ok)
246250
if not error:
247251
_assert__group_user(
248252
created_users_list[i],
249253
MANAGER_ACCESS_RIGHTS,
250254
data,
251-
group_owner_id=the_owner["id"],
255+
group_owner_id=the_owner["id"] if is_private else user_id,
252256
)
257+
253258
# check it is there
254259
url = client.app.router["get_group_user"].url_for(
255-
gid=f"{assigned_group['gid']}", uid=f"{created_users_list[i]['id']}"
260+
gid=f"{group_id}", uid=f"{user_id}"
256261
)
257262
resp = await client.get(f"{url}")
258263
data, error = await assert_status(resp, expected.ok)
@@ -261,21 +266,23 @@ async def test_add_remove_users_from_group(
261266
created_users_list[i],
262267
MANAGER_ACCESS_RIGHTS,
263268
data,
264-
group_owner_id=the_owner["id"],
269+
group_owner_id=the_owner["id"] if is_private else user_id,
265270
)
271+
266272
# remove the user from the group
267-
delete_group_user_url = client.app.router["delete_group_user"].url_for(
268-
gid=f"{assigned_group['gid']}", uid=f"{created_users_list[i]['id']}"
273+
url = client.app.router["delete_group_user"].url_for(
274+
gid=f"{group_id}", uid=f"{user_id}"
269275
)
270-
resp = await client.delete(f"{delete_group_user_url}")
276+
resp = await client.delete(f"{url}")
271277
data, error = await assert_status(resp, expected.no_content)
278+
272279
# do it again to check it is not found anymore
273-
resp = await client.delete(f"{delete_group_user_url}")
280+
resp = await client.delete(f"{url}")
274281
data, error = await assert_status(resp, expected.not_found)
275282

276283
# check it is not there anymore
277284
url = client.app.router["get_group_user"].url_for(
278-
gid=f"{assigned_group['gid']}", uid=f"{created_users_list[i]['id']}"
285+
gid=f"{group_id}", uid=f"{user_id}"
279286
)
280287
resp = await client.get(f"{url}")
281288
data, error = await assert_status(resp, expected.not_found)
@@ -435,7 +442,11 @@ async def test_add_user_gets_added_to_group(
435442
user = await users_stack.enter_async_context(
436443
LoggedUser(
437444
client,
438-
user_data={"role": user_role.name, "email": email},
445+
user_data={
446+
"role": user_role.name,
447+
"email": email,
448+
"privacy_hide_email": False,
449+
},
439450
check_if_succeeds=user_role != UserRole.ANONYMOUS,
440451
)
441452
)
@@ -495,15 +506,16 @@ async def test_adding_user_to_group_with_upper_case_email(
495506
# adding a user to group with the email in capital letters
496507
# Tests 🐛 https://github.com/ITISFoundation/osparc-issues/issues/812
497508
async with NewUser(
498-
app=client.app,
509+
app=client.app, user_data={"privacy_hide_email": False}
499510
) as registered_user:
500511
assert registered_user["email"] # <--- this email is lower case
501512

502513
response = await client.post(
503514
f"{url}",
504515
json={
516+
# <--- email in upper case
505517
"email": registered_user["email"].upper()
506-
}, # <--- email in upper case
518+
},
507519
)
508520
data, error = await assert_status(response, status.HTTP_204_NO_CONTENT)
509521

0 commit comments

Comments
 (0)