added tests for service details

Author: Andrei Neagu

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/api/frontend/routes/_index.py

@@ -64,7 +64,6 @@ def _render_service_details(node_id: NodeID, service: TrackedServiceModel) -> No
 def _render_buttons(node_id: NodeID, service: TrackedServiceModel) -> None:
 
     with ui.dialog() as confirm_dialog, ui.card():
-
         ui.markdown(f"Stop service **{node_id}**?")
         ui.label("The service will be stopped and its data will be saved.")
         with ui.row():

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/api/frontend/routes/_service.py

@@ -71,7 +71,7 @@ async def remove_from_tracking():
                 ui.notify(f"Service {node_id} removed from tracking")
                 ui.navigate.to("/")
 
-            ui.markdown(f"Remove service **{node_id}** form tracker?")
+            ui.markdown(f"Remove the service **{node_id}** form the tracker?")
             ui.label(
                 "This action will result in the removal of the service form the internal tracker. "
                 "This action should be used whn you are facing issues and the service is not "
@@ -87,8 +87,8 @@ async def remove_from_tracking():
             ).classes("text-red-600")
 
             with ui.row():
-                ui.button("Remove", color="red", on_click=remove_from_tracking)
-                ui.button("No", on_click=lambda: confirm_dialog.submit("No"))
+                ui.button("Remove service", color="red", on_click=remove_from_tracking)
+                ui.button("Cancel", on_click=lambda: confirm_dialog.submit("Cancel"))
 
         async def display_confirm_dialog():
             await confirm_dialog

services/dynamic-scheduler/tests/unit/api_frontend/helpers.py

@@ -8,8 +8,10 @@
 from typing import Final
 from uuid import uuid4
 
+from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceGet
+from models_library.api_schemas_webserver.projects_nodes import NodeGet
 from playwright.async_api import Locator, Page
-from pydantic import NonNegativeFloat, NonNegativeInt
+from pydantic import NonNegativeFloat, NonNegativeInt, TypeAdapter
 from tenacity import AsyncRetrying, stop_after_delay, wait_fixed
 
 _HERE: Final[Path] = (
@@ -86,3 +88,17 @@ async def assert_not_contains_text(
             with attempt:
                 locator = async_page.get_by_text(text)
                 assert await locator.count() < 1, f"found text='{text}' in body"
+
+
+def get_new_style_service_status(state: str) -> DynamicServiceGet:
+    return TypeAdapter(DynamicServiceGet).validate_python(
+        DynamicServiceGet.model_config["json_schema_extra"]["examples"][0]
+        | {"state": state}
+    )
+
+
+def get_legacy_service_status(state: str) -> NodeGet:
+    return TypeAdapter(NodeGet).validate_python(
+        NodeGet.model_config["json_schema_extra"]["examples"][0]
+        | {"service_state": state}
+    )

services/dynamic-scheduler/tests/unit/api_frontend/test_api_frontend_routes_index.py

@@ -7,7 +7,13 @@
 
 import pytest
 from fastapi import FastAPI
-from helpers import assert_contains_text, assert_not_contains_text, click_on_text
+from helpers import (
+    assert_contains_text,
+    assert_not_contains_text,
+    click_on_text,
+    get_legacy_service_status,
+    get_new_style_service_status,
+)
 from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceGet
 from models_library.api_schemas_dynamic_scheduler.dynamic_services import (
     DynamicServiceStart,
@@ -16,7 +22,6 @@
 from models_library.api_schemas_webserver.projects_nodes import NodeGet
 from models_library.projects_nodes_io import NodeID
 from playwright.async_api import Page
-from pydantic import TypeAdapter
 from simcore_service_dynamic_scheduler.services.service_tracker import (
     set_if_status_changed_for_service,
     set_request_as_running,
@@ -34,20 +39,6 @@
 ]
 
 
-def _get_new_style_service_status(state: str) -> DynamicServiceGet:
-    return TypeAdapter(DynamicServiceGet).validate_python(
-        DynamicServiceGet.model_config["json_schema_extra"]["examples"][0]
-        | {"state": state}
-    )
-
-
-def _get_legacy_service_status(state: str) -> NodeGet:
-    return TypeAdapter(NodeGet).validate_python(
-        NodeGet.model_config["json_schema_extra"]["examples"][0]
-        | {"service_state": state}
-    )
-
-
 async def test_index_with_elements(
     app_runner: None,
     async_page: Page,
@@ -60,10 +51,7 @@ async def test_index_with_elements(
 
     # 1. no content
     await assert_contains_text(async_page, "Total tracked services:")
-
     await assert_contains_text(async_page, "0")
-    reference = async_page.get_by_text("0")
-    assert await reference.text_content() == "0"
     await assert_not_contains_text(async_page, "Details")
 
     # 2. add elements and check
@@ -79,8 +67,8 @@ async def test_index_with_elements(
 @pytest.mark.parametrize(
     "service_status",
     [
-        _get_new_style_service_status("running"),
-        _get_legacy_service_status("running"),
+        get_new_style_service_status("running"),
+        get_legacy_service_status("running"),
     ],
 )
 async def test_main_page(

services/dynamic-scheduler/tests/unit/api_frontend/test_api_frontend_routes_service.py

@@ -0,0 +1,87 @@
+# pylint:disable=redefined-outer-name
+# pylint:disable=unused-argument
+
+from collections.abc import Callable
+from unittest.mock import AsyncMock
+
+import pytest
+from fastapi import FastAPI
+from helpers import (
+    assert_contains_text,
+    click_on_text,
+    get_legacy_service_status,
+    get_new_style_service_status,
+)
+from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceGet
+from models_library.api_schemas_dynamic_scheduler.dynamic_services import (
+    DynamicServiceStart,
+)
+from models_library.api_schemas_webserver.projects_nodes import NodeGet
+from models_library.projects_nodes_io import NodeID
+from playwright.async_api import Page
+from simcore_service_dynamic_scheduler.services.service_tracker import (
+    set_if_status_changed_for_service,
+    set_request_as_running,
+)
+from tenacity import AsyncRetrying, stop_after_delay, wait_fixed
+
+pytest_simcore_core_services_selection = [
+    "rabbit",
+    "redis",
+]
+
+pytest_simcore_ops_services_selection = [
+    # "redis-commander",
+]
+
+
+@pytest.mark.parametrize(
+    "service_status",
+    [
+        get_new_style_service_status("running"),
+        get_legacy_service_status("running"),
+    ],
+)
+async def test_service_details(
+    app_runner: None,
+    async_page: Page,
+    server_host_port: str,
+    node_id: NodeID,
+    not_initialized_app: FastAPI,
+    get_dynamic_service_start: Callable[[NodeID], DynamicServiceStart],
+    mock_remove_tracked_service: AsyncMock,
+    service_status: NodeGet | DynamicServiceGet,
+):
+    await set_request_as_running(
+        not_initialized_app, get_dynamic_service_start(node_id)
+    )
+    await set_request_as_running(
+        not_initialized_app, get_dynamic_service_start(node_id)
+    )
+    await set_if_status_changed_for_service(
+        not_initialized_app, node_id, service_status
+    )
+
+    await async_page.goto(server_host_port)
+
+    # 1. one service is tracked
+    await assert_contains_text(async_page, "Total tracked services:")
+    await assert_contains_text(async_page, "1")
+    await assert_contains_text(async_page, "Details", instances=1)
+
+    # 2. open details page
+    await click_on_text(async_page, "Details")
+
+    # 3. click "Remove from tracking" -> cancel
+    await click_on_text(async_page, "Remove from tracking")
+    await click_on_text(async_page, "Cancel")
+    mock_remove_tracked_service.assert_not_awaited()
+
+    # 4. click "Remove from tracking" -> confirm
+    await click_on_text(async_page, "Remove from tracking")
+    await click_on_text(async_page, "Remove service")
+    async for attempt in AsyncRetrying(
+        reraise=True, wait=wait_fixed(0.1), stop=stop_after_delay(3)
+    ):
+        with attempt:
+            mock_remove_tracked_service.assert_awaited_once()