service version works for s4l and jupyterlab

Author: sanderegg

tests/e2e-playwright/Makefile

@@ -161,6 +161,12 @@ $(SLEEPERS_INPUT_FILE) $(JUPYTER_LAB_INPUT_FILE) $(CLASSIC_TIP_INPUT_FILE) $(S4L
 	if [ "$@" = "$(JUPYTER_LAB_INPUT_FILE)" ]; then \
 		read -p "Enter the size of the large file (human readable form e.g. 3Gib): " LARGE_FILE_SIZE; \
 		echo "--service-key=jupyter-math --large-file-size=$$LARGE_FILE_SIZE" >> $@; \
+		read -p "Enter the service version (default to latest): " SERVICE_VERSION; \
+			if [ -z "$$SERVICE_VERSION" ]; then \
+				echo "No service version specified, using default."; \
+			else \
+				echo "--service-version=$$SERVICE_VERSION" >> $@; \
+			fi; \
 	elif [ "$@" = "$(S4L_INPUT_FILE)" ]; then \
 		read -p "Do you want to check the videostreaming ? (requires to run with chrome/msedge) [y/n]: " VIDEOSTREAM; \
 		if [ "$$VIDEOSTREAM" = "y" ]; then \

tests/e2e-playwright/tests/conftest.py

@@ -456,9 +456,14 @@ def _open_with_resources(page: Page, *, click_it: bool):
 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").select_option(
-            f"serviceVersionItem_{version}"
-        )
+        with log_context(logging.INFO, msg=f"selecting version {version}"):
+            page.get_by_test_id("serviceSelectBox").click(timeout=5 * SECOND)
+            with page.expect_response(
+                re.compile(r"/catalog/services/.+/resources"), timeout=1.5 * 5 * SECOND
+            ):
+                page.get_by_test_id(f"serviceVersionItem_{version}").click(
+                    timeout=5 * SECOND
+                )
     except TimeoutError:
         # we try the non robust way
         page.get_by_label("Version").select_option(version)
@@ -480,8 +485,7 @@ def create_new_project_and_delete(
     created_project_uuids = []
 
     def _(
-        expected_states: tuple[RunningState] = (RunningState.NOT_STARTED,),
-        *,
+        expected_states: tuple[RunningState],
         press_open: bool,
         template_id: str | None,
         service_version: str | None,
@@ -509,8 +513,6 @@ 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:
@@ -559,6 +561,8 @@ def wait_for_done(response):
                                 # not expected in the sim4life context though
                                 ...
                     else:
+                        if service_version is not None:
+                            _select_service_version(page, version=service_version)
                         open_button.click()
                         if is_product_billable:
                             _open_with_resources(page, click_it=True)

tests/e2e-playwright/tests/jupyterlabs/test_jupyterlab.py

@@ -67,6 +67,7 @@ def test_jupyterlab(
         [ServiceType, str, str | None, str | None], dict[str, Any]
     ],
     service_key: str,
+    service_version: str | None,
     large_file_size: ByteSize,
     large_file_block_size: ByteSize,
     product_url: AnyUrl,
@@ -86,7 +87,7 @@ def test_jupyterlab(
         ),
     ):
         project_data = create_project_from_service_dashboard(
-            ServiceType.DYNAMIC, service_key, None, None
+            ServiceType.DYNAMIC, service_key, None, service_version
         )
         assert "workbench" in project_data, "Expected workbench to be in project data!"
         assert isinstance(

tests/e2e-playwright/tests/tip/conftest.py

@@ -33,6 +33,6 @@ def create_tip_plan_from_dashboard(
     def _(plan_name_test_id: str) -> dict[str, Any]:
         find_and_start_tip_plan_in_dashboard(plan_name_test_id)
         expected_states = (RunningState.UNKNOWN,)
-        return create_new_project_and_delete(expected_states, False, None)
+        return create_new_project_and_delete(expected_states, False, None, None)
 
     return _