added service_version fixture

Author: sanderegg

tests/e2e-playwright/tests/conftest.py

@@ -112,6 +112,13 @@ def pytest_addoption(parser: pytest.Parser) -> None:
         default=False,
         help="Whether service is a legacy service (no sidecar)",
     )
+    group.addoption(
+        "--service-version",
+        action="store",
+        type=str,
+        default=None,
+        help="The service version option defines a service specific version",
+    )
     group.addoption(
         "--template-id",
         action="store",
@@ -272,6 +279,14 @@ def is_service_legacy(request: pytest.FixtureRequest) -> bool:
     return TypeAdapter(bool).validate_python(autoscaled)
 
 
+@pytest.fixture(scope="session")
+def service_version(request: pytest.FixtureRequest) -> str | None:
+    if key := request.config.getoption("--service-version"):
+        assert isinstance(key, str)
+        return key
+    return None
+
+
 @pytest.fixture(scope="session")
 def template_id(request: pytest.FixtureRequest) -> str | None:
     if key := request.config.getoption("--template-id"):
@@ -438,13 +453,25 @@ def _open_with_resources(page: Page, *, click_it: bool):
     return open_with_resources_button
 
 
+def _select_service_version(page: Page, *, version: str) -> None:
+    try:
+        # since https://github.com/ITISFoundation/osparc-simcore/pull/7060
+        page.get_by_test_id("serviceSelectBox", timeout=5 * SECOND).select_option(
+            version
+        )
+    except TimeoutError:
+        # we try the non robust way
+        page.get_by_label("Version").select_option(version)
+
+
 @pytest.fixture
 def create_new_project_and_delete(
     page: Page,
     log_in_and_out: RestartableWebSocket,
     is_product_billable: bool,
     api_request_context: APIRequestContext,
     product_url: AnyUrl,
+    service_version: str | None,
 ) -> Iterator[Callable[[tuple[RunningState], bool], dict[str, Any]]]:
     """The first available service currently displayed in the dashboard will be opened
     NOTE: cannot be used multiple times or going back to dashboard will fail!!
@@ -453,12 +480,13 @@ def create_new_project_and_delete(
 
     def _(
         expected_states: tuple[RunningState] = (RunningState.NOT_STARTED,),
+        *,
         press_open: bool = True,
         template_id: str | None = None,
     ) -> dict[str, Any]:
-        assert (
-            len(created_project_uuids) == 0
-        ), "misuse of this fixture! only 1 study can be opened at a time. Otherwise please modify the fixture"
+        assert len(created_project_uuids) == 0, (
+            "misuse of this fixture! only 1 study can be opened at a time. Otherwise please modify the fixture"
+        )
         with log_context(
             logging.INFO,
             f"Open project in {product_url=} as {is_product_billable=}",
@@ -479,6 +507,8 @@ def _(
             ):
                 open_with_resources_clicked = False
                 # Project detail view pop-ups shows
+                if service_version is not None:
+                    _select_service_version(page, version=service_version)
                 if press_open:
                     open_button = page.get_by_test_id("openResource")
                     if template_id is not None:
@@ -573,9 +603,9 @@ def wait_for_done(response):
             response = api_request_context.delete(
                 f"{product_url}v0/projects/{project_uuid}"
             )
-            assert (
-                response.status == 204
-            ), f"Unexpected error while deleting project: '{response.json()}'"
+            assert response.status == 204, (
+                f"Unexpected error while deleting project: '{response.json()}'"
+            )
 
 
 # SEE https://github.com/ITISFoundation/osparc-simcore/pull/5618#discussion_r1553943415
@@ -644,7 +674,7 @@ def create_project_from_new_button(
     def _(plus_button_test_id: str) -> dict[str, Any]:
         start_study_from_plus_button(plus_button_test_id)
         expected_states = (RunningState.UNKNOWN,)
-        return create_new_project_and_delete(expected_states, False)
+        return create_new_project_and_delete(expected_states, press_open=False)
 
     return _
 
@@ -657,7 +687,9 @@ def create_project_from_template_dashboard(
     def _(template_id: str) -> dict[str, Any]:
         find_and_click_template_in_dashboard(template_id)
         expected_states = (RunningState.UNKNOWN,)
-        return create_new_project_and_delete(expected_states, True, template_id)
+        return create_new_project_and_delete(
+            expected_states, press_open=True, template_id=template_id
+        )
 
     return _
 
@@ -676,7 +708,7 @@ def _(
         expected_states = (RunningState.UNKNOWN,)
         if service_type is ServiceType.COMPUTATIONAL:
             expected_states = (RunningState.NOT_STARTED,)
-        return create_new_project_and_delete(expected_states, True)
+        return create_new_project_and_delete(expected_states, press_open=True)
 
     return _
 

tests/e2e-playwright/tests/sim4life/test_sim4life.py

@@ -28,6 +28,7 @@ def test_sim4life(
     create_project_from_new_button: Callable[[str], dict[str, Any]],
     log_in_and_out: RestartableWebSocket,
     service_key: str,
+    service_version: str | None,
     use_plus_button: bool,
     is_autoscaled: bool,
     check_videostreaming: bool,