More e2e (#1845)

odeimaiz · web-flow · commit 587a3e8c1857 · 2020-09-30T10:18:57.000+02:00
* no need to calls catalog/dags anymore
* make screenshooter work again
* Mark tutorials as failed and throw later
diff --git a/tests/e2e/portal/2D_Plot.js b/tests/e2e/portal/2D_Plot.js
@@ -17,7 +17,7 @@ const screenshotPrefix = "2DPlot_";
 async function runTutorial () {
   const tutorial = new tutorialBase.TutorialBase(anonURL);
 
-  tutorial.initScreenshoter();
+  tutorial.startScreenshooter();
 
   const page = await tutorial.beforeScript();
   const studyData = await tutorial.openStudyLink();
@@ -54,7 +54,7 @@ async function runTutorial () {
   await utils.takeScreenshot(page, screenshotPrefix + 'iFrame2');
 
   await tutorial.logOut();
-  tutorial.stopScreenshoter();
+  tutorial.stopScreenshooter();
   await tutorial.close();
 }
 
diff --git a/tests/e2e/portal/3D_Anatomical.js b/tests/e2e/portal/3D_Anatomical.js
@@ -16,7 +16,7 @@ const screenshotPrefix = "3DAnatomical_";
 async function runTutorial () {
   const tutorial = new tutorialBase.TutorialBase(anonURL);
 
-  tutorial.initScreenshoter();
+  tutorial.startScreenshooter();
   const page = await tutorial.beforeScript();
   const studyData = await tutorial.openStudyLink();
 
@@ -34,7 +34,7 @@ async function runTutorial () {
   await tutorial.checkResults(outFiles.length);
 
   await tutorial.logOut();
-  tutorial.stopScreenshoter();
+  tutorial.stopScreenshooter();
   await tutorial.close();
 }
 
diff --git a/tests/e2e/portal/3D_EM.js b/tests/e2e/portal/3D_EM.js
@@ -16,7 +16,7 @@ const screenshotPrefix = "3DEM_";
 async function runTutorial () {
   const tutorial = new tutorialBase.TutorialBase(anonURL);
 
-  tutorial.initScreenshoter();
+  tutorial.startScreenshooter();
   const page = await tutorial.beforeScript();
   const studyData = await tutorial.openStudyLink();
 
@@ -34,7 +34,7 @@ async function runTutorial () {
   await tutorial.checkResults(outFiles.length);
 
   await tutorial.logOut();
-  tutorial.stopScreenshoter();
+  tutorial.stopScreenshooter();
   await tutorial.close();
 }
 
diff --git a/tests/e2e/portal/Bornstein.js b/tests/e2e/portal/Bornstein.js
@@ -16,7 +16,7 @@ const screenshotPrefix = "Bornstein_";
 async function runTutorial () {
   const tutorial = new tutorialBase.TutorialBase(anonURL);
 
-  tutorial.initScreenshoter();
+  tutorial.startScreenshooter();
   const page = await tutorial.beforeScript();
   const studyData = await tutorial.openStudyLink();
 
@@ -38,7 +38,7 @@ async function runTutorial () {
   await tutorial.checkResults(outFiles.length);
 
   await tutorial.logOut();
-  tutorial.stopScreenshoter();
+  tutorial.stopScreenshooter();
   await tutorial.close();
 }
 
diff --git a/tests/e2e/portal/CC_Human.js b/tests/e2e/portal/CC_Human.js
@@ -16,7 +16,7 @@ const screenshotPrefix = "CCHuman_";
 async function runTutorial () {
   const tutorial = new tutorialBase.TutorialBase(anonURL);
 
-  tutorial.initScreenshoter();
+  tutorial.startScreenshooter();
   const page = await tutorial.beforeScript();
   await tutorial.goTo();
 
@@ -57,7 +57,7 @@ async function runTutorial () {
   // await tutorial.openNodeRetrieveAndRestart(4);
 
   await tutorial.logOut();
-  tutorial.stopScreenshoter();
+  tutorial.stopScreenshooter();
   await tutorial.close();
 }
 
diff --git a/tests/e2e/portal/CC_Rabbit.js b/tests/e2e/portal/CC_Rabbit.js
@@ -16,7 +16,7 @@ const screenshotPrefix = "CCRabbit_";
 async function runTutorial () {
   const tutorial = new tutorialBase.TutorialBase(anonURL);
 
-  tutorial.initScreenshoter();
+  tutorial.startScreenshooter();
   const page = await tutorial.beforeScript();
   await tutorial.goTo();
 
@@ -55,7 +55,7 @@ async function runTutorial () {
   // await tutorial.openNodeRetrieveAndRestart(4);
 
   await tutorial.logOut();
-  tutorial.stopScreenshoter();
+  tutorial.stopScreenshooter();
   await tutorial.close();
 }
 
diff --git a/tests/e2e/portal/Mattward.js b/tests/e2e/portal/Mattward.js
@@ -16,7 +16,7 @@ const screenshotPrefix = "Mattward_";
 async function runTutorial () {
   const tutorial = new tutorialBase.TutorialBase(anonURL);
 
-  tutorial.initScreenshoter();
+  tutorial.startScreenshooter();
   const page = await tutorial.beforeScript();
   const studyData = await tutorial.openStudyLink();
 
@@ -43,7 +43,7 @@ async function runTutorial () {
   await tutorial.checkResults(outFiles.length);
 
   await tutorial.logOut();
-  tutorial.stopScreenshoter();
+  tutorial.stopScreenshooter();
   await tutorial.close();
 }
 
diff --git a/tests/e2e/portal/opencor.js b/tests/e2e/portal/opencor.js
@@ -16,7 +16,7 @@ const screenshotPrefix = "Opencor_";
 async function runTutorial () {
   const tutorial = new tutorialBase.TutorialBase(anonURL);
 
-  tutorial.initScreenshoter();
+  tutorial.startScreenshooter();
   const page = await tutorial.beforeScript();
   await tutorial.goTo();
 
@@ -36,7 +36,7 @@ async function runTutorial () {
   await tutorial.checkResults(outFiles.length);
 
   await tutorial.logOut();
-  tutorial.stopScreenshoter();
+  tutorial.stopScreenshooter();
   await tutorial.close();
 }
 
diff --git a/tests/e2e/tutorials/jupyters.js b/tests/e2e/tutorials/jupyters.js
@@ -18,7 +18,7 @@ async function runTutorial() {
   const tutorial = new tutorialBase.TutorialBase(url, user, pass, newUser, templateName, enableDemoMode);
 
   try {
-    tutorial.initScreenshoter();
+    tutorial.startScreenshooter();
     await tutorial.start();
     const studyData = await tutorial.openTemplate(1000);
 
@@ -106,13 +106,18 @@ async function runTutorial() {
     await tutorial.removeStudy();
   }
   catch(err) {
+    tutorial.setTutorialFailed(true);
     console.log('Tutorial error: ' + err);
   }
   finally {
     await tutorial.logOut();
-    tutorial.stopScreenshoter();
+    tutorial.stopScreenshooter();
     await tutorial.close();
   }
+
+  if (tutorial.getTutorialFailed()) {
+    throw "Tutorial Failed";
+  }
 }
 
 runTutorial()
diff --git a/tests/e2e/tutorials/mattward.js b/tests/e2e/tutorials/mattward.js
@@ -18,7 +18,7 @@ async function runTutorial() {
   const tutorial = new tutorialBase.TutorialBase(url, user, pass, newUser, templateName, enableDemoMode);
 
   try {
-    tutorial.initScreenshoter();
+    tutorial.startScreenshooter();
     await tutorial.start();
     const studyData = await tutorial.openTemplate(1000);
 
@@ -46,13 +46,18 @@ async function runTutorial() {
     await tutorial.removeStudy();
   }
   catch(err) {
+    tutorial.setTutorialFailed(true);
     console.log('Tutorial error: ' + err);
   }
   finally {
     await tutorial.logOut();
-    tutorial.stopScreenshoter();
+    tutorial.stopScreenshooter();
     await tutorial.close();
   }
+
+  if (tutorial.getTutorialFailed()) {
+    throw "Tutorial Failed";
+  }
 }
 
 runTutorial()
diff --git a/tests/e2e/tutorials/sleepers.js b/tests/e2e/tutorials/sleepers.js
@@ -18,7 +18,7 @@ async function runTutorial() {
   const tutorial = new tutorialBase.TutorialBase(url, user, pass, newUser, templateName, enableDemoMode);
 
   try {
-    tutorial.initScreenshoter();
+    tutorial.startScreenshooter();
     await tutorial.start();
     await tutorial.openTemplate(1000);
 
@@ -42,13 +42,18 @@ async function runTutorial() {
     await tutorial.removeStudy();
   }
   catch(err) {
+    tutorial.setTutorialFailed(true);
     console.log('Tutorial error: ' + err);
   }
   finally {
     await tutorial.logOut();
-    tutorial.stopScreenshoter();
+    tutorial.stopScreenshooter();
     await tutorial.close();
   }
+
+  if (tutorial.getTutorialFailed()) {
+    throw "Tutorial Failed";
+  }
 }
 
 runTutorial()
diff --git a/tests/e2e/tutorials/tutorialBase.js b/tests/e2e/tutorials/tutorialBase.js
@@ -20,9 +20,11 @@ class TutorialBase {
     this.__responsesQueue = null;
 
     this.__interval = null;
+
+    this.__failed = false;
   }
 
-  initScreenshoter() {
+  startScreenshooter() {
     try {
       utils.createScreenshotsDir();
     }
@@ -36,7 +38,7 @@ class TutorialBase {
     }, 2000);
   }
 
-  stopScreenshoter() {
+  stopScreenshooter() {
     clearInterval(this.__interval);
   }
 
@@ -102,8 +104,7 @@ class TutorialBase {
 
   async login() {
     this.__responsesQueue.addResponseListener("projects?type=template");
-    this.__responsesQueue.addResponseListener("catalog/dags");
-    this.__responsesQueue.addResponseListener("services");
+    this.__responsesQueue.addResponseListener("catalog/services");
 
     try {
       await auto.logIn(this.__page, this.__user, this.__pass);
@@ -127,20 +128,7 @@ class TutorialBase {
     }
 
     try {
-      const resp = await this.__responsesQueue.waitUntilResponse("catalog/dags");
-      const dags = resp["data"];
-      console.log("DAGs received:", dags.length);
-      dags.forEach(dag => {
-        console.log(" - ", dag.name);
-      });
-    }
-    catch(err) {
-      console.error("DAGs could not be fetched", err);
-      throw(err);
-    }
-
-    try {
-      const resp = await this.__responsesQueue.waitUntilResponse("services");
+      const resp = await this.__responsesQueue.waitUntilResponse("catalog/services");
       const services = resp["data"];
       console.log("Services received:", services.length);
     }
@@ -301,6 +289,14 @@ class TutorialBase {
     }
     await utils.takeScreenshot(this.__page, title);
   }
+
+  getTutorialFailed() {
+    return this.__failed;
+  }
+
+  setTutorialFailed(failed) {
+    this.__failed = failed;
+  }
 }
 
 module.exports = {
diff --git a/tests/e2e/utils/utils.js b/tests/e2e/utils/utils.js
@@ -199,17 +199,25 @@ function createScreenshotsDir() {
   console.log("Screenshots directory:", screenshotsDir);
 }
 
-async function takeScreenshot(page, captureName) {
-  let filename = captureName.replace("undefined", "");
-  filename = filename.replace(":", "-");
-  filename = filename+".jpg";
+async function takeScreenshot(page, captureName = "") {
+  const event = new Date();
+  const time = event.toLocaleTimeString('de-CH');
+  let filename = time + "_" + captureName;
+  filename = filename.split(":").join("-")
+  filename = filename + ".jpg";
   const path = pathLib.join(__dirname, SCREENSHOTS_DIR, filename);
+  console.log(path);
 
-  await page.screenshot({
-    fullPage: true,
-    path: path,
-    type: 'jpeg',
-  })
+  try {
+    await page.screenshot({
+      fullPage: true,
+      path: path,
+      type: 'jpeg',
+    })
+  }
+  catch(err) {
+    console.error("Error taking screenshot", err);
+  }
 }
 
 function extractWorkbenchData(data) {
