Skip to content

Commit ad1dd58

Browse files
committed
updates app_environemnt
1 parent 7d17535 commit ad1dd58

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

services/web/server/src/simcore_service_webserver/folders/_trash_handlers.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
)
99

1010
from .._meta import API_VTAG as VTAG
11+
from ..application_settings_utils import requires_dev_feature_enabled
1112
from ..login.decorators import get_user_id, login_required
1213
from ..products.api import get_product_name
1314
from ..security.decorators import permission_required
@@ -22,6 +23,7 @@
2223

2324

2425
@routes.post(f"/{VTAG}/folders/{{folder_id}}:trash", name="trash_folder")
26+
@requires_dev_feature_enabled
2527
@login_required
2628
@permission_required("folder.delete")
2729
@handle_plugin_requests_exceptions
@@ -45,6 +47,7 @@ async def trash_folder(request: web.Request):
4547

4648

4749
@routes.post(f"/{VTAG}/folders/{{folder_id}}:untrash", name="untrash_folder")
50+
@requires_dev_feature_enabled
4851
@login_required
4952
@permission_required("folder.delete")
5053
@handle_plugin_requests_exceptions

services/web/server/src/simcore_service_webserver/projects/_trash_handlers.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
)
99

1010
from .._meta import API_VTAG as VTAG
11+
from ..application_settings_utils import requires_dev_feature_enabled
1112
from ..exceptions_handlers import (
1213
ExceptionToHttpErrorMap,
1314
HttpErrorInfo,
@@ -57,6 +58,7 @@
5758

5859

5960
@routes.delete(f"/{VTAG}/trash", name="empty_trash")
61+
@requires_dev_feature_enabled
6062
@login_required
6163
@permission_required("project.delete")
6264
@_handle_exceptions
@@ -72,6 +74,7 @@ async def empty_trash(request: web.Request):
7274

7375

7476
@routes.post(f"/{VTAG}/projects/{{project_id}}:trash", name="trash_project")
77+
@requires_dev_feature_enabled
7578
@login_required
7679
@permission_required("project.delete")
7780
@_handle_exceptions
@@ -95,6 +98,7 @@ async def trash_project(request: web.Request):
9598

9699

97100
@routes.post(f"/{VTAG}/projects/{{project_id}}:untrash", name="untrash_project")
101+
@requires_dev_feature_enabled
98102
@login_required
99103
@permission_required("project.delete")
100104
@_handle_exceptions

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,23 @@
1818
from models_library.rest_pagination import Page
1919
from pytest_mock import MockerFixture
2020
from pytest_simcore.helpers.assert_checks import assert_status
21+
from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
22+
from pytest_simcore.helpers.typing_env import EnvVarsDict
2123
from pytest_simcore.helpers.webserver_login import UserInfoDict
2224
from servicelib.aiohttp import status
2325
from simcore_service_webserver.db.models import UserRole
2426
from simcore_service_webserver.projects.models import ProjectDict
2527

2628

29+
@pytest.fixture
30+
def app_environment(
31+
app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch
32+
) -> EnvVarsDict:
33+
return app_environment | setenvs_from_dict(
34+
monkeypatch, {"WEBSERVER_DEV_FEATURES_ENABLED": "1"}
35+
)
36+
37+
2738
@pytest.fixture
2839
def user_role() -> UserRole:
2940
return UserRole.USER

0 commit comments

Comments
 (0)