Skip to content

Commit 8a5ef3b

Browse files
committed
fix: update login decorators to use new authentication module
1 parent 1b17f5a commit 8a5ef3b

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

services/web/server/tests/unit/isolated/conftest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,19 +241,19 @@ def mocked_login_required(mocker: MockerFixture):
241241
# patches @login_required decorator
242242
# avoids having to start database etc...
243243
mocker.patch(
244-
"simcore_service_webserver.login.decorators.security_web.check_user_authorized",
244+
"simcore_service_webserver.login_auth.decorators.security_web.check_user_authorized",
245245
spec=True,
246246
return_value=user_id,
247247
)
248248

249249
mocker.patch(
250-
"simcore_service_webserver.login.decorators.security_web.check_user_permission",
250+
"simcore_service_webserver.login_auth.decorators.security_web.check_user_permission",
251251
spec=True,
252252
return_value=None,
253253
)
254254

255255
mocker.patch(
256-
"simcore_service_webserver.login.decorators.products_web.get_product_name",
256+
"simcore_service_webserver.login_auth.decorators.products_web.get_product_name",
257257
spec=True,
258258
return_value="osparc",
259259
)

services/web/server/tests/unit/isolated/test_activity.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,14 @@ async def client(
101101
aiohttp_client: Callable[..., Awaitable[TestClient]],
102102
mock_orphaned_services: MagicMock,
103103
app_environment: EnvVarsDict,
104+
mocker: MockerFixture,
104105
):
106+
setup_db_mock = mocker.patch(
107+
"simcore_service_webserver.security.plugin.setup_db",
108+
autospec=True,
109+
return_value=True,
110+
)
111+
105112
# app_environment are in place
106113
assert {key: os.environ[key] for key in app_environment} == app_environment
107114
expected_activity_settings = PrometheusSettings.create_from_envs()
@@ -111,8 +118,13 @@ async def client(
111118
settings = setup_settings(app)
112119
assert expected_activity_settings == settings.WEBSERVER_ACTIVITY
113120

121+
assert not setup_db_mock.called
122+
114123
setup_session(app)
115124
setup_security(app)
125+
126+
assert setup_db_mock.called
127+
116128
setup_rest(app)
117129
assert setup_activity(app)
118130

0 commit comments

Comments
 (0)