e2e upgrade

tests/e2e/package.json

@@ -7,11 +7,11 @@
     "test": "tests"
   },
   "dependencies": {
-    "jest": "^26.6.3",
+    "jest": "^24.9.0",
     "jest-puppeteer": "^4.4.0",
     "log-timestamp": "^0.3.0",
     "log4js": "^6.3.0",
-    "puppeteer": "^5.5.0"
+    "puppeteer": "^2.1.1"
   },
   "devDependencies": {},
   "scripts": {

tests/e2e/tutorials/isolve-gpu.js

@@ -18,12 +18,11 @@ const templateName = "isolve-gpu";
 
 async function runTutorial() {
   const tutorial = new tutorialBase.TutorialBase(url, templateName, user, pass, newUser, enableDemoMode);
-
+  let studyId
   try {
-    tutorial.startScreenshooter();
     await tutorial.start();
     const studyData = await tutorial.openTemplate(1000);
-    const studyId = studyData["data"]["uuid"];
+    studyId = studyData["data"]["uuid"];
     console.log("Study ID:", studyId);
 
     // Some time for loading the workbench
@@ -37,19 +36,17 @@ async function runTutorial() {
       "output.h5",
       "log.tgz"
     ];
-    await tutorial.checkNodeResults(1, outFiles);
-
-    await tutorial.toDashboard();
-
-    await tutorial.removeStudy(studyId);
+    await tutorial.openNodeFiles(1)
+    await tutorial.checkResults2(outFiles);
   }
   catch(err) {
     tutorial.setTutorialFailed(true);
     console.log('Tutorial error: ' + err);
   }
   finally {
+    await tutorial.toDashboard();
+    await tutorial.removeStudy2(studyId);
     await tutorial.logOut();
-    tutorial.stopScreenshooter();
     await tutorial.close();
   }
 

tests/e2e/tutorials/mattward.js

@@ -16,19 +16,18 @@ const templateName = "Mattward";
 
 async function runTutorial() {
   const tutorial = new tutorialBase.TutorialBase(url, templateName, user, pass, newUser, enableDemoMode);
-
+  let studyId
   try {
-    tutorial.startScreenshooter();
     await tutorial.start();
     const studyData = await tutorial.openTemplate(1000);
-    const studyId = studyData["data"]["uuid"];
+    studyId = studyData["data"]["uuid"];
     console.log("Study ID:", studyId);
 
     const workbenchData = utils.extractWorkbenchData(studyData["data"]);
     await tutorial.waitForServices(workbenchData["studyId"], [workbenchData["nodeIds"][0]]);
 
     // Wait for the output files to be pushed
-    await tutorial.waitFor(30000);
+    await tutorial.waitFor(30000, 'Wait for the output files to be pushed');
 
     // This study opens in fullscreen mode
     await tutorial.restoreIFrame();
@@ -42,19 +41,18 @@ async function runTutorial() {
       "t_plot.csv",
       "tst_plot.csv"
     ];
-    await tutorial.checkNodeResults(0, outFiles);
-
-    await tutorial.toDashboard();
 
-    await tutorial.removeStudy(studyId);
+    await tutorial.openNodeFiles(0)
+    await tutorial.checkResults2(outFiles);
   }
   catch(err) {
     tutorial.setTutorialFailed(true);
     console.log('Tutorial error: ' + err);
   }
   finally {
+    await tutorial.toDashboard();
+    await tutorial.removeStudy2(studyId);
     await tutorial.logOut();
-    tutorial.stopScreenshooter();
     await tutorial.close();
   }
 

tests/e2e/tutorials/sleepers.js

@@ -16,16 +16,14 @@ const templateName = "Sleepers";
 
 async function runTutorial() {
   const tutorial = new tutorialBase.TutorialBase(url, templateName, user, pass, newUser, enableDemoMode);
-
+  let studyId
   try {
-    tutorial.startScreenshooter();
     await tutorial.start();
     const studyData = await tutorial.openTemplate(1000);
-    const studyId = studyData["data"]["uuid"];
+    studyId = studyData["data"]["uuid"];
     console.log("Study ID:", studyId);
 
-    // Some time for loading the workbench
-    await tutorial.waitFor(5000);
+    await tutorial.waitFor(5000, 'Some time for loading the workbench');
 
     await tutorial.runPipeline();
     await tutorial.waitForStudyDone(studyId, 60000);
@@ -34,22 +32,20 @@ async function runTutorial() {
       "logs.zip",
       "out_1"
     ];
-    await tutorial.checkNodeResults(0, outFiles);
-
-    console.log('Checking results for the last sleeper:');
-    await tutorial.checkNodeResults(4, outFiles);
+    await tutorial.openNodeFiles(0)
+    await tutorial.checkResults2(outFiles);
 
-    await tutorial.toDashboard();
-
-    await tutorial.removeStudy(studyId);
+    await tutorial.openNodeFiles(4)
+    await tutorial.checkResults2(outFiles);
   }
   catch(err) {
     tutorial.setTutorialFailed(true);
     console.log('Tutorial error: ' + err);
   }
   finally {
+    await tutorial.toDashboard();
+    await tutorial.removeStudy2(studyId);
     await tutorial.logOut();
-    tutorial.stopScreenshooter();
     await tutorial.close();
   }
 

tests/e2e/tutorials/tutorialBase.js

@@ -332,6 +332,28 @@ class TutorialBase {
     await this.takeScreenshot("checkNodeResults_after");
   }
 
+  async checkResults2(fileNames) {
+    try {
+      await this.takeScreenshot("checkResults_before");
+      const files = await this.__page.$$eval('[osparc-test-id="FolderViewerItem"]',
+        elements => elements.map(el => el.textContent.trim()));
+      assert(files.length === fileNames.length, 'Number of files is incorrect')
+      console.log('Number of files is correct')
+      assert(
+        fileNames.every(fileName => files.some(file => file.includes(fileName))),
+        'File names are incorrect'
+      )
+      console.log('File names are correct')
+    }
+    catch (err) {
+      throw(err)
+    }
+    finally {
+      await utils.waitAndClick(this.__page, '[osparc-test-id="nodeDataManagerCloseBtn"]');
+      await this.takeScreenshot("checkResults_after");
+    }
+  }
+
   async toDashboard() {
     await this.takeScreenshot("toDashboard_before");
     this.__responsesQueue.addResponseListener("projects");
@@ -383,6 +405,17 @@ class TutorialBase {
     await this.takeScreenshot("deleteFirstStudy_after");
   }
 
+  async removeStudy2(studyId) {
+    console.log(`Removing study ${studyId}`)
+    const resp = await this.__page.evaluate(async function(studyId) {
+      return await osparc.data.Resources.fetch('studies', 'delete', {
+        url: {
+          projectId: studyId
+        }
+      }, studyId);
+    }, studyId);
+  }
+
   async logOut() {
     await auto.logOut(this.__page);
   }
@@ -392,8 +425,10 @@ class TutorialBase {
     await this.__browser.close();
   }
 
-  async waitFor(waitFor) {
+  async waitFor(waitFor, reason) {
+    console.log(`Waiting for ${waitFor}ms. Reason: ${reason}`)
     await utils.sleep(waitFor);
+    await this.takeScreenshot('waitFor_finished')
   }
 
   async takeScreenshot(screenshotTitle) {
@@ -403,10 +438,6 @@ class TutorialBase {
       console.log("Backend Snapshot: ", snapshotUrl)
     }
 
-    if (this.__demo) {
-      return;
-    }
-
     let title = this.__templateName;
     if (screenshotTitle) {
       title += '_' + screenshotTitle;

tests/e2e/utils/auto.js

@@ -329,7 +329,7 @@ async function openNodeFiles(page) {
   await utils.waitAndClick(page, '[osparc-test-id="nodeViewFilesBtn"]')
 }
 
-async function checkDataProducedByNode(page, nFiles = 1) {
+async function checkDataProducedByNode(page, nFiles = 1, itemSuffix = 'NodeFiles') {
   console.log("checking Data produced by Node. Expecting", nFiles, "file(s)");
   const iconsContent = await page.waitForSelector('[osparc-test-id="FolderViewerIconsContent"]', {
     timeout: 5000

tests/e2e/utils/startPuppe.js

@@ -9,12 +9,13 @@ async function getBrowser(demo) {
       headless: false,
       devTools: true,
       defaultViewport: null, // Defaults to an 800x600 viewport. null disables the default viewport.
-      slowMo: 80 // Slows down Puppeteer operations by the specified amount of milliseconds.
+      slowMo: 80, // Slows down Puppeteer operations by the specified amount of milliseconds.
     };
     Object.assign(options, visibleOptions);
   }
   else {
     const woSandbox = {
+      defaultViewport: null,
       args: [
         '--no-sandbox',
         '--disable-setuid-sandbox',
@@ -82,11 +83,9 @@ function listenToEvents(page) {
 async function getPage(browser) {
   const page = await browser.newPage();
   page.setCacheEnabled(false);
-  // NOTE: activate to see what happens in puppeteer evaluate function
-  // page.on('console', consoleObj => console.log(consoleObj.text()));
   await page.setViewport({
-    width: 1920,
-    height: 1080
+    width: 1680,
+    height: 950
   });
   listenToEvents(page);
   return page;

tests/e2e/utils/utils.js

@@ -349,15 +349,14 @@ async function takeScreenshot(page, captureName = "") {
   filename = filename.split(":").join("-")
   filename = filename + ".jpg";
   const path = pathLib.join(__dirname, SCREENSHOTS_DIR, filename);
-  console.log(path);
-
   try {
     await page.screenshot({
       fullPage: true,
       path: path,
       type: 'jpeg',
       quality: 15
     })
+    console.log('screenshot taken', path);
   }
   catch (err) {
     console.error("Error taking screenshot", err);