fixing tests

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/simcore_webserver_groups_fixtures.py

@@ -3,9 +3,9 @@
 # pylint: disable=unused-variable
 """
 
-    Fixtures for groups
+Fixtures for groups
 
-    NOTE: These fixtures are used in integration and unit tests
+NOTE: These fixtures are used in integration and unit tests
 """
 
 
@@ -18,7 +18,7 @@
 from models_library.api_schemas_webserver.groups import GroupGet
 from models_library.groups import GroupsByTypeTuple, StandardGroupCreate
 from models_library.users import UserID
-from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
+from pytest_simcore.helpers.webserver_users import NewUser, UserInfoDict
 from simcore_service_webserver.groups._groups_service import (
     add_user_in_group,
     create_standard_group,

services/web/server/tests/unit/with_dbs/02/test_projects_groups_handlers.py

@@ -13,7 +13,7 @@
     ProjectShareAccepted,
 )
 from pytest_simcore.helpers.assert_checks import assert_status
-from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
+from pytest_simcore.helpers.webserver_users import NewUser, UserInfoDict
 from servicelib.aiohttp import status
 from simcore_service_webserver.db.models import UserRole
 from simcore_service_webserver.projects.models import ProjectDict

services/web/server/tests/unit/with_dbs/02/test_projects_rpc.py

@@ -21,7 +21,7 @@
 from pydantic import ValidationError
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
-from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
+from pytest_simcore.helpers.webserver_users import NewUser, UserInfoDict
 from servicelib.rabbitmq import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.webserver import projects as projects_rpc
 from servicelib.rabbitmq.rpc_interfaces.webserver.errors import (

services/web/server/tests/unit/with_dbs/03/login/conftest.py

@@ -14,7 +14,7 @@
 from models_library.basic_types import IDStr
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
-from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
+from pytest_simcore.helpers.webserver_users import NewUser, UserInfoDict
 from simcore_postgres_database.models.users import users
 from simcore_postgres_database.models.wallets import wallets
 from simcore_service_webserver.login._login_repository_legacy import (

services/web/server/tests/unit/with_dbs/03/login/test_login_preregistration.py

@@ -14,7 +14,7 @@
 from models_library.api_schemas_webserver.auth import AccountRequestInfo
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
-from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
+from pytest_simcore.helpers.webserver_users import NewUser, UserInfoDict
 from servicelib.aiohttp import status
 from simcore_postgres_database.models.users import UserRole
 from simcore_service_webserver.login._constants import MSG_USER_DELETED

services/web/server/tests/unit/with_dbs/03/tags/test_tags.py

@@ -24,8 +24,8 @@
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.postgres_tags import create_tag, delete_tag
-from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
 from pytest_simcore.helpers.webserver_projects import assert_get_same_project
+from pytest_simcore.helpers.webserver_users import NewUser, UserInfoDict
 from servicelib.aiohttp import status
 from simcore_postgres_database.models.tags import tags
 from simcore_service_webserver.db.models import UserRole

services/web/server/tests/unit/with_dbs/03/test_users__preferences_handlers.py

@@ -15,7 +15,7 @@
 from models_library.users import UserID
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
-from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
+from pytest_simcore.helpers.webserver_users import NewUser, UserInfoDict
 from servicelib.aiohttp import status
 from simcore_postgres_database.models.users import UserRole, UserStatus
 from simcore_service_webserver.users._preferences_models import ALL_FRONTEND_PREFERENCES

services/web/server/tests/unit/with_dbs/03/test_users_api.py

@@ -3,7 +3,6 @@
 # pylint: disable=unused-variable
 
 from datetime import datetime, timedelta
-from enum import Enum
 
 import pytest
 from aiohttp.test_utils import TestClient
@@ -14,7 +13,7 @@
 from pydantic import TypeAdapter
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
-from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
+from pytest_simcore.helpers.webserver_users import NewUser, UserInfoDict
 from servicelib.aiohttp import status
 from simcore_postgres_database.models.users import UserStatus
 from simcore_service_webserver.users.api import (
@@ -56,10 +55,7 @@ async def test_reading_a_user(client: TestClient, faker: Faker, user: UserInfoDi
 
     keys = set(got.keys()).intersection(user.keys())
 
-    def _normalize_val(v):
-        return v.value if isinstance(v, Enum) else v
-
-    assert {k: _normalize_val(got[k]) for k in keys} == {k: user[k] for k in keys}
+    assert {k: got[k] for k in keys} == {k: user[k] for k in keys}
 
     user_primary_group_id = got["primary_gid"]
 
@@ -84,7 +80,7 @@ def _normalize_val(v):
     assert got.name == user["name"]
 
     got = await get_user_role(client.app, user_id=user_id)
-    assert _normalize_val(got) == user["role"]
+    assert got == user["role"]
 
     got = await get_user_id_from_gid(client.app, primary_gid=user_primary_group_id)
     assert got == user_id
@@ -100,9 +96,7 @@ async def test_listing_users(client: TestClient, faker: Faker, user: UserInfoDic
     guests = await get_guest_user_ids_and_names(client.app)
     assert not guests
 
-    async with NewUser(
-        user_data={"role": UserRole.GUEST.value}, app=client.app
-    ) as guest:
+    async with NewUser(user_data={"role": UserRole.GUEST}, app=client.app) as guest:
         got = await get_guest_user_ids_and_names(client.app)
         assert (guest["id"], guest["name"]) in TypeAdapter(
             list[tuple[UserID, UserNameID]]

services/web/server/tests/unit/with_dbs/03/test_users_rest_profiles.py

@@ -27,10 +27,9 @@
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
 from pytest_simcore.helpers.webserver_login import (
-    NewUser,
-    UserInfoDict,
     switch_client_session_to,
 )
+from pytest_simcore.helpers.webserver_users import NewUser, UserInfoDict
 from servicelib.aiohttp import status
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
 from simcore_service_webserver.users._preferences_service import (
@@ -143,7 +142,7 @@ async def test_search_users_by_partial_fullname(
     public_user: UserInfoDict,
 ):
     assert client.app
-    assert user_role.value == logged_user["role"]
+    assert user_role == logged_user["role"]
 
     # logged_user has default settings
     assert private_user["id"] != logged_user["id"]
@@ -286,7 +285,7 @@ async def test_get_user_by_group_id(
     private_user: UserInfoDict,
 ):
     assert client.app
-    assert user_role.value == logged_user["role"]
+    assert user_role == logged_user["role"]
 
     assert private_user["id"] != logged_user["id"]
     assert public_user["id"] != logged_user["id"]

services/web/server/tests/unit/with_dbs/03/trash/conftest.py

@@ -19,9 +19,9 @@
 from pytest_simcore.helpers.logging_tools import log_context
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
-from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
 from pytest_simcore.helpers.webserver_parametrizations import MockedStorageSubsystem
 from pytest_simcore.helpers.webserver_projects import NewProject
+from pytest_simcore.helpers.webserver_users import NewUser, UserInfoDict
 from simcore_service_webserver.projects.models import ProjectDict
 
 _logger = logging.getLogger(__name__)