updates tests

Author: pcrespov

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

@@ -165,7 +165,7 @@ async def _assert_get_same_project(
         project_permalink = data.pop("permalink", None)
         folder_id = data.pop("folderId", None)
 
-        assert data == project
+        assert data == {k: project[k] for k in data}
 
         if project_state:
             assert parse_obj_as(ProjectState, project_state)
@@ -201,22 +201,24 @@ async def test_list_projects(
         assert len(data) == 2
 
         # template project
-        project_state = data[0].pop("state")
-        project_permalink = data[0].pop("permalink")
-        folder_id = data[0].pop("folderId")
+        got = data[0]
+        project_state = got.pop("state")
+        project_permalink = got.pop("permalink")
+        folder_id = got.pop("folderId")
 
-        assert data[0] == template_project
+        assert got == {k: template_project[k] for k in got}
         assert not ProjectState(
             **project_state
         ).locked.value, "Templates are not locked"
         assert parse_obj_as(ProjectPermalink, project_permalink)
 
         # standard project
-        project_state = data[1].pop("state")
-        project_permalink = data[1].pop("permalink", None)
-        folder_id = data[1].pop("folderId")
+        got = data[1]
+        project_state = got.pop("state")
+        project_permalink = got.pop("permalink", None)
+        folder_id = got.pop("folderId")
 
-        assert data[1] == user_project
+        assert got == {k: user_project[k] for k in got}
         assert ProjectState(**project_state)
         assert project_permalink is None
         assert folder_id is None
@@ -227,11 +229,12 @@ async def test_list_projects(
         assert len(data) == 1
 
         # standad project
-        project_state = data[0].pop("state")
-        project_permalink = data[0].pop("permalink", None)
-        folder_id = data[0].pop("folderId")
+        got = data[0]
+        project_state = got.pop("state")
+        project_permalink = got.pop("permalink", None)
+        folder_id = got.pop("folderId")
 
-        assert data[0] == user_project
+        assert got == {k: user_project[k] for k in got}
         assert not ProjectState(
             **project_state
         ).locked.value, "Single user does not lock"
@@ -244,11 +247,12 @@ async def test_list_projects(
         assert len(data) == 1
 
         # template project
-        project_state = data[0].pop("state")
-        project_permalink = data[0].pop("permalink")
-        folder_id = data[0].pop("folderId")
+        got = data[0]
+        project_state = got.pop("state")
+        project_permalink = got.pop("permalink")
+        folder_id = got.pop("folderId")
 
-        assert data[0] == template_project
+        assert got == {k: template_project[k] for k in got}
         assert not ProjectState(
             **project_state
         ).locked.value, "Templates are not locked"

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

@@ -98,6 +98,7 @@ def _assert_added_project(
         "lastChangeDate",
         "accessRights",  # NOTE: access rights were moved away from the projects table
         "trashedAt",
+        "trashedExplicitly",
     ]
     assert {k: v for k, v in expected_prj.items() if k in _DIFFERENT_KEYS} != {
         k: v for k, v in added_prj.items() if k in _DIFFERENT_KEYS