promod 0.0.26 → 0.0.30

package/built/swd/swd_client.js

@@ -219,6 +219,11 @@ class Browser {
         return executeScriptArgs;
     }
     async quit() {
+        if (this.drivers && this.drivers.length) {
+            const index = this.drivers.findIndex((driver) => driver === this.seleniumDriver);
+            if (index !== -1)
+                this.drivers.splice(index, 1);
+        }
         await this.seleniumDriver.quit();
         this.seleniumDriver = null;
     }
@@ -238,11 +243,6 @@ class Browser {
         }
     }
     async close() {
-        if (this.drivers.length) {
-            const index = this.drivers.findIndex((driver) => driver === this.seleniumDriver);
-            if (index !== -1)
-                this.drivers.splice(index, 1);
-        }
         await this.seleniumDriver.close();
     }
     actions() {

package/built/swd/swd_client.js.map

@@ -1 +1 @@
-{"version":3,"file":"swd_client.js","sourceRoot":"","sources":["../../lib/swd/swd_client.ts"],"names":[],"mappings":";;;AAAA,yCAAoG;AACpG,2DAAkD;AAElD,SAAS,yBAAyB,CAAC,YAAY;IAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,mBAAmB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC;IAC7G,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;QAC3B,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,YAAY,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAChF,IAAI,2BAAe,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACtC,MAAM,cAAc,GAAqC,UAAU,CAAC,KAAK,CAAC;YAE1E,iDAAiD;YACjD,KAAK,UAAU,oBAAoB,CAAC,GAAG,IAAI;gBAC1C,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;oBACzB,MAAM,IAAI,KAAK,CAAC;EACnB,GAAG;;MAEC,CAAC,CAAC;iBACH;gBAED,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;YAC3C,CAAC;YAED,MAAM,CAAC,cAAc,CAAC,oBAAoB,EAAE,MAAM,EAAE,EAAC,KAAK,EAAE,GAAG,EAAC,CAAC,CAAC;YAElE,UAAU,CAAC,KAAK,GAAG,oBAAoB,CAAC;YACxC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,SAAS,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;SAC/D;KACD;IACD,OAAO,IAAI,YAAY,EAAE,CAAC;AAC3B,CAAC;AAUD,MAAM,OAAO;IAQZ;QAPO,SAAI,GAAG,4BAAgB,CAAC;QAQ9B,IAAI,CAAC,IAAI,GAAG,4BAAgB,CAAC;IAC9B,CAAC;IAED,aAAa;QACZ,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,aAAa;QAClB,IAAI,CAAC,mBAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC3B,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;SAClB;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;SACrF;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAChD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,EAAC,KAAK,EAAE,QAAQ,KAA0C,EAAE;QACjF,IAAI,oBAAQ,CAAC,KAAK,CAAC,IAAI,mBAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,KAAK,EAAE;YAC5E,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC1C,OAAO;SACP;QAAC,IAAI,oBAAQ,CAAC,QAAQ,CAAC,EAAE;YACzB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;gBAClC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAC,KAAK,EAAE,QAAQ,EAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;gBACjH,IAAI,MAAM,EAAE;oBACX,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;oBAC7B,OAAO;iBACP;aACD;SACD;QAED,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACtE,CAAC;IAED,IAAI,kBAAkB,CAAC,aAAa;QACnC,IAAI,CAAC,gBAAgB,GAAG,aAAa,CAAC;IACvC,CAAC;IAED,SAAS,CAAC,MAAM;QACf,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;IAC9B,CAAC;IAGD,IAAI,GAAG;QACN,OAAO,wBAAG,CAAC;IACZ,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAED,IAAI,OAAO,CAAC,GAAG;QACd,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,kBAAkB;QAC9B,iCAAiC;QACjC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACrB,OAAO;SACP;QACD,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACvC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC9C,iDAAiD;QACjD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,SAAsB;QAC9C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACrB,IAAI,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;SAC7C;QACD,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAEO,KAAK,CAAC,yBAAyB;QACtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;QACpD,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,MAAsC,EAAE,OAAkB;QAC3F,OAAO,GAAG,OAAO,IAAI,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAC1C,KAAK,MAAM,YAAY,IAAI,OAAO,EAAE;YACnC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC3C,MAAM,MAAM,EAAE,CAAC;SACf;IACF,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,kBAAkB,CAAC,SAAsB;QACtD,MAAM,EAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,EAAC,GAAG,SAAS,CAAC;QACnE,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAChC,IAAI,oBAAQ,CAAC,gBAAgB,CAAC,EAAE;YAC/B,MAAM,4BAAgB,CAAC,KAAK,IAAI,EAAE;gBACjC,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;gBAC5B,OAAO,IAAI,CAAC,MAAM,KAAK,gBAAgB,CAAC;YACzC,CAAC,EACA,EAAC,OAAO,EAAE,qBAAqB,gBAAgB,8DAA8D,EAAE,OAAO,EAAC,CACvH,CAAC;SACF;QAED,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,IAAI,KAAK,EAAE;gBACV,MAAM,4BAAgB,CAAC,KAAK,IAAI,EAAE;oBACjC,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;oBAC5B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;wBACvB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;wBAClC,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE,KAAK,KAAK,EAAE;4BACpC,OAAO,IAAI,CAAC;yBACZ;qBACD;gBACF,CAAC,EAAE,EAAC,OAAO,EAAE,eAAe,KAAK,+BAA+B,OAAO,GAAG,EAAE,OAAO,EAAC,CAAC,CAAC;aACtF;iBAAM;gBACN,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;aAC1C;SACD;aAAM;YACN,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SACtC;IACF,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,aAAa;QAClB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,cAAc;QACnB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,OAAO;QACZ,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,OAAO;QACZ,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,aAAa;QAClB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACpB,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAEpC,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,MAAc;QAChD,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE;aAChD,OAAO,CAAC;YACR,KAAK;YACL,MAAM;SACN,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAY;QACvB,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IACrE,CAAC;IAED,MAAM;QACL,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAAW,EAAE,GAAG,IAAW;QAC9C,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,MAAM,EAAE,GAAG,cAAc,CAAC,CAAC;QAE/E,OAAO,GAAG,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,MAAW,EAAE,GAAG,IAAW;QACnD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,CAAC;QAE1D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,MAAM,EAAE,GAAG,cAAc,CAAC,CAAC;QAEpF,OAAO,GAAG,CAAC;IACZ,CAAC;IAED,QAAQ;QACP,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;IACvC,CAAC;IAED,QAAQ;QACP,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;IACvC,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,GAAG,IAAI;QACnC,MAAM,iBAAiB,GAAG,EAAE,CAAC;QAE7B,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;YACxB,MAAM,YAAY,GAAG,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;YAEzD,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;gBAChC,MAAM,UAAU,GAAG,EAAE,CAAC;gBAEtB,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE;oBACnC,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;wBACvB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;wBAElE,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;qBAC5B;yBAAM;wBACN,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;qBACzB;iBACD;gBACD,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aACnC;iBAAM,IAAI,YAAY,IAAI,YAAY,CAAC,6BAA6B,EAAE;gBACtE,iBAAiB,CAAC,IAAI,CAAC,MAAM,YAAY,CAAC,6BAA6B,EAAE,CAAC,CAAC;aAC3E;iBAAM;gBACN,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC7B;SACD;QAED,OAAO,iBAAiB,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,IAAI;QACT,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QACjC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,OAAO;QACZ,IAAI,mBAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACjD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;gBAClC,IAAI,IAAI,CAAC,cAAc,KAAK,MAAM,EAAE;oBACnC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;iBAC3B;gBACD,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;aACpB;SACD;QACD,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,IAAI,CAAC,cAAc,EAAE;YACxB,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YACjC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;SAC3B;IACF,CAAC;IAED,KAAK,CAAC,KAAK;QACV,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACxB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,IAAI,CAAC,cAAc,CAAC,CAAC;YACjF,IAAI,KAAK,KAAK,CAAC,CAAC;gBAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SAChD;QACD,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;IACnC,CAAC;IAED,OAAO;QACN,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;IACnD,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,IAAI;QAC5C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnC,MAAM,UAAU,GAAG;YAClB,qCAAqC,EAAE,OAAO;YAC9C,OAAO,EAAE,OAAO;SAChB,CAAC;QAEF,OAAO,UAAU,CAAC;IACnB,CAAC;IAEO,UAAU,CAAC,SAAiB;QACnC,IAAI,QAAQ,CAAC;QAEb,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YACnD,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;YAC5B,MAAM,IAAI,GAAG,SAAS,CAAC;YAEvB,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBAC9C,QAAQ,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC;aAC9C;iBAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACtD,QAAQ,GAAG,GAAG,GAAG,GAAG,IAAI,EAAE,CAAC;aAC3B;iBAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACtD,QAAQ,GAAG,GAAG,GAAG,GAAG,IAAI,EAAE,CAAC;aAC3B;iBAAM;gBACN,QAAQ,GAAG,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;aAC5B;SACD;aAAM,IAAI,SAAS,KAAK,EAAE,IAAI,SAAS,KAAK,GAAG,EAAE;YACjD,OAAO,IAAI,CAAC,OAAO,CAAC;SACpB;aAAM;YACN,QAAQ,GAAG,SAAS,CAAC;SACrB;QAED,OAAO,QAAQ,CAAC;IACjB,CAAC;CACD;AAMA,0BAAO;AAJR,MAAM,OAAO,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAC;AAGlD,0BAAO"}
+{"version":3,"file":"swd_client.js","sourceRoot":"","sources":["../../lib/swd/swd_client.ts"],"names":[],"mappings":"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"}

package/built/swd/swd_element.js

@@ -193,11 +193,7 @@ class PromodSeleniumElement {
      * const buttonIsDisplayed = await button.isDisplayed();
      */
     async isDisplayed() {
-        const result = await this.getElement().catch(() => false);
-        if (sat_utils_1.isBoolean(result) && !result) {
-            return false;
-        }
-        return this.wdElement.isDisplayed().then((res) => res, () => false);
+        return this.getElement().then(() => this.wdElement.isDisplayed()).catch(() => false);
     }
     /**
      * @returns {Promise<boolean>} button is present

package/built/swd/swd_element.js.map

@@ -1 +1 @@
-{"version":3,"file":"swd_element.js","sourceRoot":"","sources":["../../lib/swd/swd_element.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,yCAAqE;AACrE,2DAA6D;AAmUC,mFAnUtD,uBAAE,OAmUsD;AAlUhE,6CAAqC;AAErC,SAAS,yBAAyB,CAAC,OAAO;IACzC,MAAM,UAAU,GAAG;QAClB,qCAAqC,EAAE,OAAO;QAC9C,OAAO,EAAE,OAAO;KAChB,CAAC;IACF,OAAO,UAAU,CAAC;AACnB,CAAC;AAED,MAAM,OAAO,GAAG,CAAC,QAAqB,EAAE,oBAAkC,EAAO,EAAE;IAClF,IAAI,QAAQ,YAAY,uBAAE,EAAE;QAC3B,OAAO,QAAQ,CAAC;KAChB;IAED,oBAAoB,GAAG,sBAAU,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAE5F,IAAI,oBAAQ,CAAC,QAAQ,CAAC,IAAK,QAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAClE,OAAO,uBAAE,CAAC,KAAK,CAAE,QAAmB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;KAC5D;SAAM,IAAI,oBAAQ,CAAC,QAAQ,CAAC,IAAK,QAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACtE,OAAO,uBAAE,CAAC,EAAE,CAAE,QAAmB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,GAAG,oBAAoB,EAAE,CAAC,CAAC;KACjF;SAAM,IAAI,qBAAS,CAAC,QAAQ,CAAC,EAAE;QAC/B,OAAO,QAAQ,CAAC;KAChB;SAAM,IAAI,sBAAU,CAAC,QAAQ,CAAC,EAAE;QAChC,OAAO,uBAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,oBAAoB,EAAE,CAAC,CAAC;KAClD;IAED,OAAO,uBAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACzB,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG;IAC5B,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS;IAC7E,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,aAAa;CACtF,CAAC;AAEF,MAAM,sBAAsB;IAQ3B,YAAY,QAAQ,EAAE,MAAM,EAAE,SAAU,EAAE,oBAAqB;QAC9D,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IAClD,CAAC;IAED,iBAAiB,CAAC,MAAiB;QAClC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;IAC9B,CAAC;IAED,GAAG,CAAC,KAAK;QACR,MAAM,YAAY,GAAG,IAAI,qBAAqB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAClI,IAAI,IAAI,CAAC,cAAc,EAAE;YACxB,YAAY,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,QAAQ,CAAC;SACnE;QACD,OAAO,YAAmB,CAAC;IAC5B,CAAC;IAED,IAAI;QACH,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAQ,CAAC;IAC5B,CAAC;IAED,KAAK;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAQ,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,KAAM;QAC9B,IAAI,CAAC,cAAc,GAAG,oBAAO,CAAC,aAAa,EAAE,CAAC;QAE9C,IAAI,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YAEpC,IAAI,MAAM,CAAC,mBAAmB,EAAE;gBAC/B,aAAa;gBACb,MAAM,GAAG,MAAM,MAAM,CAAC,mBAAmB,EAAE,CAAC;aAC5C;YAED,IAAI,CAAC,UAAU,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;SAC/F;aAAM;YACN,IAAI,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;SAC5G;QAED,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YACjB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SACnD;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,MAAM;QACX,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,aAAa;QACb,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,6BAA6B;QAClC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QAEhC,OAAO,GAAG,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IAC3C,CAAC;IAGD,KAAK,CAAC,IAAI,CAAC,EAAsE;QAChF,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAEzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAChD,MAAM,EAAE,CAAC,IAAI,qBAAqB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAQ,EAAE,CAAC,CAAC,CAAC;SACxH;IACF,CAAC;IAED,KAAK,CAAC,KAAK;QACV,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IAC/B,CAAC;CACD;AA4MqC,wDAAsB;AA1M5D,MAAM,qBAAqB;IAS1B,YAAY,QAAQ,EAAE,MAAM,EAAE,SAAU,EAAE,oBAAqB,EAAE,SAAU;QAC1E,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,MAAM,IAAI,GAAG,IAAI,CAAC;QAElB,oBAAoB,CAAC,OAAO,CAAC,UAAS,UAAU;YAC/C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;gBACrC,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC;gBAE9E,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACvC,CAAC,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,iBAAiB,CAAC,MAAM;QACvB,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;IAC9B,CAAC;IAED,CAAC,CAAC,QAAQ;QACT,MAAM,YAAY,GAAG,IAAI,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1G,YAAY,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC5C,OAAO,YAAmB,CAAC;IAC5B,CAAC;IAED,EAAE,CAAC,QAAQ;QACV,MAAM,aAAa,GAAG,IAAI,sBAAsB,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5G,aAAa,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC7C,OAAO,aAAoB,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,6BAA6B;QAClC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QAE9B,OAAO,yBAAyB,CAAC,EAAE,CAAC,CAAC;IACtC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK,CAAC,UAAoB;QAC/B,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,IAAI,UAAU,EAAE;YACf,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE;iBACxD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;iBAC1H,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;iBAC5H,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC;iBAClB,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;YAEtB,IAAI,qBAAqB,EAAE;gBAC1B,MAAM,qBAAqB,CAAC;aAC5B;SACD;aAAM;YACN,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;SAC9B;IACF,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,QAA0B;QAC9C,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;;;;;;;;KAQrC,EAAE,IAAI,CAAC,mBAAmB,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,UAAU;QACf,IAAI,CAAC,cAAc,GAAG,oBAAO,CAAC,aAAa,EAAE,CAAC;QAC9C,IAAI,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAS,CAAC;YAC3C,IAAI,CAAC,MAAM,EAAE;gBACZ,MAAM,IAAI,KAAK,CACd,IAAI,CAAC,SAAS;oBACb,CAAC,CAAC,6BAA6B,IAAI,CAAC,QAAQ,gBAAgB;oBAC5D,CAAC,CAAC,gCAAgC,IAAI,CAAC,cAAc,gBAAgB,CACtE,CAAC;aACF;YACD,IAAI,MAAM,CAAC,mBAAmB,EAAE;gBAC/B,MAAM,GAAG,MAAM,MAAM,CAAC,mBAAmB,EAAE,CAAC;aAC5C;YAED,IAAI,IAAI,CAAC,SAAS,EAAE;gBACnB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;aACxB;iBAAM;gBACN,IAAI,CAAC,SAAS,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;aAC7F;SAED;aAAM;YACN,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;SAC1G;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,WAAW;QAChB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QAC1D,IAAI,qBAAS,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE;YACjC,OAAO,KAAK,CAAC;SACb;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;IACrE,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,SAAS;QACd,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;IAC/D,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,MAAM;QACrC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAExB,OAAO,MAAM,EAAE,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,KAAK;QACV,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,aAAa;QACb,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAExB,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED,OAAO;QACN,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,IAAI,CAAC,cAAc,EAAE;YACxB,YAAY,IAAI,YAAY,IAAI,CAAC,cAAc,GAAG,CAAC;SACnD;QACD,OAAO,EAAC,KAAK,EAAE,GAAG,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,EAAC,CAAC;IACnD,CAAC;IAEO,wBAAwB,CAAC,GAAG;QACnC,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC;IAC7D,CAAC;CACD;AAsCc,sDAAqB;AAnCpC,SAAS,kBAAkB,CAAC,QAAgE,EAAE,IAAgC,EAAE,GAAG,IAAW;IAC7I,IAAI,SAAS,GAAG,IAAI,CAAC;IACrB,IAAI,oBAAoB,GAAG,IAAI,CAAC;IAEhC;;;OAGG;IAEH,IAAI,CAAC,oBAAQ,CAAC,QAAQ,CAAC,IAAK,QAAmB,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,sBAAU,CAAC,QAAQ,CAAC,IAAI,qBAAS,CAAC,QAAQ,CAAC,EAAE;QACrH,oBAAoB,GAAG,SAAS,oBAAoB;YACnD,OAAO,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;QACxB,CAAC,CAAC;KACF;SAAM,IAAI,IAAI,IAAI,IAAI,YAAY,qBAAqB,EAAE;QACzD,SAAS,GAAG,SAAS,SAAS;YAC7B,OAAO,IAAI,CAAC;QACb,CAAC,CAAC;KACF;IAED,OAAO,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,CAAC,GAAG,CAAC,QAAgE,EAAE,IAAsC,EAAE,GAAG,IAAW,EAA6B,EAAE;IACjK,MAAM,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;IAE7D,OAAO,IAAI,qBAAqB,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAQ,CAAC;AACtE,CAAC,CAAC;AASM,cAAC;AANT,MAAM,EAAE,GAAG,CAAC,QAAgE,EAAE,IAAsC,EAAE,GAAG,IAAW,EAA8B,EAAE;IACnK,MAAM,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;IAE7D,OAAO,IAAI,sBAAsB,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAQ,CAAC;AACvE,CAAC,CAAC;AAES,gBAAE"}
+{"version":3,"file":"swd_element.js","sourceRoot":"","sources":["../../lib/swd/swd_element.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "promod",
-  "version": "0.0.26",
+  "version": "0.0.30",
   "description": "Library for automation testing",
   "main": "./built/index.js",
   "scripts": {
@@ -48,8 +48,8 @@
   ],
   "dependencies": {
     "@types/selenium-webdriver": "^4.0.15",
-    "sat-utils": "0.0.17",
+    "sat-utils": "^0.0.25",
     "selenium-standalone": "^7.1.0",
-    "selenium-webdriver": "^4.0.0-rc-1"
+    "selenium-webdriver": "^4.0.0"
   }
 }

package/specs/base.spec.ts

@@ -1,3 +1,4 @@
+import {By, WebDriver, until, Key} from 'selenium-webdriver';
 import {expect} from 'assertior';
 import {seleniumWD} from '../lib/index';
 
@@ -5,7 +6,7 @@ describe('Base', () => {
 	const {$, $$, getSeleniumDriver, browser} = seleniumWD;
 
 	beforeEach(async () => {
-		await getSeleniumDriver({seleniumAddress: 'http://localhost:4444/wd/hub'}, browser);
+		await getSeleniumDriver(browser);
 		await browser.get('http://localhost:4000/');
 	});
 
@@ -13,6 +14,13 @@ describe('Base', () => {
 		await browser.quitAll();
 	});
 
+	it('isDisplayed', async () => {
+		const email = $('input[placeholder="Ім\'я lol"]');
+
+		expect(await email.isDisplayed()).toEqual(false);
+		expect(await email.isPresent()).toEqual(false);
+	});
+
 	it('several browsers', async () => {
 		const email = $('input[placeholder="Ім\'я користувача"]');
 		const pass = $('input[placeholder="пароль"]');
@@ -36,12 +44,13 @@ describe('Base', () => {
 		expect(await pass.isDisplayed()).toEqual(true);
 	});
 
-	it('element click/sendKeys', async () => {
+	it.only('element click/sendKeys', async () => {
 		const email = $('input[placeholder="Ім\'я користувача"]');
 		const pass = $('input[placeholder="пароль"]');
 		const signIn = $('.login_form .btn-primary');
-		await email.sendKeys('admin');
-		await pass.sendKeys('admin');
+		await browser.actions().keyDown(Key.SHIFT).perform();
+		await email.sendKeys(`${Key.SHIFT}a`);
+		await browser.sleep(12000);
 		await signIn.click(true);
 	});
 

package/lib/index.ts

@@ -1,5 +0,0 @@
-export * from './swd';
-export * from './swd/config';
-// for types
-export {PromodSeleniumElementType, PromodSeleniumElementsType} from './swd/swd_element';
-export {Browser} from './swd/swd_client';

package/lib/swd/config/config.ts

@@ -1,51 +0,0 @@
-import {isString, isUndefined} from 'sat-utils';
-import * as fs from 'fs';
-
-const checkPathes = ['seleniumServerJar', 'chromeDriver', 'geckoDriver'];
-const checkString = ['seleniumAddress', 'seleniumSessionId', 'baseUrl'];
-
-export type BaseConf = {
-	[key: string]: any;
-	localSeleniumStandaloneOpts?: {
-		port?: number | string;
-		args?: string[];
-		jvmArgs?: string[];
-	};
-	// Selenium drivers options
-	seleniumServerJar?: string;
-	chromeDriver?: string;
-	geckoDriver?: string;
-
-	seleniumAddress?: string;
-	seleniumSessionId?: string;
-	// Browser capabilities
-	capabilities?: {
-		[key: string]: any;
-		browserName?: string;
-	};
-	// Opts
-	baseUrl?: string;
-}
-
-function validateSeleniumConf(configObj: BaseConf) {
-	const configKeys = Object.keys(configObj);
-	for (const key of configKeys) {
-		if ((checkPathes.includes(key) || checkString.includes(key)) && (!isString(configObj[key]) && !isUndefined(configObj[key]))) {
-			throw new TypeError(`
-config: ${key} value should be a string,
-please use BaseConf type or visit https://github.com/Simple-Automation-Testing/promod/blob/master/lib/swd/config/config.ts
-			`);
-		}
-
-		if (checkPathes.includes(key) && (!isUndefined(configObj[key]) && isString(configObj[key]) && !fs.existsSync(configObj[key]))) {
-			throw new TypeError(`
-config: ${key} ${configObj[key]} file does not exist
-please use BaseConf type or visit https://github.com/Simple-Automation-Testing/promod/blob/master/lib/swd/config/config.ts
-			`);
-		}
-	}
-}
-
-export {
-	validateSeleniumConf
-};

package/lib/swd/config/index.ts

@@ -1 +0,0 @@
-export * from './config';

package/lib/swd/driver/index.ts

@@ -1,42 +0,0 @@
-import {WebDriver} from 'selenium-webdriver';
-import {getDriver} from './remote';
-import {BaseConf} from '../config/config';
-import {Browser} from '../swd_client';
-import {validateSeleniumConf} from '../config';
-
-async function getSeleniumDriver(config: BaseConf | Browser = {}, browser?: Browser): Promise<WebDriver> {
-	let _config;
-	let _browser;
-
-	if (config instanceof Browser && arguments.length === 1) {
-		_browser = config;
-		_config = {};
-	} else {
-		_browser = browser;
-		_config = config;
-	}
-
-	// validate config
-	validateSeleniumConf(_config);
-
-	const driver = await getDriver(_config);
-
-	/**
-	 * @info
-	 * init creations of the new driver
-	 * and init current driver
-	 */
-
-	_browser.setCreateNewDriver = () => getDriver(_config);
-	_browser.setClient(driver);
-
-	if (config.baseUrl) {
-		_browser.baseUrl = config.baseUrl;
-	}
-
-	return driver;
-}
-
-export {
-	getSeleniumDriver
-};

package/lib/swd/driver/local.ts

@@ -1,142 +0,0 @@
-import * as fs from 'fs';
-import * as computeFsPaths from 'selenium-standalone/lib/compute-fs-paths';
-import * as standAloneDefaultConfig from 'selenium-standalone/lib/default-config';
-
-import {SeleniumServer} from 'selenium-webdriver/remote';
-
-function getOptsData(opts: {[k: string]: any} = {}) {
-	const defaultConfig = standAloneDefaultConfig();
-
-	if (!opts.version) {
-		opts.version = defaultConfig.version;
-	}
-
-	if (opts.drivers) {
-		opts.drivers = Object.keys(opts.drivers).reduce((config, driverName) => {
-			config[driverName] = Object.assign({}, defaultConfig.drivers[driverName], opts.drivers[driverName]);
-			return config;
-		}, {});
-	} else {
-		opts.drivers = defaultConfig.drivers;
-	}
-
-	const fsPaths = computeFsPaths({
-		seleniumVersion: opts.version,
-		drivers: opts.drivers,
-		basePath: opts.basePath,
-	});
-	return fsPaths;
-}
-
-const throwInstructionError = (additional = '') => {
-	throw new Error(`${additional}Run 'selenium-standalone install' to download browser drivers and selenium standalone server.`);
-};
-
-const checkIfUpdateRequired = (driverName, opts) => {
-	if (driverName === 'selenium') {
-		if (!fs.existsSync(getOptsData(opts).selenium.installPath)) {
-			throwInstructionError();
-		}
-	}
-
-	if (driverName === 'chrome') {
-		if (!fs.existsSync(getOptsData(opts).chrome.installPath)) {
-			throwInstructionError();
-		}
-	}
-
-	if (driverName === 'firefox') {
-		if (!fs.existsSync(getOptsData(opts).firefox.installPath)) {
-			throwInstructionError();
-		}
-	}
-};
-
-const checkIfDriverOrServerExists = (pathTo) => {
-	if (!fs.existsSync(pathTo)) {
-		throwInstructionError(`${pathTo} does not exists \n`);
-	}
-};
-
-const getCombinedConfig = (config: any = {}) => {
-	const combinedConfig = config;
-
-	if (!config.seleniumServerStartTimeout) {
-		config.seleniumServerStartTimeout = 30000;
-	}
-
-	combinedConfig.capabilities =
-		combinedConfig.capabilities.map_ instanceof Map
-			? Object.fromEntries(combinedConfig.capabilities.map_)
-			: combinedConfig.capabilities;
-
-	if (!combinedConfig.seleniumServerJar) {
-		checkIfUpdateRequired('selenium', config.selenium);
-		const pathToServer = getOptsData(config.selenium).selenium.installPath;
-
-		checkIfDriverOrServerExists(pathToServer);
-		combinedConfig.seleniumServerJar = pathToServer;
-	}
-
-	if (!combinedConfig.chromeDriver && combinedConfig.capabilities.browserName === 'chrome') {
-		checkIfUpdateRequired('chrome', config.selenium);
-		const pathToChromedriver = getOptsData(config.selenium).chrome.installPath;
-
-		checkIfDriverOrServerExists(pathToChromedriver);
-		combinedConfig.chromeDriver = pathToChromedriver;
-	}
-
-	if (!combinedConfig.geckoDriver && combinedConfig.capabilities.browserName === 'firefox') {
-		checkIfUpdateRequired('firefox', config.selenium);
-		const pathTogeckoDriver = getOptsData(config.selenium).firefox.installPath;
-
-		checkIfDriverOrServerExists(pathTogeckoDriver);
-		combinedConfig.geckoDriver = pathTogeckoDriver;
-	}
-
-	return combinedConfig;
-};
-
-const runLocalEnv = async (config) => {
-	if (config.seleniumAddress) {
-		return config;
-	}
-	const combinedConfig = getCombinedConfig(config);
-
-	const serverConf = combinedConfig.localSeleniumStandaloneOpts || {};
-
-	if (!serverConf.args) {
-		serverConf.args = combinedConfig.seleniumArgs || [];
-	}
-	if (!serverConf.jvmArgs) {
-		serverConf.jvmArgs = combinedConfig.jvmArgs || [];
-	} else if (!Array.isArray(serverConf.jvmArgs)) {
-		throw new TypeError('jvmArgs should be an array.');
-	}
-	if (!serverConf.port) {
-		serverConf.port = combinedConfig.seleniumPort;
-	}
-
-	if (combinedConfig.chromeDriver) {
-		serverConf.jvmArgs.push(`-Dwebdriver.chrome.driver=${combinedConfig.chromeDriver}`);
-	}
-	if (combinedConfig.geckoDriver) {
-		serverConf.jvmArgs.push(`-Dwebdriver.gecko.driver=${combinedConfig.geckoDriver}`);
-	}
-
-	const server = new SeleniumServer(combinedConfig.seleniumServerJar, serverConf);
-
-	await server.start(combinedConfig.seleniumServerStartTimeout);
-
-	const address = await server.address();
-
-	return {
-		server,
-		seleniumAddress: address,
-		capabilities: combinedConfig.capabilities,
-	};
-};
-
-export {
-	runLocalEnv,
-};

package/lib/swd/driver/remote.ts

@@ -1,35 +0,0 @@
-import {Builder, Capabilities, WebDriver} from 'selenium-webdriver';
-import * as _http from 'selenium-webdriver/http';
-
-import {runLocalEnv} from './local';
-
-const getDriver = async (config) => {
-	const combinedConfig = config || {capabilities: Capabilities.chrome()};
-	if (!combinedConfig.capabilities) {
-		combinedConfig.capabilities = Capabilities.chrome();
-	}
-
-	if (config.seleniumSessionId) {
-		return await new WebDriver(
-			config.seleniumSessionId,
-			new _http.Executor(Promise.resolve(config.seleniumAddress)
-				.then((url) => new _http.HttpClient(url, null, null)))
-		);
-	}
-
-	const {
-		seleniumAddress,
-		capabilities = Capabilities.chrome(),
-	} = await runLocalEnv(combinedConfig);
-
-	const driver = new Builder()
-		.usingServer(seleniumAddress)
-		.withCapabilities(capabilities)
-		.build();
-
-	return driver;
-};
-
-export {
-	getDriver,
-};

package/lib/swd/index.ts

@@ -1,17 +0,0 @@
-import {getSeleniumDriver} from './driver';
-import {$, $$, PromodSeleniumElement, PromodSeleniumElements, By} from './swd_element';
-import {browser} from './swd_client';
-
-const seleniumWD = {
-	getSeleniumDriver,
-	browser,
-	$,
-	$$,
-	By,
-	PromodSeleniumElement,
-	PromodSeleniumElements,
-};
-
-export {
-	seleniumWD,
-};

package/lib/swd/swd_client.ts

@@ -1,351 +0,0 @@
-import {isArray, isPromise, waitForCondition, isNumber, isAsyncFunction, isString} from 'sat-utils';
-import {WebDriver, Key} from 'selenium-webdriver';
-
-function validateBrowserCallMethod(browserClass): Browser {
-	const protKeys = Object.getOwnPropertyNames(browserClass.prototype).filter((item) => item !== 'constructor');
-	for (const key of protKeys) {
-		const descriptor = Object.getOwnPropertyDescriptor(browserClass.prototype, key);
-		if (isAsyncFunction(descriptor.value)) {
-			const originalMethod: (...args: any[]) => Promise<any> = descriptor.value;
-
-			// eslint-disable-next-line no-inner-declarations
-			async function decoratedWithChecker(...args) {
-				if (!this.seleniumDriver) {
-					throw new Error(`
-${key}(): Seems like driver was not initialized, please check how or where did you call getSeleniumDriver function
-or visit https://github.com/Simple-Automation-Testing/promod/blob/master/docs/init.md#getseleniumdriver
-					`);
-				}
-
-				return originalMethod.call(this, ...args);
-			}
-
-			Object.defineProperty(decoratedWithChecker, 'name', {value: key});
-
-			descriptor.value = decoratedWithChecker;
-			Object.defineProperty(browserClass.prototype, key, descriptor);
-		}
-	}
-	return new browserClass();
-}
-
-
-interface IBrowserTab {
-	index?: number;
-	expectedQuantity?: number;
-	title?: string;
-	timeout?: number;
-}
-
-class Browser {
-	public wait = waitForCondition;
-	public seleniumDriver: WebDriver;
-	private appBaseUrl: string;
-	private initialTab: any;
-	private drivers: WebDriver[];
-	private _createNewDriver: () => Promise<WebDriver>;
-
-	constructor() {
-		this.wait = waitForCondition;
-	}
-
-	currentClient() {
-		return this.seleniumDriver;
-	}
-
-	async runNewBrowser() {
-		if (!isArray(this.drivers)) {
-			this.drivers = [];
-		}
-		this.drivers.push(this.seleniumDriver);
-		if (!this._createNewDriver) {
-			throw new Error('createNewDriver(): seems like create driver method was not inited');
-		}
-
-		const newDriver = await this._createNewDriver();
-		this.drivers.push(newDriver);
-		this.seleniumDriver = newDriver;
-	}
-
-	async switchToBrowser({index, tabTitle}: {index?: number; tabTitle?: string;} = {}) {
-		if (isNumber(index) && isArray(this.drivers) && this.drivers.length > index) {
-			this.seleniumDriver = this.drivers[index];
-			return;
-		} if (isString(tabTitle)) {
-			for (const driver of this.drivers) {
-				const result = await this.switchToBrowserTab({title: tabTitle}).then(() => true, () => false).catch(() => false);
-				if (result) {
-					this.seleniumDriver = driver;
-					return;
-				}
-			}
-		}
-
-		throw new Error(`switchToBrowser(): required browser was not found`);
-	}
-
-	set setCreateNewDriver(driverCreator) {
-		this._createNewDriver = driverCreator;
-	}
-
-	setClient(client) {
-		this.seleniumDriver = client;
-	}
-
-
-	get Key() {
-		return Key;
-	}
-
-	get baseUrl() {
-		return this.appBaseUrl;
-	}
-
-	set baseUrl(url) {
-		this.appBaseUrl = url;
-	}
-
-	public async returnToInitialTab() {
-		// there was no switching in test
-		if (!this.initialTab) {
-			return;
-		}
-		await this.closeAllTabsExceptInitial();
-		await this.switchTo().window(this.initialTab);
-		// set initialTab to null for further "it" to use
-		this.initialTab = null;
-	}
-
-	public async switchToTab(tabObject: IBrowserTab) {
-		if (!this.initialTab) {
-			this.initialTab = await this.getCurrentTab();
-		}
-		await this.switchToBrowserTab(tabObject);
-	}
-
-	private async closeAllTabsExceptInitial() {
-		const handles = await this.getTabs();
-		handles.splice(handles.indexOf(this.initialTab), 1);
-		await this.makeActionAtEveryTab(async () => this.close(), handles);
-	}
-
-	public async makeActionAtEveryTab(action: (...args: any) => Promise<any>, handles?: string[]) {
-		handles = handles || await this.getTabs();
-		for (const windowHandle of handles) {
-			await this.switchTo().window(windowHandle);
-			await action();
-		}
-	}
-
-	/**
-	 * switchToBrowserTab
-	 * @private
-	 */
-	private async switchToBrowserTab(tabObject: IBrowserTab) {
-		const {index, expectedQuantity, title, timeout = 5000} = tabObject;
-		let tabs = await this.getTabs();
-		if (isNumber(expectedQuantity)) {
-			await waitForCondition(async () => {
-				tabs = await this.getTabs();
-				return tabs.length === expectedQuantity;
-			},
-				{message: `Couldn't wait for ${expectedQuantity} tab(s) to appear. Probably you should pass expectedQuantity`, timeout}
-			);
-		}
-
-		if (tabs.length > 1) {
-			if (title) {
-				await waitForCondition(async () => {
-					tabs = await this.getTabs();
-					for (const tab of tabs) {
-						await this.switchTo().window(tab);
-						if (await this.getTitle() === title) {
-							return true;
-						}
-					}
-				}, {message: `Window with ${title} title was not found during ${timeout}.`, timeout});
-			} else {
-				await this.switchTo().window(tabs[index]);
-			}
-		} else {
-			await this.switchTo().window(tabs[0]);
-		}
-	}
-
-	async getTitle() {
-		return await this.seleniumDriver.getTitle();
-	}
-
-	async getCurrentUrl() {
-		return await this.seleniumDriver.getCurrentUrl();
-	}
-
-	async takeScreenshot() {
-		return await this.seleniumDriver.takeScreenshot();
-	}
-
-	async refresh() {
-		return await this.seleniumDriver.navigate().refresh();
-	}
-
-	async tabTitle() {
-		return await this.seleniumDriver.getTitle();
-	}
-
-	async getTabs() {
-		return await this.seleniumDriver.getAllWindowHandles();
-	}
-
-	async getCurrentTab() {
-		return await this.seleniumDriver.getWindowHandle();
-	}
-
-	async get(url: string) {
-		const getUrl = this.resolveUrl(url);
-
-		return await this.seleniumDriver.get(getUrl);
-	}
-
-	async setWindowSize(width: number, height: number) {
-		return await this.seleniumDriver.manage().window()
-			.setRect({
-				width,
-				height,
-			});
-	}
-
-	async sleep(time: number) {
-		await (() => new Promise((resolve) => setTimeout(resolve, time)))();
-	}
-
-	manage() {
-		return this.seleniumDriver.manage();
-	}
-
-	async executeScript(script: any, ...args: any[]): Promise<any> {
-		const recomposedArgs = await this.toSeleniumArgs(...args);
-		const res = await this.seleniumDriver.executeScript(script, ...recomposedArgs);
-
-		return res;
-	}
-
-	async executeAsyncScript(script: any, ...args: any[]): Promise<any> {
-		const recomposedArgs = await this.toSeleniumArgs(...args);
-
-		const res = await this.seleniumDriver.executeAsyncScript(script, ...recomposedArgs);
-
-		return res;
-	}
-
-	navigate() {
-		return this.seleniumDriver.navigate();
-	}
-
-	switchTo() {
-		return this.seleniumDriver.switchTo();
-	}
-
-	private async toSeleniumArgs(...args) {
-		const executeScriptArgs = [];
-
-		for (const item of args) {
-			const resolvedItem = isPromise(item) ? await item : item;
-
-			if (Array.isArray(resolvedItem)) {
-				const arrayItems = [];
-
-				for (const itemArr of resolvedItem) {
-					if (item && item.getId) {
-						const elementObj = await this.getSeleniumProtocolElement(itemArr);
-
-						arrayItems.push(elementObj);
-					} else {
-						arrayItems.push(itemArr);
-					}
-				}
-				executeScriptArgs.push(arrayItems);
-			} else if (resolvedItem && resolvedItem.getSeleniumProtocolElementObj) {
-				executeScriptArgs.push(await resolvedItem.getSeleniumProtocolElementObj());
-			} else {
-				executeScriptArgs.push(item);
-			}
-		}
-
-		return executeScriptArgs;
-	}
-
-	async quit() {
-		await this.seleniumDriver.quit();
-		this.seleniumDriver = null;
-	}
-
-	async quitAll() {
-		if (isArray(this.drivers) && this.drivers.length) {
-			for (const driver of this.drivers) {
-				if (this.seleniumDriver === driver) {
-					this.seleniumDriver = null;
-				}
-				await driver.quit();
-			}
-		}
-		this.drivers = [];
-		if (this.seleniumDriver) {
-			await this.seleniumDriver.quit();
-			this.seleniumDriver = null;
-		}
-	}
-
-	async close() {
-		if (this.drivers.length) {
-			const index = this.drivers.findIndex((driver) => driver === this.seleniumDriver);
-			if (index !== -1) this.drivers.splice(index, 1);
-		}
-		await this.seleniumDriver.close();
-	}
-
-	actions() {
-		return this.seleniumDriver.actions({async: true});
-	}
-
-	private async getSeleniumProtocolElement(item) {
-		const webElId = await item.getId();
-		const elementObj = {
-			'element-6066-11e4-a52e-4f735466cecf': webElId,
-			ELEMENT: webElId,
-		};
-
-		return elementObj;
-	}
-
-	private resolveUrl(urlOrPath: string) {
-		let resolved;
-
-		if (!urlOrPath.includes('http') && this.appBaseUrl) {
-			const url = this.appBaseUrl;
-			const path = urlOrPath;
-
-			if (url.endsWith('/') && path.startsWith('/')) {
-				resolved = `${url.replace(/.$/u, '')}${path}`;
-			} else if (url.endsWith('/') && !path.startsWith('/')) {
-				resolved = `${url}${path}`;
-			} else if (!url.endsWith('/') && path.startsWith('/')) {
-				resolved = `${url}${path}`;
-			} else {
-				resolved = `${url}/${path}`;
-			}
-		} else if (urlOrPath === '' || urlOrPath === '/') {
-			return this.baseUrl;
-		} else {
-			resolved = urlOrPath;
-		}
-
-		return resolved;
-	}
-}
-
-const browser = validateBrowserCallMethod(Browser);
-
-export {
-	browser,
-	Browser,
-};

package/lib/swd/swd_element.ts

@@ -1,397 +0,0 @@
-/* eslint-disable max-len */
-import {isBoolean, isString, isFunction, isPromise} from 'sat-utils';
-import {By, WebElement, WebDriver} from 'selenium-webdriver';
-import {browser} from './swd_client';
-
-function toSeleniumProtocolElement(webElId) {
-	const elementObj = {
-		'element-6066-11e4-a52e-4f735466cecf': webElId,
-		ELEMENT: webElId,
-	};
-	return elementObj;
-}
-
-const buildBy = (selector: string | By, getExecuteScriptArgs?: () => any[]): any => {
-	if (selector instanceof By) {
-		return selector;
-	}
-
-	getExecuteScriptArgs = isFunction(getExecuteScriptArgs) ? getExecuteScriptArgs : () => ([]);
-
-	if (isString(selector) && (selector as string).includes('xpath=')) {
-		return By.xpath((selector as string).replace('xpath=', ''));
-	} else if (isString(selector) && (selector as string).includes('js=')) {
-		return By.js((selector as string).replace('js=', ''), ...getExecuteScriptArgs());
-	} else if (isPromise(selector)) {
-		return selector;
-	} else if (isFunction(selector)) {
-		return By.js(selector, ...getExecuteScriptArgs());
-	}
-
-	return By.css(selector);
-};
-
-const SELENIUM_API_METHODS = [
-	'sendKeys', 'getTagName', 'getCssValue', 'getAttribute', 'getText', 'getRect',
-	'isEnabled', 'isSelected', 'submit', 'clear', 'getId', 'takeScreenshot', 'getLocation',
-];
-
-class PromodSeleniumElements {
-	private seleniumDriver: WebDriver;
-	private selector: string;
-	private wdElements: WebElement[];
-	private getParent: () => Promise<PromodSeleniumElement & WebElement>;
-	private getExecuteScriptArgs: () => any;
-	public parentSelector: string;
-
-	constructor(selector, client, getParent?, getExecuteScriptArgs?) {
-		this.seleniumDriver = client;
-		this.selector = selector;
-		this.getParent = getParent;
-		this.getExecuteScriptArgs = getExecuteScriptArgs;
-	}
-
-	setseleniumDriver(client: WebDriver) {
-		this.seleniumDriver = client;
-	}
-
-	get(index): PromodSeleniumElementType {
-		const childElement = new PromodSeleniumElement(this.selector, this.seleniumDriver, this.getElement.bind(this, index), null, true);
-		if (this.parentSelector) {
-			childElement.parentSelector = this.parentSelector || this.selector;
-		}
-		return childElement as any;
-	}
-
-	last(): PromodSeleniumElementType {
-		return this.get(-1) as any;
-	}
-
-	first(): PromodSeleniumElementType {
-		return this.get(0) as any;
-	}
-
-	private async getElement(index?) {
-		this.seleniumDriver = browser.currentClient();
-
-		if (this.getParent) {
-			let parent = await this.getParent();
-
-			if (parent.getWebDriverElement) {
-				// @ts-ignore
-				parent = await parent.getWebDriverElement();
-			}
-
-			this.wdElements = await parent.findElements(buildBy(this.selector, this.getExecuteScriptArgs));
-		} else {
-			this.wdElements = await this.seleniumDriver.findElements(buildBy(this.selector, this.getExecuteScriptArgs));
-		}
-
-		if (index === -1) {
-			return this.wdElements[this.wdElements.length - 1];
-		}
-
-		return this.wdElements[index];
-	}
-
-	async getIds() {
-		await this.getElement();
-		// @ts-ignore
-		return this.wdElements.map((item) => item.id_);
-	}
-
-	async getSeleniumProtocolElementObj() {
-		const ids = await this.getIds();
-
-		return ids.map(toSeleniumProtocolElement);
-	}
-
-
-	async each(cb: (item: PromodSeleniumElementType, index?: number) => Promise<void>): Promise<any> {
-		await this.getElement(0);
-
-		for (let i = 0; i < this.wdElements.length; i++) {
-			await cb(new PromodSeleniumElement(this.selector, this.seleniumDriver, () => this.wdElements[i], null, true) as any, i);
-		}
-	}
-
-	async count(): Promise<number> {
-		await this.getElement(0);
-		return this.wdElements.length;
-	}
-}
-
-class PromodSeleniumElement {
-	private seleniumDriver: WebDriver;
-	private selector: string;
-	private wdElement: WebElement;
-	private getParent: () => Promise<PromodSeleniumElementType>;
-	private getExecuteScriptArgs: () => any;
-	private useParent: boolean;
-	public parentSelector: string;
-
-	constructor(selector, client, getParent?, getExecuteScriptArgs?, useParent?) {
-		this.seleniumDriver = client;
-		this.selector = selector;
-		this.getParent = getParent;
-		this.getExecuteScriptArgs = getExecuteScriptArgs;
-		this.useParent = useParent;
-
-		const self = this;
-
-		SELENIUM_API_METHODS.forEach(function(methodName) {
-			self[methodName] = (...args: any[]) => {
-				const action = () => self.wdElement[methodName].call(self.wdElement, ...args);
-
-				return self.callElementAction(action);
-			};
-		});
-	}
-
-	setseleniumDriver(client) {
-		this.seleniumDriver = client;
-	}
-
-	$(selector): PromodSeleniumElementType {
-		const childElement = new PromodSeleniumElement(selector, this.seleniumDriver, this.getElement.bind(this));
-		childElement.parentSelector = this.selector;
-		return childElement as any;
-	}
-
-	$$(selector): PromodSeleniumElementsType {
-		const childElements = new PromodSeleniumElements(selector, this.seleniumDriver, this.getElement.bind(this));
-		childElements.parentSelector = this.selector;
-		return childElements as any;
-	}
-
-	async getSeleniumProtocolElementObj() {
-		const id = await this.getId();
-
-		return toSeleniumProtocolElement(id);
-	}
-
-	/**
-	 * @param {boolean} [withScroll] try to prevent intercept error by scoll to bottom/to
-	 * @returns {Promise<void>}
-	 */
-	async click(withScroll?: boolean) {
-		await this.getElement();
-		if (withScroll) {
-			const scrollableClickResult = await this.wdElement.click()
-				.catch((err) => (this.isInteractionIntercepted(err) ? this.scrollIntoView('end').then(() => this.wdElement.click()) : err))
-				.catch((err) => (this.isInteractionIntercepted(err) ? this.scrollIntoView('start').then(() => this.wdElement.click()) : err))
-				.then((err) => err)
-				.catch((err) => err);
-
-			if (scrollableClickResult) {
-				throw scrollableClickResult;
-			}
-		} else {
-			return this.wdElement.click();
-		}
-	}
-
-	async scrollIntoView(position?: 'end' | 'start') {
-		await this.getElement();
-		await this.seleniumDriver.executeScript(`
-      let position = true;
-      if(arguments[1] ==='end') {
-        position = {block: 'end'}
-      } else if(arguments[1] ==='start') {
-        position = {block: 'start'}
-      }
-      arguments[0].scrollIntoView(position)
-    `, this.getWebDriverElement(), position);
-	}
-
-	async getElement() {
-		this.seleniumDriver = browser.currentClient();
-		if (this.getParent) {
-			let parent = await this.getParent() as any;
-			if (!parent) {
-				throw new Error(
-					this.useParent
-						? `Any element with selector ${this.selector} was not found`
-						: `Parent element with selector ${this.parentSelector} was not found`
-				);
-			}
-			if (parent.getWebDriverElement) {
-				parent = await parent.getWebDriverElement();
-			}
-
-			if (this.useParent) {
-				this.wdElement = parent;
-			} else {
-				this.wdElement = await parent.findElement(buildBy(this.selector, this.getExecuteScriptArgs));
-			}
-
-		} else {
-			this.wdElement = await this.seleniumDriver.findElement(buildBy(this.selector, this.getExecuteScriptArgs));
-		}
-
-		return this.wdElement;
-	}
-
-	/**
-	 * @returns {Promise<boolean>} button is present
-	 * @example
-	 * const button = $('button')
-	 * const buttonIsDisplayed = await button.isDisplayed();
-	 */
-	async isDisplayed() {
-		const result = await this.getElement().catch(() => false);
-		if (isBoolean(result) && !result) {
-			return false;
-		}
-		return this.wdElement.isDisplayed().then((res) => res, () => false);
-	}
-
-	/**
-	 * @returns {Promise<boolean>} button is present
-	 * @example
-	 * const button = $('button')
-	 * const buttonIsPresent = await button.isPresent();
-	 */
-	async isPresent() {
-		return this.getElement().then(() => true).catch((r) => false);
-	}
-
-	private async callElementAction(action) {
-		await this.getElement();
-
-		return action();
-	}
-
-	async getId() {
-		await this.getElement();
-		// @ts-ignore
-		return this.wdElement.id_;
-	}
-
-	async getWebDriverElement() {
-		await this.getElement();
-
-		return this.wdElement;
-	}
-
-	locator() {
-		let locatorValue = '';
-		if (this.parentSelector) {
-			locatorValue += ` Parent: ${this.parentSelector} `;
-		}
-		return {value: `${locatorValue}${this.selector}`};
-	}
-
-	private isInteractionIntercepted(err) {
-		return err.toString().includes('element click intercepted');
-	}
-}
-
-
-function getInitElementRest(selector: string | By | ((...args: any[]) => any) | Promise<any>, root?: PromodSeleniumElementType, ...rest: any[]) {
-	let getParent = null;
-	let getExecuteScriptArgs = null;
-
-	/**
-	 * @info
-	 * in case if selector is string with "js=" marker or selector is a function
-	 */
-
-	if ((isString(selector) && (selector as string).indexOf('js=') === 0) || isFunction(selector) || isPromise(selector)) {
-		getExecuteScriptArgs = function getExecuteScriptArgs() {
-			return [root, ...rest];
-		};
-	} else if (root && root instanceof PromodSeleniumElement) {
-		getParent = function getParent() {
-			return root;
-		};
-	}
-
-	return [getParent, getExecuteScriptArgs];
-}
-
-const $ = (selector: string | By | ((...args: any[]) => any) | Promise<any>, root?: PromodSeleniumElementType | any, ...rest: any[]): PromodSeleniumElementType => {
-	const restArgs = getInitElementRest(selector, root, ...rest);
-
-	return new PromodSeleniumElement(selector, null, ...restArgs) as any;
-};
-
-
-const $$ = (selector: string | By | ((...args: any[]) => any) | Promise<any>, root?: PromodSeleniumElementType | any, ...rest: any[]): PromodSeleniumElementsType => {
-	const restArgs = getInitElementRest(selector, root, ...rest);
-
-	return new PromodSeleniumElements(selector, null, ...restArgs) as any;
-};
-
-export {$, $$, PromodSeleniumElement, PromodSeleniumElements, By};
-
-export interface PromodSeleniumElementsType {
-	wdElements: WebElement[];
-
-	get(index: number): PromodSeleniumElementType;
-
-	last(): PromodSeleniumElementType;
-
-	first(): PromodSeleniumElementType;
-
-	each(cb: (item: PromodSeleniumElementType, index?: number) => Promise<void>): Promise<void>;
-
-	count(): Promise<number>;
-}
-
-export interface PromodSeleniumElementType {
-
-	wdElement: WebElement;
-
-	getId(): Promise<string>;
-
-	click(withScroll?: boolean): Promise<void>;
-
-	sendKeys(...keys: Array<string | number | Promise<string | number>>): Promise<void>;
-
-	getTagName(): Promise<string>;
-
-	getCssValue(cssStyleProperty: string): Promise<string>;
-
-	getAttribute(attributeName: string): Promise<string>;
-
-	getText(): Promise<string>;
-
-	getSize(): Promise<{
-		width: number;
-		height: number;
-	}>;
-
-	getRect(): Promise<{
-		x: number;
-		y: number;
-		width: number;
-		height: number;
-	}>;
-
-	getLocation(): Promise<{
-		x: number;
-		y: number;
-	}>;
-
-	$(selector: string | By | ((...args: any[]) => any) | Promise<any>): PromodSeleniumElementType;
-	$$(selector: string | By | ((...args: any[]) => any) | Promise<any>): PromodSeleniumElementsType;
-
-	isEnabled(): Promise<boolean>;
-
-	isSelected(): Promise<boolean>;
-
-	isPresent(): Promise<boolean>;
-
-	submit(): Promise<void>;
-
-	clear(): Promise<void>;
-
-	isDisplayed(): Promise<boolean>;
-
-	takeScreenshot(opt_scroll?: boolean): Promise<string>;
-
-	getWebDriverElement(): Promise<WebElement>;
-
-	scrollIntoView(position?: boolean | string): Promise<void>;
-}