codeceptjs 2.4.3 → 2.6.2

package/docs/build/WebDriver.js

@@ -2,6 +2,7 @@ let webdriverio;
 
 const assert = require('assert');
 const path = require('path');
+const fs = require('fs');
 const requireg = require('requireg');
 
 const Helper = require('../helper');
@@ -28,8 +29,10 @@ const ElementNotFound = require('./errors/ElementNotFound');
 const ConnectionRefused = require('./errors/ConnectionRefused');
 const Locator = require('../locator');
 
+const SHADOW = 'shadow';
 const webRoot = 'body';
 
+let version;
 /**
  * WebDriver helper which wraps [webdriverio](http://webdriver.io/) library to
  * manipulate browser using Selenium WebDriver or PhantomJS.
@@ -380,10 +383,22 @@ class WebDriver extends Helper {
     if (webdriverio.VERSION && webdriverio.VERSION.indexOf('4') === 0) {
       throw new Error(`This helper is compatible with "webdriverio@5". Current version: ${webdriverio.VERSION}. Please upgrade webdriverio to v5+ or use WebDriverIO helper instead`);
     }
+    try {
+      version = JSON.parse(fs.readFileSync(path.join(requireg.resolve('webdriverio'), '/../../', 'package.json')).toString()).version;
+    } catch (err) {
+      this.debug('Can\'t detect webdriverio version, assuming webdriverio v6 is used');
+    }
+
+    if (isWebDriver5()) {
+      console.log('DEPRECATION NOTICE:');
+      console.log('You are using webdriverio v5. It is recommended to update to webdriverio@6.\nSupport of webdriverio v5 is deprecated and will be removed in CodeceptJS 3.0\n');
+    }
     // set defaults
     this.root = webRoot;
     this.isWeb = true;
     this.isRunning = false;
+    this.sessionWindows = {};
+    this.activeSessionName = '';
 
     this._setConfig(config);
 
@@ -402,6 +417,7 @@ class WebDriver extends Helper {
   _validateConfig(config) {
     const defaults = {
       logLevel: 'silent',
+      path: '/wd/hub',
       // codeceptjs
       remoteFileUpload: true,
       smartWait: 0,
@@ -500,6 +516,11 @@ class WebDriver extends Helper {
       if (this.options.multiremote) {
         this.browser = await webdriverio.multiremote(this.options.multiremote);
       } else {
+        // remove non w3c capabilities
+        delete this.options.capabilities.protocol;
+        delete this.options.capabilities.hostname;
+        delete this.options.capabilities.port;
+        delete this.options.capabilities.path;
         this.browser = await webdriverio.remote(this.options);
       }
     } catch (err) {
@@ -563,12 +584,12 @@ class WebDriver extends Helper {
   _session() {
     const defaultSession = this.browser;
     return {
-      start: async (opts) => {
+      start: async (sessionName, opts) => {
         // opts.disableScreenshots = true; // screenshots cant be saved as session will be already closed
         opts = this._validateConfig(Object.assign(this.options, opts));
         this.debugSection('New Browser', JSON.stringify(opts));
         const browser = await webdriverio.remote(opts);
-
+        this.activeSessionName = sessionName;
         if (opts.timeouts && this.isWeb) {
           await this._defineBrowserTimeout(browser, opts.timeouts);
         }
@@ -578,14 +599,19 @@ class WebDriver extends Helper {
         return browser;
       },
       stop: async (browser) => {
+        if (!browser) return;
         return browser.deleteSession();
       },
       loadVars: async (browser) => {
         if (this.context !== this.root) throw new Error('Can\'t start session inside within block');
         this.browser = browser;
         this.$$ = this.browser.$$.bind(this.browser);
+        this.sessionWindows[this.activeSessionName] = browser;
       },
-      restoreVars: async () => {
+      restoreVars: async (session) => {
+        if (!session) {
+          this.activeSessionName = '';
+        }
         this.browser = defaultSession;
         this.$$ = this.browser.$$.bind(this.browser);
       },
@@ -626,6 +652,62 @@ class WebDriver extends Helper {
     this.$$ = this.browser.$$.bind(this.browser);
   }
 
+  /**
+   * Check if locator is type of "Shadow"
+   *
+   * @param {object} locator
+   */
+  _isShadowLocator(locator) {
+    return locator.type === SHADOW || locator[SHADOW];
+  }
+
+  /**
+   * Locate Element within the Shadow Dom
+   *
+   * @param {object} locator
+   */
+  async _locateShadow(locator) {
+    const shadow = locator.value ? locator.value : locator[SHADOW];
+    const shadowSequence = [];
+    let elements;
+
+    if (!Array.isArray(shadow)) {
+      throw new Error(`Shadow '${shadow}' should be defined as an Array of elements.`);
+    }
+
+    // traverse through the Shadow locators in sequence
+    for (let index = 0; index < shadow.length; index++) {
+      const shadowElement = shadow[index];
+      shadowSequence.push(shadowElement);
+
+      if (!elements) {
+        elements = await (this.browser.$$(shadowElement));
+      } else if (Array.isArray(elements)) {
+        elements = await elements[0].shadow$$(shadowElement);
+      } else if (elements) {
+        elements = await elements.shadow$$(shadowElement);
+      }
+
+      if (!elements || !elements[0]) {
+        throw new Error(`Shadow Element '${shadowElement}' is not found. It is possible the element is incorrect or elements sequence is incorrect. Please verify the sequence '${shadowSequence.join('>')}' is correctly chained.`);
+      }
+    }
+
+    this.debugSection('Elements', `Found ${elements.length} '${SHADOW}' elements`);
+
+    return elements;
+  }
+
+  /**
+   * Smart Wait to locate an element
+   *
+   * @param {object} locator
+   */
+  async _smartWait(locator) {
+    this.debugSection(`SmartWait (${this.options.smartWait}ms)`, `Locating ${locator} in ${this.options.smartWait}`);
+    await this.defineTimeout({ implicit: this.options.smartWait });
+  }
+
   /**
    * Get elements by different locator types, including strict locator.
    * Should be used in custom helpers:
@@ -640,6 +722,18 @@ class WebDriver extends Helper {
   async _locate(locator, smartWait = false) {
     if (require('../store').debugMode) smartWait = false;
 
+    // special locator type for Shadow DOM
+    if (this._isShadowLocator(locator)) {
+      if (!this.options.smartWait || !smartWait) {
+        const els = await this._locateShadow(locator);
+        return els;
+      }
+
+
+      const els = await this._locateShadow(locator);
+      return els;
+    }
+
     // special locator type for React
     if (locator.react) {
       const els = await this.browser.react$$(locator.react, locator.props || undefined, locator.state || undefined);
@@ -651,9 +745,9 @@ class WebDriver extends Helper {
       const els = await this.$$(withStrictLocator(locator));
       return els;
     }
-    this.debugSection(`SmartWait (${this.options.smartWait}ms)`, `Locating ${locator} in ${this.options.smartWait}`);
 
-    await this.defineTimeout({ implicit: this.options.smartWait });
+    await this._smartWait(locator);
+
     const els = await this.$$(withStrictLocator(locator));
     await this.defineTimeout({ implicit: 0 });
     return els;
@@ -676,13 +770,15 @@ class WebDriver extends Helper {
    * Find a clickable element by providing human readable text:
    *
    * ```js
-   * this.helpers['WebDriver']._locateClickable('Next page').then // ...
+   * const els = await this.helpers.WebDriver._locateClickable('Next page');
+   * const els = await this.helpers.WebDriver._locateClickable('Next page', '.pages');
    * ```
    *
    * @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
    */
-  async _locateClickable(locator) {
-    return findClickable.call(this, locator, this.$$.bind(this)).then(res => res);
+  async _locateClickable(locator, context) {
+    const locateFn = prepareLocateFn.call(this, context);
+    return findClickable.call(this, locator, locateFn);
   }
 
   /**
@@ -786,6 +882,59 @@ class WebDriver extends Helper {
     return this.browser[clickMethod](getElementId(elem));
   }
 
+  /**
+   * Perform an emulated click on a link or a button, given by a locator.
+   * Unlike normal click instead of sending native event, emulates a click with JavaScript.
+   * This works on hidden, animated or inactive elements as well.
+   * 
+   * If a fuzzy locator is given, the page will be searched for a button, link, or image matching the locator string.
+   * For buttons, the "value" attribute, "name" attribute, and inner text are searched. For links, the link text is searched.
+   * For images, the "alt" attribute and inner text of any parent links are searched.
+   * 
+   * The second parameter is a context (CSS or XPath locator) to narrow the search.
+   * 
+   * ```js
+   * // simple link
+   * I.forceClick('Logout');
+   * // button of form
+   * I.forceClick('Submit');
+   * // CSS button
+   * I.forceClick('#form input[type=submit]');
+   * // XPath
+   * I.forceClick('//form/*[@type=submit]');
+   * // link in context
+   * I.forceClick('Logout', '#nav');
+   * // using strict locator
+   * I.forceClick({css: 'nav a.login'});
+   * ```
+   * 
+   * @param {CodeceptJS.LocatorOrString} locator clickable link or button located by text, or any element located by CSS|XPath|strict locator.
+   * @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element to search in CSS|XPath|Strict locator.
+   * 
+   *
+   * {{ react }}
+   */
+  async forceClick(locator, context = null) {
+    const locateFn = prepareLocateFn.call(this, context);
+
+    const res = await findClickable.call(this, locator, locateFn);
+    if (context) {
+      assertElementExists(res, locator, 'Clickable element', `was not found inside element ${new Locator(context)}`);
+    } else {
+      assertElementExists(res, locator, 'Clickable element');
+    }
+    const elem = usingFirstElement(res);
+
+    return this.executeScript((el) => {
+      if (document.activeElement instanceof HTMLElement) {
+        document.activeElement.blur();
+      }
+      const event = document.createEvent('MouseEvent');
+      event.initEvent('click', true, true);
+      return el.dispatchEvent(event);
+    }, elem);
+  }
+
   /**
    * Performs a double-click on an element matched by link|button|label|CSS or XPath.
    * Context can be specified as second parameter to narrow search.
@@ -1844,11 +1993,12 @@ class WebDriver extends Helper {
    * 
    *
    */
-  async moveCursorTo(locator, offsetX = 0, offsetY = 0) {
+  async moveCursorTo(locator, xOffset, yOffset) {
     const res = await this._locate(withStrictLocator(locator), true);
     assertElementExists(res, locator);
     const elem = usingFirstElement(res);
-    return elem.moveTo(offsetX, offsetY);
+    if (isWebDriver5()) return elem.moveTo(xOffset, yOffset);
+    return elem.moveTo({ xOffset, yOffset });
   }
 
   /**
@@ -1868,6 +2018,15 @@ class WebDriver extends Helper {
   async saveScreenshot(fileName, fullPage = false) {
     const outputFile = screenshotOutputFolder(fileName);
 
+    if (this.activeSessionName) {
+      const browser = this.sessionWindows[this.activeSessionName];
+
+      if (browser) {
+        this.debug(`Screenshot of ${this.activeSessionName} session has been saved to ${outputFile}`);
+        return browser.saveScreenshot(outputFile);
+      }
+    }
+
     if (!fullPage) {
       this.debug(`Screenshot has been saved to ${outputFile}`);
       return this.browser.saveScreenshot(outputFile);
@@ -1895,13 +2054,21 @@ class WebDriver extends Helper {
 
 
   /**
-   * Sets a cookie.
+   * Sets cookie(s).
+   * 
+   * Can be a single cookie object or an array of cookies:
    * 
    * ```js
    * I.setCookie({name: 'auth', value: true});
+   * 
+   * // as array
+   * I.setCookie([
+   *   {name: 'auth', value: true},
+   *   {name: 'agree', value: true}
+   * ]);
    * ```
    * 
-   * @param {object} cookie a cookie object.
+   * @param {object|array} cookie a cookie object or array of cookie objects.
    *
    *
    * Uses Selenium's JSON [cookie
@@ -2194,6 +2361,29 @@ class WebDriver extends Helper {
     }
   }
 
+  /**
+   * 
+   * Types out the given string or the array of keys provided.
+   * _Note:_ Should only be used when using [`fillField`](#fillfield) is not an option.
+   * 
+   * ```js
+   * // When passing in a string
+   * I.type('Type this out.');
+   * // When passing in an array
+   * I.type(['T', 'E', 'X', 'T']);
+   * ```
+   * 
+   * @param {string|string[]} key or array of keys to type.
+   * Type out given array of keys or a string of text
+   */
+  async type(keys) {
+    if (Array.isArray(keys)) {
+      await this.browser.keys(keys);
+      return;
+    }
+    await this.browser.keys(keys.split(''));
+  }
+
   /**
    * Resize the current window to provided width and height.
    * First parameter can be set to `maximize`.
@@ -2368,6 +2558,19 @@ class WebDriver extends Helper {
    */
   async waitForEnabled(locator, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
+    if (isWebDriver5()) {
+      return this.browser.waitUntil(async () => {
+        const res = await this.$$(withStrictLocator(locator));
+        if (!res || res.length === 0) {
+          return false;
+        }
+        const selected = await forEachAsync(res, async el => this.browser.isElementEnabled(getElementId(el)));
+        if (Array.isArray(selected)) {
+          return selected.filter(val => val === true).length > 0;
+        }
+        return selected;
+      }, aSec * 1000, `element (${new Locator(locator)}) still not enabled after ${aSec} sec`);
+    }
     return this.browser.waitUntil(async () => {
       const res = await this.$$(withStrictLocator(locator));
       if (!res || res.length === 0) {
@@ -2378,7 +2581,10 @@ class WebDriver extends Helper {
         return selected.filter(val => val === true).length > 0;
       }
       return selected;
-    }, aSec * 1000, `element (${new Locator(locator)}) still not enabled after ${aSec} sec`);
+    }, {
+      timeout: aSec * 1000,
+      timeoutMsg: `element (${new Locator(locator)}) still not enabled after ${aSec} sec`,
+    });
   }
 
   /**
@@ -2395,10 +2601,16 @@ class WebDriver extends Helper {
    */
   async waitForElement(locator, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
+    if (isWebDriver5()) {
+      return this.browser.waitUntil(async () => {
+        const res = await this.$$(withStrictLocator(locator));
+        return res && res.length;
+      }, aSec * 1000, `element (${locator}) still not present on page after ${aSec} sec`);
+    }
     return this.browser.waitUntil(async () => {
       const res = await this.$$(withStrictLocator(locator));
       return res && res.length;
-    }, aSec * 1000, `element (${locator}) still not present on page after ${aSec} sec`);
+    }, { timeout: aSec * 1000, timeoutMsg: `element (${locator}) still not present on page after ${aSec} sec` });
   }
 
   /**
@@ -2447,13 +2659,27 @@ class WebDriver extends Helper {
     const client = this.browser;
     const aSec = sec || this.options.waitForTimeout;
     let currUrl = '';
+    if (isWebDriver5()) {
+      return client
+        .waitUntil(function () {
+          return this.getUrl().then((res) => {
+            currUrl = decodeUrl(res);
+            return currUrl.indexOf(urlPart) > -1;
+          });
+        }, aSec * 1000).catch((e) => {
+          if (e.message.indexOf('timeout')) {
+            throw new Error(`expected url to include ${urlPart}, but found ${currUrl}`);
+          }
+          throw e;
+        });
+    }
     return client
       .waitUntil(function () {
         return this.getUrl().then((res) => {
           currUrl = decodeUrl(res);
           return currUrl.indexOf(urlPart) > -1;
         });
-      }, aSec * 1000).catch((e) => {
+      }, { timeout: aSec * 1000 }).catch((e) => {
         if (e.message.indexOf('timeout')) {
           throw new Error(`expected url to include ${urlPart}, but found ${currUrl}`);
         }
@@ -2510,6 +2736,21 @@ class WebDriver extends Helper {
   async waitForText(text, sec = null, context = null) {
     const aSec = sec || this.options.waitForTimeout;
     const _context = context || this.root;
+    if (isWebDriver5()) {
+      return this.browser.waitUntil(
+        async () => {
+          const res = await this.$$(withStrictLocator.call(this, _context));
+          if (!res || res.length === 0) return false;
+          const selected = await forEachAsync(res, async el => this.browser.getElementText(getElementId(el)));
+          if (Array.isArray(selected)) {
+            return selected.filter(part => part.indexOf(text) >= 0).length > 0;
+          }
+          return selected.indexOf(text) >= 0;
+        }, aSec * 1000,
+        `element (${_context}) is not in DOM or there is no element(${_context}) with text "${text}" after ${aSec} sec`,
+      );
+    }
+
     return this.browser.waitUntil(
       async () => {
         const res = await this.$$(withStrictLocator.call(this, _context));
@@ -2519,8 +2760,10 @@ class WebDriver extends Helper {
           return selected.filter(part => part.indexOf(text) >= 0).length > 0;
         }
         return selected.indexOf(text) >= 0;
-      }, aSec * 1000,
-      `element (${_context}) is not in DOM or there is no element(${_context}) with text "${text}" after ${aSec} sec`,
+      }, {
+        timeout: aSec * 1000,
+        timeoutMsg: `element (${_context}) is not in DOM or there is no element(${_context}) with text "${text}" after ${aSec} sec`,
+      },
     );
   }
 
@@ -2538,6 +2781,20 @@ class WebDriver extends Helper {
   async waitForValue(field, value, sec = null) {
     const client = this.browser;
     const aSec = sec || this.options.waitForTimeout;
+    if (isWebDriver5()) {
+      return client.waitUntil(
+        async () => {
+          const res = await findFields.call(this, field);
+          if (!res || res.length === 0) return false;
+          const selected = await forEachAsync(res, async el => el.getValue());
+          if (Array.isArray(selected)) {
+            return selected.filter(part => part.indexOf(value) >= 0).length > 0;
+          }
+          return selected.indexOf(value) >= 0;
+        }, aSec * 1000,
+        `element (${field}) is not in DOM or there is no element(${field}) with value "${value}" after ${aSec} sec`,
+      );
+    }
     return client.waitUntil(
       async () => {
         const res = await findFields.call(this, field);
@@ -2547,8 +2804,10 @@ class WebDriver extends Helper {
           return selected.filter(part => part.indexOf(value) >= 0).length > 0;
         }
         return selected.indexOf(value) >= 0;
-      }, aSec * 1000,
-      `element (${field}) is not in DOM or there is no element(${field}) with value "${value}" after ${aSec} sec`,
+      }, {
+        timeout: aSec * 1000,
+        timeoutMsg: `element (${field}) is not in DOM or there is no element(${field}) with value "${value}" after ${aSec} sec`,
+      },
     );
   }
 
@@ -2566,6 +2825,17 @@ class WebDriver extends Helper {
    */
   async waitForVisible(locator, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
+    if (isWebDriver5()) {
+      return this.browser.waitUntil(async () => {
+        const res = await this.$$(withStrictLocator(locator));
+        if (!res || res.length === 0) return false;
+        const selected = await forEachAsync(res, async el => el.isDisplayed());
+        if (Array.isArray(selected)) {
+          return selected.filter(val => val === true).length > 0;
+        }
+        return selected;
+      }, aSec * 1000, `element (${new Locator(locator)}) still not visible after ${aSec} sec`);
+    }
     return this.browser.waitUntil(async () => {
       const res = await this.$$(withStrictLocator(locator));
       if (!res || res.length === 0) return false;
@@ -2574,7 +2844,7 @@ class WebDriver extends Helper {
         return selected.filter(val => val === true).length > 0;
       }
       return selected;
-    }, aSec * 1000, `element (${new Locator(locator)}) still not visible after ${aSec} sec`);
+    }, { timeout: aSec * 1000, timeoutMsg: `element (${new Locator(locator)}) still not visible after ${aSec} sec` });
   }
 
   /**
@@ -2590,6 +2860,16 @@ class WebDriver extends Helper {
    */
   async waitNumberOfVisibleElements(locator, num, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
+    if (isWebDriver5()) {
+      return this.browser.waitUntil(async () => {
+        const res = await this.$$(withStrictLocator(locator));
+        if (!res || res.length === 0) return false;
+        let selected = await forEachAsync(res, async el => el.isDisplayed());
+
+        if (!Array.isArray(selected)) selected = [selected];
+        return selected.length === num;
+      }, aSec * 1000, `The number of elements (${new Locator(locator)}) is not ${num} after ${aSec} sec`);
+    }
     return this.browser.waitUntil(async () => {
       const res = await this.$$(withStrictLocator(locator));
       if (!res || res.length === 0) return false;
@@ -2597,7 +2877,7 @@ class WebDriver extends Helper {
 
       if (!Array.isArray(selected)) selected = [selected];
       return selected.length === num;
-    }, aSec * 1000, `The number of elements (${new Locator(locator)}) is not ${num} after ${aSec} sec`);
+    }, { timeout: aSec * 1000, timeoutMsg: `The number of elements (${new Locator(locator)}) is not ${num} after ${aSec} sec` });
   }
 
   /**
@@ -2614,12 +2894,20 @@ class WebDriver extends Helper {
    */
   async waitForInvisible(locator, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
+    if (isWebDriver5()) {
+      return this.browser.waitUntil(async () => {
+        const res = await this.$$(withStrictLocator(locator));
+        if (!res || res.length === 0) return true;
+        const selected = await forEachAsync(res, async el => el.isDisplayed());
+        return !selected.length;
+      }, aSec * 1000, `element (${new Locator(locator)}) still visible after ${aSec} sec`);
+    }
     return this.browser.waitUntil(async () => {
       const res = await this.$$(withStrictLocator(locator));
       if (!res || res.length === 0) return true;
       const selected = await forEachAsync(res, async el => el.isDisplayed());
       return !selected.length;
-    }, aSec * 1000, `element (${new Locator(locator)}) still visible after ${aSec} sec`);
+    }, { timeout: aSec * 1000, timeoutMsg: `element (${new Locator(locator)}) still visible after ${aSec} sec` });
   }
 
   /**
@@ -2657,13 +2945,22 @@ class WebDriver extends Helper {
    */
   async waitForDetached(locator, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
+    if (isWebDriver5()) {
+      return this.browser.waitUntil(async () => {
+        const res = await this.$$(withStrictLocator(locator));
+        if (!res || res.length === 0) {
+          return true;
+        }
+        return false;
+      }, aSec * 1000, `element (${new Locator(locator)}) still on page after ${aSec} sec`);
+    }
     return this.browser.waitUntil(async () => {
       const res = await this.$$(withStrictLocator(locator));
       if (!res || res.length === 0) {
         return true;
       }
       return false;
-    }, aSec * 1000, `element (${new Locator(locator)}) still on page after ${aSec} sec`);
+    }, { timeout: aSec * 1000, timeoutMsg: `element (${new Locator(locator)}) still on page after ${aSec} sec` });
   }
 
   /**
@@ -2697,7 +2994,10 @@ class WebDriver extends Helper {
     }
 
     const aSec = sec || this.options.waitForTimeout;
-    return this.browser.waitUntil(async () => this.browser.execute(fn, ...args), aSec * 1000);
+    if (isWebDriver5()) {
+      return this.browser.waitUntil(async () => this.browser.execute(fn, ...args), aSec * 1000, '');
+    }
+    return this.browser.waitUntil(async () => this.browser.execute(fn, ...args), { timeout: aSec * 1000, timeoutMsg: '' });
   }
 
   /**
@@ -2717,7 +3017,10 @@ class WebDriver extends Helper {
   async waitUntil(fn, sec = null, timeoutMsg = null, interval = null) {
     const aSec = sec || this.options.waitForTimeout;
     const _interval = typeof interval === 'number' ? interval * 1000 : null;
-    return this.browser.waitUntil(fn, aSec * 1000, timeoutMsg, _interval);
+    if (isWebDriver5()) {
+      return this.browser.waitUntil(fn, aSec * 1000, timeoutMsg, _interval);
+    }
+    return this.browser.waitUntil(fn, { timeout: aSec * 1000, timeoutMsg, interval: _interval });
   }
 
   /**
@@ -2761,6 +3064,19 @@ class WebDriver extends Helper {
     const aSec = sec || this.options.waitForTimeout;
     let target;
     const current = await this.browser.getWindowHandle();
+
+    if (isWebDriver5()) {
+      await this.browser.waitUntil(async () => {
+        await this.browser.getWindowHandles().then((handles) => {
+          if (handles.indexOf(current) + num + 1 <= handles.length) {
+            target = handles[handles.indexOf(current) + num];
+          }
+        });
+        return target;
+      }, aSec * 1000, `There is no ability to switch to next tab with offset ${num}`);
+      return this.browser.switchToWindow(target);
+    }
+
     await this.browser.waitUntil(async () => {
       await this.browser.getWindowHandles().then((handles) => {
         if (handles.indexOf(current) + num + 1 <= handles.length) {
@@ -2768,7 +3084,7 @@ class WebDriver extends Helper {
         }
       });
       return target;
-    }, aSec * 1000, `There is no ability to switch to next tab with offset ${num}`);
+    }, { timeout: aSec * 1000, timeoutMsg: `There is no ability to switch to next tab with offset ${num}` });
     return this.browser.switchToWindow(target);
   }
 
@@ -2787,6 +3103,19 @@ class WebDriver extends Helper {
     const aSec = sec || this.options.waitForTimeout;
     const current = await this.browser.getWindowHandle();
     let target;
+
+    if (isWebDriver5()) {
+      await this.browser.waitUntil(async () => {
+        await this.browser.getWindowHandles().then((handles) => {
+          if (handles.indexOf(current) - num > -1) {
+            target = handles[handles.indexOf(current) - num];
+          }
+        });
+        return target;
+      }, aSec * 1000, `There is no ability to switch to previous tab with offset ${num}`);
+      return this.browser.switchToWindow(target);
+    }
+
     await this.browser.waitUntil(async () => {
       await this.browser.getWindowHandles().then((handles) => {
         if (handles.indexOf(current) - num > -1) {
@@ -2794,7 +3123,7 @@ class WebDriver extends Helper {
         }
       });
       return target;
-    }, aSec * 1000, `There is no ability to switch to previous tab with offset ${num}`);
+    }, { timeout: aSec * 1000, timeoutMsg: `There is no ability to switch to previous tab with offset ${num}` });
     return this.browser.switchToWindow(target);
   }
 
@@ -3092,7 +3421,6 @@ async function filterAsync(array, callback) {
   return values;
 }
 
-
 async function findClickable(locator, locateFn) {
   locator = new Locator(locator);
   if (locator.isAccessibilityId() && !this.isWeb) return locateFn(locator, true);
@@ -3116,6 +3444,7 @@ async function findClickable(locator, locateFn) {
 
 async function findFields(locator) {
   locator = new Locator(locator);
+
   if (locator.isAccessibilityId() && !this.isWeb) return this._locate(locator, true);
   if (!locator.isFuzzy()) return this._locate(locator, true);
 
@@ -3430,4 +3759,8 @@ function prepareLocateFn(context) {
   };
 }
 
+function isWebDriver5() {
+  return version && version.indexOf('5') === 0;
+}
+
 module.exports = WebDriver;