@camperaid/watest 2.2.4 → 2.3.3

package/webdriver/driver_base.js

@@ -2,6 +2,7 @@
 
 const settings = require('../core/settings.js');
 
+const { is } = require('../core/base.js');
 const {
   core,
   fail,
@@ -13,11 +14,9 @@ const {
 } = require('../core/core.js');
 
 const { stringify } = require('../core/util.js');
-
-const { is } = require('../core/base.js');
-
-const { define_class_promise } = require('./util.js');
+const { log, log_error } = require('../logging/logging.js');
 const { LogPipe } = require('../logging/logpipe.js');
+const { define_class_promise } = require('./util.js');
 
 const {
   Browser,
@@ -75,7 +74,7 @@ class DriverBase {
    * Creates an instance of web driver.
    */
   static async build() {
-    console.log(`Build WebDriver for '${settings.webdriver}'`);
+    log(`Build WebDriver for '${settings.webdriver}'`);
 
     switch (settings.webdriver) {
       case 'chrome': {
@@ -767,7 +766,7 @@ class DriverBase {
         /(data:\S+?)(\s|:)(\d+):(\d+)/g,
         (match, p1, p2, p3, p4) => `dataurl-placeholder:${p3}:${p4}`
       );
-      console.log(`[${entry.level.name}] ${message}`);
+      log(`[${entry.level.name}] ${message}`);
     }
 
     let errors = entries.filter(entry => entry.level.name == 'SEVERE');
@@ -805,7 +804,7 @@ class DriverBase {
     return this.chain(() =>
       Promise.resolve()
         .then(() =>
-          console.log(`Test: ${msg}${(details && `. ${details}`) || ''}`)
+          log(`Test: ${msg}${(details && `. ${details}`) || ''}`)
         )
         .then(() => chain())
         .then(v => this.browserLogs().then(() => v))
@@ -834,14 +833,14 @@ class DriverBase {
             })
             .then(() => this.captureScreenshot())
             .catch(e => {
-              console.error(e);
+              log_error(e);
               fail(e.message);
             })
             .then(() => {
               let timeoutOnFailure = getTimeoutOnFailure();
               let promise = Promise.resolve();
               if (timeoutOnFailure > 0) {
-                console.log(`Sleeping for ${timeoutOnFailure} ms`);
+                log(`Sleeping for ${timeoutOnFailure} ms`);
                 promise = this.dvr.sleep(timeoutOnFailure);
               }
               return promise.then(() => {
@@ -859,11 +858,26 @@ class DriverBase {
    * Chains a function to the execution flow.
    */
   chain(link) {
-    return new this.constructor.CtorPromise(
+    let chainLink = new this.constructor.CtorPromise(
       this.p.then(link),
       this.dvr,
       this.options
     );
+
+    this.dvr.lastChainLink = chainLink;
+    chainLink.then(
+      () => {
+        if (this.dvr.lastChainLink == chainLink) {
+          this.dvr.lastChainLink = null;
+        }
+      },
+      () => {
+        if (this.dvr.lastChainLink == chainLink) {
+          this.dvr.lastChainLink = null;
+        }
+      }
+    );
+    return chainLink;
   }
 
   wrapScript(func) {

package/webdriver/session.js

@@ -1,12 +1,9 @@
 'use strict';
 
-const { assert, group, info } = require('../core/core.js');
+const { assert, group, fail, info } = require('../core/core.js');
+const { log, log_error } = require('../logging/logging.js');
 const { Driver } = require('./driver.js');
 
-const {
-  fail,
-} = require('../core/core.js');
-
 let active_sessions = [];
 
 /**
@@ -27,10 +24,10 @@ class Session {
     return session;
   }
 
-  constructor(d) {
-    assert(d, `Session: no driver`);
+  constructor(driver) {
+    assert(driver, `Session: no driver`);
     this.session_id = Math.floor(Math.random() * Math.pow(10, 8));
-    this.driver = d;
+    this.driver = driver;
     info(`Session ${this.session_id} open`);
   }
 
@@ -38,11 +35,11 @@ class Session {
    * Denotes a test task in console, a number of logically grouped test actions.
    */
   task(msg) {
-    console.log(`\x1b[34mTask:\x1b[0m ${msg}`);
+    log(`\x1b[34mTask:\x1b[0m ${msg}`);
   }
 
   subtask(msg) {
-    console.log(`\x1b[34mSubtask:\x1b[0m ${msg}`);
+    log(`\x1b[34mSubtask:\x1b[0m ${msg}`);
   }
 
   /**
@@ -167,10 +164,10 @@ const scope = (arg1, arg2, arg3) => async () => {
     }
     await tests(session);
   } catch (e) {
-    console.error(e);
+    log_error(e);
     fail(e.message);
   } finally {
-    console.log(`Quit ${active_sessions.length} wd session(s)`);
+    log(`Quit ${active_sessions.length} wd session(s)`);
 
     while (active_sessions.length > 1) {
       await active_sessions[1].close();