🐛 [e2e] Fix tests, 3rd attempt (#6740)

Author: odeimaiz

services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js

@@ -195,7 +195,6 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
     __centerLayout: null,
     _resourceType: null,
     _resourcesList: null,
-    _topBar: null,
     _toolbar: null,
     _searchBarFilter: null,
     __viewModeLayout: null,

services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js

@@ -991,10 +991,12 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         this.invalidateStudies();
         this._resourcesContainer.setResourcesToList([]);
 
+        this._toolbar.show();
         if (context === "search") {
           this.__reloadFolders();
           this.__reloadStudies();
         } else if (context === "workspaces") {
+          this._toolbar.hide();
           this._searchBarFilter.resetFilters();
           this.__reloadWorkspaces();
         } else if (context === "studiesAndFolders") {

services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js

@@ -752,13 +752,15 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
     __iFrameChanged: function(node) {
       this.__iframePage.removeAll();
 
-      const loadingPage = node.getLoadingPage();
-      const iFrame = node.getIFrame();
-      const src = iFrame.getSource();
-      const iFrameView = (src === null || src === "about:blank") ? loadingPage : iFrame;
-      this.__iframePage.add(iFrameView, {
-        flex: 1
-      });
+      if (node) {
+        const loadingPage = node.getLoadingPage();
+        const iFrame = node.getIFrame();
+        const src = iFrame.getSource();
+        const iFrameView = (src === null || src === "about:blank") ? loadingPage : iFrame;
+        this.__iframePage.add(iFrameView, {
+          flex: 1
+        });
+      }
     },
 
     __populateSecondaryColumn: function(node) {

services/static-webserver/client/source/class/osparc/node/slideshow/NodeView.js

@@ -143,14 +143,15 @@ qx.Class.define("osparc.node.slideshow.NodeView", {
       this._iFrameLayout.removeAll();
 
       const node = this.getNode();
-
-      const loadingPage = node.getLoadingPage();
-      const iFrame = node.getIFrame();
-      const src = iFrame.getSource();
-      const iFrameView = (src === null || src === "about:blank") ? loadingPage : iFrame;
-      this._iFrameLayout.add(iFrameView, {
-        flex: 1
-      });
+      if (node) {
+        const loadingPage = node.getLoadingPage();
+        const iFrame = node.getIFrame();
+        const src = iFrame.getSource();
+        const iFrameView = (src === null || src === "about:blank") ? loadingPage : iFrame;
+        this._iFrameLayout.add(iFrameView, {
+          flex: 1
+        });
+      }
     }
   }
 });

services/static-webserver/client/source/class/osparc/viewer/NodeViewer.js

@@ -93,15 +93,16 @@ qx.Class.define("osparc.viewer.NodeViewer", {
     __iFrameChanged: function() {
       this._removeAll();
 
-      const iframeHandler = this.getNode().getIframeHandler();
-
-      const loadingPage = iframeHandler.getLoadingPage();
-      const iFrame = iframeHandler.getIFrame();
-      const src = iFrame.getSource();
-      const iFrameView = (src === null || src === "about:blank") ? loadingPage : iFrame;
-      this._add(iFrameView, {
-        flex: 1
-      });
+      if (this.getNode() && this.getNode().getIframeHandler()) {
+        const iframeHandler = this.getNode().getIframeHandler();
+        const loadingPage = iframeHandler.getLoadingPage();
+        const iFrame = iframeHandler.getIFrame();
+        const src = iFrame.getSource();
+        const iFrameView = (src === null || src === "about:blank") ? loadingPage : iFrame;
+        this._add(iFrameView, {
+          flex: 1
+        });
+      }
     },
 
     __attachSocketEventHandlers: function() {

tests/e2e-playwright/tests/conftest.py

@@ -11,6 +11,7 @@
 import os
 import random
 import re
+import time
 import urllib.parse
 from collections.abc import Callable, Iterator
 from contextlib import ExitStack
@@ -443,6 +444,7 @@ def _(
                     re.compile(r"/projects/[^:]+:open"), timeout=timeout + 5 * SECOND
                 ) as response_info,
             ):
+                open_with_resources_clicked = False
                 # Project detail view pop-ups shows
                 if press_open:
                     open_button = page.get_by_test_id("openResource")
@@ -451,11 +453,13 @@ def _(
                             open_button.click()
                             # Open project with default resources
                             open_button = page.get_by_test_id("openWithResources")
+                            time.sleep(2)  # wait until the study options are filled up
                         # it returns a Long Running Task
                         with page.expect_response(
                             re.compile(rf"/projects\?from_study\={template_id}")
                         ) as lrt:
                             open_button.click()
+                        open_with_resources_clicked = True
                         lrt_data = lrt.value.json()
                         lrt_data = lrt_data["data"]
                         with log_context(
@@ -495,7 +499,15 @@ def wait_for_done(response):
                         open_button.click()
                         if is_product_billable:
                             # Open project with default resources
-                            page.get_by_test_id("openWithResources").click()
+                            open_button = page.get_by_test_id("openWithResources")
+                            time.sleep(2)  # wait until the study options are filled up
+                            open_button.click()
+                            open_with_resources_clicked = True
+                if is_product_billable and not open_with_resources_clicked:
+                    # Open project with default resources
+                    open_button = page.get_by_test_id("openWithResources")
+                    time.sleep(2)  # wait until the study options are filled up
+                    open_button.click()
             project_data = response_info.value.json()
             assert project_data
             project_uuid = project_data["data"]["uuid"]

tests/e2e/portal-files/VTK_file.js

@@ -60,7 +60,7 @@ async function runTutorial () {
     await utils.takeScreenshot(page, screenshotPrefix + 'teapot');
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {

tests/e2e/portal/2D_Plot.js

@@ -51,7 +51,7 @@ async function runTutorial () {
     await utils.takeScreenshot(page, screenshotPrefix + 'iFrame2');
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {

tests/e2e/portal/3D_Anatomical.js

@@ -39,7 +39,7 @@ async function runTutorial () {
     await tutorial.checkNodeOutputs(1, outFiles);
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {

tests/e2e/portal/3D_EM.js

@@ -39,7 +39,7 @@ async function runTutorial () {
     await tutorial.checkNodeOutputs(2, outFiles);
   }
   catch(err) {
-    await tutorial.setTutorialFailed(true);
+    await tutorial.setTutorialFailed();
     console.log('Tutorial error: ' + err);
   }
   finally {