|
12 | 12 | import pytest |
13 | 13 | from aiohttp.test_utils import TestClient |
14 | 14 | from faker import Faker |
| 15 | +from models_library.groups import AccessRightsDict |
15 | 16 | from pytest_simcore.helpers.assert_checks import assert_status |
16 | 17 | from pytest_simcore.helpers.webserver_login import LoggedUser, NewUser, UserInfoDict |
17 | 18 | from pytest_simcore.helpers.webserver_parametrizations import ( |
|
25 | 26 | from simcore_service_webserver._meta import API_VTAG |
26 | 27 | from simcore_service_webserver.application_settings import setup_settings |
27 | 28 | from simcore_service_webserver.db.plugin import setup_db |
28 | | -from simcore_service_webserver.groups._common.types import AccessRightsDict |
29 | 29 | from simcore_service_webserver.groups._groups_db import ( |
30 | 30 | _DEFAULT_GROUP_OWNER_ACCESS_RIGHTS, |
31 | 31 | _DEFAULT_GROUP_READ_ACCESS_RIGHTS, |
@@ -62,9 +62,7 @@ def client( |
62 | 62 | # fake config |
63 | 63 | app = create_safe_application(cfg) |
64 | 64 |
|
65 | | - settings = setup_settings(app) |
66 | | - print(settings.model_dump_json(indent=1)) |
67 | | - |
| 65 | + setup_settings(app) |
68 | 66 | setup_db(app) |
69 | 67 | setup_session(app) |
70 | 68 | setup_security(app) |
@@ -92,9 +90,9 @@ def _assert__group_user( |
92 | 90 | actual_user: dict, |
93 | 91 | ): |
94 | 92 | assert "first_name" in actual_user |
95 | | - assert actual_user["first_name"] == expected_user["first_name"] |
| 93 | + assert actual_user["first_name"] == expected_user.get("first_name") |
96 | 94 | assert "last_name" in actual_user |
97 | | - assert actual_user["last_name"] == expected_user["last_name"] |
| 95 | + assert actual_user["last_name"] == expected_user.get("last_name") |
98 | 96 | assert "login" in actual_user |
99 | 97 | assert actual_user["login"] == expected_user["email"] |
100 | 98 | assert "gravatar_id" in actual_user |
|
0 commit comments