fixes fixtures

Author: pcrespov

services/api-server/tests/unit/_with_db/test_api_user.py

@@ -19,7 +19,7 @@
 
 
 @pytest.fixture
-def mocked_webserver_service_api(app: FastAPI):
+def mocked_webserver_rest_api(app: FastAPI):
     """Mocks some responses of web-server service"""
 
     settings: ApplicationSettings = app.state.settings
@@ -54,8 +54,8 @@ def _update_me(request: httpx.Request):
 async def test_get_profile(
     client: httpx.AsyncClient,
     auth: httpx.BasicAuth,
-    mocked_webserver_service_api: MockRouter,
-    mocked_rpc_webserver_service_api: dict[str, MockType],
+    mocked_webserver_rest_api: MockRouter,
+    mocked_webserver_rpc_api: dict[str, MockType],
 ):
     # needs no auth
     resp = await client.get(f"/{API_VTAG}/meta")
@@ -64,11 +64,11 @@ async def test_get_profile(
     # needs auth
     resp = await client.get(f"/{API_VTAG}/me")
     assert resp.status_code == status.HTTP_401_UNAUTHORIZED
-    assert not mocked_webserver_service_api["get_me"].called
+    assert not mocked_webserver_rest_api["get_me"].called
 
     resp = await client.get(f"/{API_VTAG}/me", auth=auth)
     assert resp.status_code == status.HTTP_200_OK
-    assert mocked_webserver_service_api["get_me"].called
+    assert mocked_webserver_rest_api["get_me"].called
 
     profile = Profile(**resp.json())
     assert profile.first_name == "James"
@@ -78,8 +78,8 @@ async def test_get_profile(
 async def test_update_profile(
     client: httpx.AsyncClient,
     auth: httpx.BasicAuth,
-    mocked_webserver_service_api: MockRouter,
-    mocked_rpc_webserver_service_api: dict[str, MockType],
+    mocked_webserver_rest_api: MockRouter,
+    mocked_webserver_rpc_api: dict[str, MockType],
 ):
     # needs auth
     resp = await client.put(

services/api-server/tests/unit/test_api__study_workflows.py

@@ -14,10 +14,10 @@
 
 import httpx
 import pytest
+import respx
 from fastapi.encoders import jsonable_encoder
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.httpx_calls_capture_models import CreateRespxMockCallback
-from respx import MockRouter
 from simcore_sdk.node_ports_common.filemanager import UploadedFile
 from simcore_service_api_server._meta import API_VTAG
 from simcore_service_api_server.models.pagination import OnePage
@@ -196,17 +196,18 @@ def test_py_path(tmp_path: Path) -> Path:
 
 
 class MockedBackendApiDict(TypedDict):
-    webserver: MockRouter | None
-    storage: MockRouter | None
-    director_v2: MockRouter | None
+    webserver: respx.MockRouter | None
+    storage: respx.MockRouter | None
+    director_v2: respx.MockRouter | None
 
 
 @pytest.fixture
 def mocked_backend(
     project_tests_dir: Path,
-    mocked_webserver_rest_api_base: MockRouter,
-    mocked_storage_rest_api_base: MockRouter,
-    mocked_directorv2_rest_api_base: MockRouter,
+    mocked_webserver_rest_api_base: respx.MockRouter,
+    mocked_webserver_rpc_api: respx.MockRouter,
+    mocked_storage_rest_api_base: respx.MockRouter,
+    mocked_directorv2_rest_api_base: respx.MockRouter,
     create_respx_mock_from_capture: CreateRespxMockCallback,
     mocker: MockerFixture,
 ) -> MockedBackendApiDict: