fixes tests

Author: pcrespov

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

@@ -16,7 +16,7 @@
 import pytest
 import sqlalchemy as sa
 from aiohttp.test_utils import TestClient
-from common_library.dict_tools import copy_from_dict_ex
+from common_library.dict_tools import copy_from_dict_ex, remap_keys
 from faker import Faker
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, NodeIDStr
@@ -710,7 +710,11 @@ async def test_replace_user_project(
     aiopg_engine: aiopg.sa.engine.Engine,
 ):
     PROJECT_DICT_IGNORE_FIELDS = {"lastChangeDate"}
-    original_project = user_project
+    original_project = remap_keys(
+        user_project,
+        rename={"trashedAt": "trashed"},
+    )
+
     # replace the project with the same should do nothing
     working_project = await db_api.replace_project(
         original_project,

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

@@ -10,6 +10,7 @@
 import aiohttp
 import pytest
 from aiohttp.test_utils import TestClient
+from common_library.dict_tools import remap_keys
 from faker import Faker
 from models_library.projects import ProjectID
 from models_library.projects_nodes import Node
@@ -198,11 +199,13 @@ async def _go(client: TestClient, project_uuid: UUID) -> None:
         project["workbench"] = {node_id: jsonable_encoder(node)}
 
         db: ProjectDBAPI = ProjectDBAPI.get_from_app_context(client.app)
-        project.pop("state")
+        project_db = remap_keys(project, rename={"trashedAt": "trashed"})
+        project_db.pop("state")
+
         await db.replace_project(
-            project,
+            project_db,
             logged_user["id"],
-            project_uuid=project["uuid"],
+            project_uuid=project_db["uuid"],
             product_name="osparc",
         )
 

services/web/server/tests/unit/with_dbs/04/studies_dispatcher/test_studies_dispatcher_studies_access.py

@@ -55,14 +55,16 @@ async def _get_user_projects(client) -> list[ProjectDict]:
 
 def _assert_same_projects(got: dict, expected: dict):
     exclude = {
+        "accessRights",
         "creationDate",
         "lastChangeDate",
         "prjOwner",
+        "trashedAt",
+        "trashedBy",
+        "trashedExplicitly",
+        "ui",
         "uuid",
         "workbench",
-        "accessRights",
-        "ui",
-        "trashedExplicitly",
     }
     for key in expected:
         if key not in exclude: