fixing tests

Author: sanderegg

services/web/server/tests/conftest.py

@@ -19,7 +19,10 @@
 from aiohttp.test_utils import TestClient
 from common_library.json_serialization import json_dumps
 from faker import Faker
-from models_library.api_schemas_webserver.projects import ProjectGet
+from models_library.api_schemas_webserver.projects import (
+    ProjectGet,
+    ProjectStateOutputSchema,
+)
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from pytest_mock import MockerFixture
@@ -417,10 +420,9 @@ async def _creator(
         # now check returned is as expected
         if new_project:
             # has project state
-            assert (
-                new_project.get("state", {}).get("shareState", {}).get("locked", False)
-                is False
-            ), "Newly created projects should be unlocked"
+            assert not ProjectStateOutputSchema(
+                **new_project.get("state", {})
+            ).share_state.locked, "Newly created projects should be unlocked"
 
             # updated fields
             assert expected_data["uuid"] != new_project["uuid"]

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

@@ -18,8 +18,8 @@
 from models_library.api_schemas_directorv2.dynamic_services import (
     GetProjectInactivityResponse,
 )
+from models_library.api_schemas_webserver.projects import ProjectStateOutputSchema
 from models_library.products import ProductName
-from models_library.projects_state import ProjectState
 from pydantic import TypeAdapter
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
@@ -171,7 +171,7 @@ async def _assert_get_same_project(
         assert data == {k: project[k] for k in data}
 
         if project_state:
-            assert ProjectState.model_validate(project_state)
+            assert ProjectStateOutputSchema.model_validate(project_state)
 
         if project_permalink:
             assert ProjectPermalink.model_validate(project_permalink)
@@ -209,7 +209,7 @@ async def test_list_projects(
 
         assert got == {k: template_project[k] for k in got}
 
-        assert not ProjectState(
+        assert not ProjectStateOutputSchema(
             **project_state
         ).share_state.locked, "Templates are not locked"
         assert ProjectPermalink.model_validate(project_permalink)
@@ -222,7 +222,7 @@ async def test_list_projects(
 
         assert got == {k: user_project[k] for k in got}
 
-        assert ProjectState(**project_state)
+        assert ProjectStateOutputSchema(**project_state)
         assert project_permalink is None
         assert folder_id is None
 
@@ -238,7 +238,7 @@ async def test_list_projects(
         folder_id = got.pop("folderId")
 
         assert got == {k: user_project[k] for k in got}
-        assert not ProjectState(
+        assert not ProjectStateOutputSchema(
             **project_state
         ).share_state.locked, "Single user does not lock"
         assert project_permalink is None
@@ -256,7 +256,7 @@ async def test_list_projects(
         folder_id = got.pop("folderId")
 
         assert got == {k: template_project[k] for k in got}
-        assert not ProjectState(
+        assert not ProjectStateOutputSchema(
             **project_state
         ).share_state.locked, "Templates are not locked"
         assert ProjectPermalink.model_validate(project_permalink)