🐛 Fix service access URL in tests and add fixture for empty project

Author: pcrespov

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

@@ -4,8 +4,10 @@
 # pylint: disable=unused-variable
 # type: ignore
 
+from collections.abc import AsyncIterator
 from copy import deepcopy
 from http import HTTPStatus
+from pathlib import Path
 from typing import Any
 
 import pytest
@@ -17,16 +19,14 @@
     MyServiceGet,
     MyServicesRpcBatchGet,
 )
-from models_library.api_schemas_webserver.projects import ProjectPatch
-from models_library.products import ProductName
 from models_library.services_history import ServiceRelease
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
+from pytest_simcore.helpers.webserver_projects import NewProject
 from pytest_simcore.helpers.webserver_users import UserInfoDict
 from servicelib.aiohttp import status
 from servicelib.rabbitmq import RPCServerError
 from simcore_service_webserver.db.models import UserRole
-from simcore_service_webserver.projects import _projects_service
 from simcore_service_webserver.projects.models import ProjectDict
 from yarl import URL
 
@@ -337,7 +337,7 @@ async def test_accessible_for_one_service(
     expected_url = client.app.router["get_project_services_access_for_gid"].url_for(
         project_id=project_id
     )
-    assert URL(f"/v0/projects/{project_id}/nodes/-/services") == expected_url
+    assert URL(f"/v0/projects/{project_id}/nodes/-/services:access") == expected_url
 
     resp = await client.get(
         f"/v0/projects/{project_id}/nodes/-/services:access?for_gid={for_gid}"
@@ -595,28 +595,41 @@ async def test_get_project_services_service_unavailable(
     assert not data
 
 
+@pytest.fixture
+async def empty_project(
+    client,
+    fake_project: dict,
+    logged_user: dict,
+    tests_data_dir: Path,
+    osparc_product_name: str,
+) -> AsyncIterator[dict]:
+    fake_project["prjOwner"] = logged_user["name"]
+    fake_project["workbench"] = {}
+    async with NewProject(
+        fake_project,
+        client.app,
+        user_id=logged_user["id"],
+        product_name=osparc_product_name,
+        tests_data_dir=tests_data_dir,
+    ) as project:
+        yield project
+
+
 @pytest.mark.parametrize("user_role", [UserRole.USER])
 async def test_get_project_services_empty_project(
     client: TestClient,
-    user_project: ProjectDict,
+    empty_project: ProjectDict,
     mocker: MockerFixture,
-    logged_user: UserInfoDict,
-    default_product_name: ProductName,
 ):
-    #
-    # Clear the project's workbench to make it empty
-    # Update the project in the database to have an empty workbench
-    await _projects_service.patch_project_for_user(
-        client.app,
-        user_id=logged_user["id"],
-        project_uuid=user_project["uuid"],
-        project_patch=ProjectPatch(workbench={}),
-        product_name=default_product_name,
-        client_session_id=None,
-    )
+    # NOTE: Tests bug described in https://github.com/ITISFoundation/osparc-simcore/pull/8501
+    assert empty_project["workbench"] == {}
 
-    mocker.patch(
-        "simcore_service_webserver.catalog._service.catalog_rpc.batch_get_my_services",
+    # MOCK CATALOG TO RAISE IF CALLED (it should not be called)
+    from simcore_service_webserver.catalog._service import catalog_rpc  # noqa: PLC0415
+
+    mocker.patch.object(
+        catalog_rpc,
+        "batch_get_my_services",
         spec=True,
         side_effect=ValueError(
             "Bad request: cannot batch-get an empty list of name-ids"
@@ -625,14 +638,17 @@ async def test_get_project_services_empty_project(
 
     assert client.app
 
-    project_id = user_project["uuid"]
+    # ACT
+    project_id = empty_project["uuid"]
 
     expected_url = client.app.router["get_project_services"].url_for(
         project_id=project_id
     )
     assert URL(f"/v0/projects/{project_id}/nodes/-/services") == expected_url
 
     resp = await client.get(f"/v0/projects/{project_id}/nodes/-/services")
+
+    # ASSERT
     data, _ = await assert_status(resp, status.HTTP_200_OK)
 
     assert data == {