Skip to content

Commit 08262d4

Browse files
committed
modifies fixtures to produce projects
1 parent 65af25b commit 08262d4

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

packages/models-library/src/models_library/api_schemas_webserver/projects.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ class ProjectGet(OutputSchema):
106106
model_config = ConfigDict(frozen=False)
107107

108108
@classmethod
109-
def from_model(cls, project: dict[str, Any]) -> Self:
109+
def from_model(cls, project_data: dict[str, Any]) -> Self:
110110
return cls.model_validate(
111111
remap_keys(
112-
project,
112+
project_data,
113113
rename={"trashed": "trashed_at"},
114114
)
115115
)

packages/pytest-simcore/src/pytest_simcore/helpers/webserver_projects.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
from aiohttp import web
1414
from aiohttp.test_utils import TestClient
15+
from common_library.dict_tools import remap_keys
1516
from models_library.projects_nodes_io import NodeID
1617
from models_library.services_resources import ServiceResourcesDictHelpers
1718
from simcore_postgres_database.utils_projects_nodes import ProjectNodeCreate
@@ -113,6 +114,10 @@ async def create_project(
113114
for key in DB_EXCLUSIVE_COLUMNS:
114115
project_data.pop(key, None)
115116

117+
new_project: ProjectDict = remap_keys(
118+
new_project,
119+
rename={"trashed": "trashedAt"},
120+
)
116121
return new_project
117122

118123

@@ -163,6 +168,7 @@ async def __aenter__(self) -> ProjectDict:
163168
default_project_json=self.tests_data_dir / "fake-project.json",
164169
as_template=self.as_template,
165170
)
171+
166172
return self.prj
167173

168174
async def __aexit__(self, *args):

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ async def test_list_projects(
208208
folder_id = got.pop("folderId")
209209

210210
assert got == {k: template_project[k] for k in got}
211+
211212
assert not ProjectState(
212213
**project_state
213214
).locked.value, "Templates are not locked"
@@ -220,6 +221,7 @@ async def test_list_projects(
220221
folder_id = got.pop("folderId")
221222

222223
assert got == {k: user_project[k] for k in got}
224+
223225
assert ProjectState(**project_state)
224226
assert project_permalink is None
225227
assert folder_id is None

0 commit comments

Comments
 (0)