e2e: Update TIP test (#4625)

Author: odeimaiz

tests/e2e/tutorials/ti-plan.js

@@ -27,7 +27,7 @@ async function runTutorial() {
     await tutorial.closeQuickStart();
 
     // create New Plan
-    const studyData = await tutorial.startNewPlan();
+    const studyData = await tutorial.startClassicTIPlan();
     studyId = studyData["data"]["uuid"];
 
     // check the app mode steps
@@ -40,8 +40,8 @@ async function runTutorial() {
     const workbenchData = utils.extractWorkbenchData(studyData["data"]);
     console.log(workbenchData);
     const esId = workbenchData["nodeIds"][0];
-    const tiId = workbenchData["nodeIds"][2];
-    const ppId = workbenchData["nodeIds"][3];
+    const tiId = workbenchData["nodeIds"][1];
+    const ppId = workbenchData["nodeIds"][2];
 
     // wait for the three services, except the optimizer
     await tutorial.waitForServices(
@@ -71,17 +71,8 @@ async function runTutorial() {
     await tutorial.waitFor(5000, "Finish Electrode Selector SetUp");
     await tutorial.takeScreenshot("electrodeSelector_after");
 
-    // Run optimizer
+    // ti-postpro
     await tutorial.waitAndClick("AppMode_NextBtn");
-    await tutorial.waitFor(5000, "Running Optimizer");
-    await tutorial.takeScreenshot("optimizer_before");
-    // one permutation should take less than 180"
-    await tutorial.waitForStudyDone(studyId, 480000);
-    await tutorial.takeScreenshot("optimizer_after");
-    await tutorial.waitAndClick("preparingInputsCloseBtn");
-    await tutorial.waitFor(2000, "Optimizer Finished");
-
-    // Load Post Pro Analysis
     await tutorial.takeScreenshot("postpro_start");
     // wait for iframe to be ready, it might take a while in Voila
     const postProIframe = await tutorial.waitForVoilaIframe(tiId);
@@ -90,15 +81,20 @@ async function runTutorial() {
 
     await tutorial.waitFor(5000, "Extra waiting to make sure, again, it renders");
 
+    // Click "Run optimization" button
+    const buttonsRunOptimization = await utils.getButtonsWithText(postProIframe, "Run Optimization");
+    await buttonsRunOptimization[0].click();
+    await tutorial.waitFor(20000, "Run Optimization");
+    await tutorial.takeScreenshot("postpro_run_optimization");
     // Click "Load Analysis" button
     const buttonsLoadAnalysis = await utils.getButtonsWithText(postProIframe, "Load Analysis");
     await buttonsLoadAnalysis[0].click();
-    await tutorial.waitFor(10000, "Loading anaylsis");
+    await tutorial.waitFor(20000, "Loading anaylsis");
     await tutorial.takeScreenshot("postpro_load_analysis");
     // Click on the first "Load" button
     const buttonsLoad = await utils.getButtonsWithText(postProIframe, "Load");
     await buttonsLoad[1].click();
-    await tutorial.waitFor(30000, "Loading Fields");
+    await tutorial.waitFor(20000, "Loading Fields");
     await tutorial.takeScreenshot("postpro_load_field");
     // Click on the "Add to Report" buttons
     const buttonsAddToReport = await utils.getButtonsWithText(postProIframe, "Add to Report");

tests/e2e/tutorials/tutorialBase.js

@@ -225,25 +225,25 @@ class TutorialBase {
     return resp;
   }
 
-  async startNewPlan() {
-    await this.takeScreenshot("startNewPlan_before");
+  async startClassicTIPlan() {
+    await this.takeScreenshot("startClassicTIPlan_before");
     this.__responsesQueue.addResponseListener("projects?from_study=");
     this.__responsesQueue.addResponseListener(":open");
     let resp = null;
     try {
       await this.waitFor(2000);
-      await auto.dashboardNewPlan(this.__page);
+      await auto.dashboardNewTIPlan(this.__page);
       await this.__responsesQueue.waitUntilResponse("projects?from_study=");
       resp = await this.__responsesQueue.waitUntilResponse(":open");
       const studyId = resp["data"]["uuid"];
       console.log("Study ID:", studyId);
     }
     catch (err) {
-      console.error(`New Plan could not be started:\n`, err);
+      console.error(`Classic TI could not be started:\n`, err);
       throw (err);
     }
     await this.waitFor(2000);
-    await this.takeScreenshot("startNewPlan_after");
+    await this.takeScreenshot("startClassicTIPlan_after");
     return resp;
   }
 

tests/e2e/utils/auto.js

@@ -109,7 +109,7 @@ async function __dashboardServicesBrowser(page) {
   await utils.waitAndClick(page, '[osparc-test-id="servicesTabBtn"]');
 }
 
-async function dashboardNewPlan(page) {
+async function dashboardNewTIPlan(page) {
   console.log("Creating New Plan");
 
   await dashboardStudiesBrowser(page);
@@ -405,7 +405,7 @@ module.exports = {
   dashboardAbout,
   dashboardStudiesBrowser,
   dashboardPreferences,
-  dashboardNewPlan,
+  dashboardNewTIPlan,
   dashboardStartSim4LifeLite,
   dashboardOpenFirstTemplate,
   dashboardOpenService,