Fix e2e (#1407)

* Study delete adapted to new study browser
* there might be no json body in the response
* new users also remove studies

Author: odeimaiz

services/web/client/source/class/osparc/dashboard/StudyBrowser.js

@@ -477,6 +477,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       menu.addSeparator();
 
       const deleteButton = this.__getDeleteStudyMenuButton(studyData, isTemplate);
+      osparc.utils.Utils.setIdToWidget(deleteButton, "studyItemMenuDelete");
       menu.add(deleteButton);
 
       return menu;

services/web/client/source/class/osparc/dashboard/StudyBrowserButtonItem.js

@@ -124,6 +124,7 @@ qx.Class.define("osparc.dashboard.StudyBrowserButtonItem", {
             zIndex: this.self().menuButtonZIndex,
             focusable: false
           });
+          osparc.utils.Utils.setIdToWidget(control, "studyItemMenuButton");
           this._add(control, {
             top: 0,
             right: 0

tests/e2e/tutorials/sleepers.js

@@ -39,9 +39,7 @@ async function runTutorial () {
   ];
   await tutorial.checkResults(outFiles.length);
 
-  if (!newUser) {
-    await tutorial.removeStudy();
-  }
+  await tutorial.removeStudy();
   await tutorial.logOut();
   await tutorial.close();
 }

tests/e2e/utils/auto.js

@@ -256,6 +256,7 @@ async function runStudy(page, waitFor = 0) {
     await responsesQueue.waitUntilResponse("/start");
   }
   catch(err) {
+    console.error(err);
     throw(err);
   }
 
@@ -269,11 +270,11 @@ async function dashboardDeleteFirstStudy(page) {
   await page.waitForSelector('[osparc-test-id="studiesTabBtn"]')
   await page.click('[osparc-test-id="studiesTabBtn"]')
 
-  await page.waitForSelector('[osparc-test-id="userStudiesList"] > .qx-pb-listitem:nth-child(1)')
-  await page.click('[osparc-test-id="userStudiesList"] > .qx-pb-listitem:nth-child(1)')
+  await page.waitForSelector('[osparc-test-id="userStudiesList"] > .qx-pb-listitem:nth-child(1) > [osparc-test-id="studyItemMenuButton"]')
+  await page.click('[osparc-test-id="userStudiesList"] > .qx-pb-listitem:nth-child(1) > [osparc-test-id="studyItemMenuButton"]')
 
-  await page.waitForSelector('[osparc-test-id="deleteStudiesBtn"]')
-  await page.click('[osparc-test-id="deleteStudiesBtn"]')
+  await page.waitForSelector('[osparc-test-id="studyItemMenuDelete"]')
+  await page.click('[osparc-test-id="studyItemMenuDelete"]')
 
   await page.waitForSelector('[osparc-test-id="confirmDeleteStudyBtn"]')
   await page.click('[osparc-test-id="confirmDeleteStudyBtn"]')
@@ -357,6 +358,7 @@ async function downloadSelectedFile(page) {
     console.log("valid output file value", value)
   }
   catch(err) {
+    console.error(err);
     throw(err);
   }
 }

tests/e2e/utils/responsesQueue.js

@@ -29,14 +29,25 @@ class ResponsesQueue {
     page.on("response", function callback(resp) {
       if (resp.url().includes(url)) {
         console.log((new Date).toUTCString(), "-- Queued response received", resp.url(), ":");
-        resp.json().then(data => {
-          that.__respReceivedQueue[url] = data;
+        console.log(resp.status());
+        if (resp.status() === 204) {
+          that.__respReceivedQueue[url] = "ok";
           page.removeListener("response", callback);
           const index = respPendingQueue.indexOf(url);
           if (index > -1) {
             respPendingQueue.splice(index, 1);
           }
-        });
+        }
+        else {
+          resp.json().then(data => {
+            that.__respReceivedQueue[url] = data;
+            page.removeListener("response", callback);
+            const index = respPendingQueue.indexOf(url);
+            if (index > -1) {
+              respPendingQueue.splice(index, 1);
+            }
+          });
+        }
       }
     });
   }
@@ -60,11 +71,9 @@ class ResponsesQueue {
     if (sleptFor >= timeout) {
       throw("-- Timeout reached." + new Date().toUTCString());
     }
-    // console.log("waitUntilResponse", url);
-    // console.log(Object.keys(this.__respReceivedQueue));
     if (Object.prototype.hasOwnProperty.call(this.__respReceivedQueue, url)) {
       const resp = this.__respReceivedQueue[url];
-      if (resp && "error" in resp && resp["error"] !== null) {
+      if (resp && Object.prototype.hasOwnProperty.call(resp, "error") && resp["error"] !== null) {
         throw("-- Error in response", resp["error"]);
       }
       delete this.__respReceivedQueue[url];