codeceptjs 2.1.3 → 2.2.1

package/docs/build/WebDriver.js

@@ -15,7 +15,6 @@ const {
   chunkArray,
   convertCssPropertiesToCamelCase,
   screenshotOutputFolder,
-  fileToBase64Zip,
 } = require('../utils');
 const {
   isColorProperty,
@@ -61,15 +60,15 @@ const webRoot = 'body';
  *
  * Example:
  *
- * ```json
+ * ```js
  * {
- *    "helpers": {
- *      "WebDriver" : {
- *        "smartWait": 5000,
- *        "browser": "chrome",
- *        "restart": false,
- *        "windowSize": "maximize",
- *        "timeouts": {
+ *    helpers: {
+ *      WebDriver : {
+ *        smartWait: 5000,
+ *        browser: "chrome",
+ *        restart: false,
+ *        windowSize: "maximize",
+ *        timeouts: {
  *          "script": 60000,
  *          "page load": 10000
  *        }
@@ -83,15 +82,15 @@ const webRoot = 'body';
  *
  * ### Headless Chrome
  *
- * ```json
+ * ```js
  * {
- *    "helpers": {
- *      "WebDriver" : {
- *        "url": "http://localhost",
- *        "browser": "chrome",
- *        "desiredCapabilities": {
- *          "chromeOptions": {
- *            "args": [ "--headless", "--disable-gpu", "--window-size=800,600" ]
+ *    helpers: {
+ *      WebDriver : {
+ *        url: "http://localhost",
+ *        browser: "chrome",
+ *        desiredCapabilities: {
+ *          chromeOptions: {
+ *            args: [ "--headless", "--disable-gpu", "--window-size=800,600" ]
  *          }
  *        }
  *      }
@@ -103,14 +102,14 @@ const webRoot = 'body';
  *
  * Additional configuration params can be used from [IE options](https://seleniumhq.github.io/selenium/docs/api/rb/Selenium/WebDriver/IE/Options.html)
  *
- * ```json
+ * ```js
  * {
- *    "helpers": {
- *      "WebDriver" : {
- *        "url": "http://localhost",
- *        "browser": "internet explorer",
- *        "desiredCapabilities": {
- *          "ieOptions": {
+ *    helpers: {
+ *      WebDriver : {
+ *        url: "http://localhost",
+ *        browser: "internet explorer",
+ *        desiredCapabilities: {
+ *          ieOptions: {
  *            "ie.browserCommandLineSwitches": "-private",
  *            "ie.usePerProcessProxy": true,
  *            "ie.ensureCleanSession": true,
@@ -123,15 +122,18 @@ const webRoot = 'body';
  *
  * ### Selenoid Options
  *
- * ```json
+ * [Selenoid](https://aerokube.com/selenoid/latest/) is a modern way to run Selenium inside Docker containers.
+ * Selenoid is easy to set up and provides more features than original Selenium Server. Use `selenoidOptions` to set Selenoid capabilities
+ *
+ * ```js
  * {
- *    "helpers": {
- *      "WebDriver" : {
- *        "url": "http://localhost",
- *        "browser": "chrome",
- *        "desiredCapabilities": {
- *          "selenoidOptions": {
- *            "enableVNC": true,
+ *    helpers: {
+ *      WebDriver : {
+ *        url: "http://localhost",
+ *        browser: "chrome",
+ *        desiredCapabilities: {
+ *          selenoidOptions: {
+ *            enableVNC: true,
  *          }
  *        }
  *      }
@@ -139,17 +141,17 @@ const webRoot = 'body';
  * }
  * ```
  *
- * ### Connect through proxy
+ * ### Connect Through proxy
  *
  * CodeceptJS also provides flexible options when you want to execute tests to Selenium servers through proxy. You will
  * need to update the `helpers.WebDriver.capabilities.proxy` key.
  *
  * ```js
  * {
- *     "helpers": {
- *         "WebDriver": {
- *             "capabilities": {
- *                 "proxy": {
+ *     helpers: {
+ *         WebDriver: {
+ *             capabilities: {
+ *                 proxy: {
  *                     "proxyType": "manual|pac",
  *                     "proxyAutoconfigUrl": "URL TO PAC FILE",
  *                     "httpProxy": "PROXY SERVER",
@@ -169,10 +171,10 @@ const webRoot = 'body';
  *
  * ```js
  * {
- *     "helpers": {
- *         "WebDriver": {
- *             "capabilities": {
- *                 "proxy": {
+ *     helpers: {
+ *         WebDriver: {
+ *             capabilities: {
+ *                 proxy: {
  *                     "proxyType": "manual",
  *                     "httpProxy": "http://corporate.proxy:8080",
  *                     "socksUsername": "codeceptjs",
@@ -199,12 +201,12 @@ const webRoot = 'body';
  *
  * ```js
  * {
- *     "helpers":{
- *         "WebDriver": {
- *             "url": "YOUR_DESIRED_HOST",
- *             "user": "YOUR_BROWSERSTACK_USER",
- *             "key": "YOUR_BROWSERSTACK_KEY",
- *             "capabilities": {
+ *     helpers:{
+ *         WebDriver: {
+ *             url: "YOUR_DESIRED_HOST",
+ *             user: "YOUR_BROWSERSTACK_USER",
+ *             key: "YOUR_BROWSERSTACK_KEY",
+ *             capabilities: {
  *                 "browserName": "chrome",
  *
  *                 // only set this if you're using BrowserStackLocal to test a local domain
@@ -318,8 +320,8 @@ const webRoot = 'body';
  *
  * ```js
  * {
- *     "helpers": {
- *         "WebDriver": {
+ *     helpers: {
+ *         WebDriver: {
  *             "multiremote": {
  *                 "MyChrome": {
  *                     "desiredCapabilities": {
@@ -490,12 +492,8 @@ class WebDriver extends Helper {
       await this.defineTimeout(this.options.timeouts);
     }
 
-    if (this.isWeb && this.options.windowSize === 'maximize') {
-      await this.resizeWindow('maximize');
-    } else if (this.isWeb && this.options.windowSize && this.options.windowSize.indexOf('x') > 0) {
-      const dimensions = this.options.windowSize.split('x');
-      await this.resizeWindow(dimensions[0], dimensions[1]);
-    }
+    await this._resizeWindowIfNeeded(this.browser, this.options.windowSize);
+
     this.$$ = this.browser.$$.bind(this.browser);
     return this.browser;
   }
@@ -547,7 +545,15 @@ class WebDriver extends Helper {
         // 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));
-        return webdriverio.remote(opts);
+        const browser = await webdriverio.remote(opts);
+
+        if (opts.timeouts && this.isWeb) {
+          await this._defineBrowserTimeout(browser, opts.timeouts);
+        }
+
+        await this._resizeWindowIfNeeded(browser, opts.windowSize);
+
+        return browser;
       },
       stop: async (browser) => {
         return browser.deleteSession();
@@ -673,8 +679,6 @@ class WebDriver extends Helper {
   /**
    * Set [WebDriver timeouts](https://webdriver.io/docs/timeouts.html) in realtime.
    *
-   *
-   * * *Appium*: supported only for web testing.
    * Timeouts are expected to be passed as object:
    *
    * ```js
@@ -685,23 +689,26 @@ class WebDriver extends Helper {
    * @param timeouts WebDriver timeouts object.
    */
   defineTimeout(timeouts) {
-    return this.browser.setTimeout(timeouts);
+    return this._defineBrowserTimeout(this.browser, timeouts);
+  }
+
+  _defineBrowserTimeout(browser, timeouts) {
+    return browser.setTimeout(timeouts);
   }
 
   /**
    * Opens a web page in a browser. Requires relative or absolute url.
-If url starts with `/`, opens a web page of a site defined in `url` config parameter.
-
-```js
-I.amOnPage('/'); // opens main page of website
-I.amOnPage('https://github.com'); // opens github
-I.amOnPage('/login'); // opens a login page
-```
-
-@param url url path or global url.
-   *
+   * If url starts with `/`, opens a web page of a site defined in `url` config parameter.
+   * 
+   * ```js
+   * I.amOnPage('/'); // opens main page of website
+   * I.amOnPage('https://github.com'); // opens github
+   * I.amOnPage('/login'); // opens a login page
+   * ```
+   * 
+   * @param {string} url url path or global url.
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   amOnPage(url) {
     return this.browser.url(url);
@@ -709,32 +716,32 @@ I.amOnPage('/login'); // opens a login page
 
   /**
    * Perform a click on a link or a button, given by a locator.
-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.click('Logout');
-// button of form
-I.click('Submit');
-// CSS button
-I.click('#form input[type=submit]');
-// XPath
-I.click('//form/*[@type=submit]');
-// link in context
-I.click('Logout', '#nav');
-// using strict locator
-I.click({css: 'nav a.login'});
-```
-
-@param locator clickable link or button located by text, or any element located by CSS|XPath|strict locator.
-@param context (optional) element to search in CSS|XPath|Strict locator.
-   *
+   * 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.click('Logout');
+   * // button of form
+   * I.click('Submit');
+   * // CSS button
+   * I.click('#form input[type=submit]');
+   * // XPath
+   * I.click('//form/*[@type=submit]');
+   * // link in context
+   * I.click('Logout', '#nav');
+   * // using strict locator
+   * I.click({css: 'nav a.login'});
+   * ```
+   * 
+   * @param {string|object} locator clickable link or button located by text, or any element located by CSS|XPath|strict locator.
+   * @param {string|object} context (optional, `null` by default) element to search in CSS|XPath|Strict locator.
+   * {--end--}
    *
-   * * *Appium*: supported
+   * {{ react }}
    */
   async click(locator, context = null) {
     const clickMethod = this.browser.isMobile ? 'touchClick' : 'elementClick';
@@ -752,20 +759,20 @@ I.click({css: 'nav a.login'});
 
   /**
    * 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.
-
-```js
-I.doubleClick('Edit');
-I.doubleClick('Edit', '.actions');
-I.doubleClick({css: 'button.accept'});
-I.doubleClick('.btn.edit');
-```
-
-@param locator clickable link or button located by text, or any element located by CSS|XPath|strict locator.
-@param context (optional) element to search in CSS|XPath|Strict locator.
-   *
+   * Context can be specified as second parameter to narrow search.
+   * 
+   * ```js
+   * I.doubleClick('Edit');
+   * I.doubleClick('Edit', '.actions');
+   * I.doubleClick({css: 'button.accept'});
+   * I.doubleClick('.btn.edit');
+   * ```
+   * 
+   * @param {string|object} locator clickable link or button located by text, or any element located by CSS|XPath|strict locator.
+   * @param {string|object} context (optional, `null` by default) element to search in CSS|XPath|Strict locator.
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
+   * {{ react }}
    */
   async doubleClick(locator, context = null) {
     const locateFn = prepareLocateFn.call(this, context);
@@ -783,22 +790,21 @@ I.doubleClick('.btn.edit');
 
   /**
    * Performs right click on a clickable element matched by semantic locator, CSS or XPath.
-
-```js
-// right click element with id el
-I.rightClick('#el');
-// right click link or button with text "Click me"
-I.rightClick('Click me');
-// right click button with text "Click me" inside .context
-I.rightClick('Click me', '.context');
-```
-
-@param locator clickable element located by CSS|XPath|strict locator.
-@param context (optional) element located by CSS|XPath|strict locator.
-
-   *
+   * 
+   * ```js
+   * // right click element with id el
+   * I.rightClick('#el');
+   * // right click link or button with text "Click me"
+   * I.rightClick('Click me');
+   * // right click button with text "Click me" inside .context
+   * I.rightClick('Click me', '.context');
+   * ```
+   * 
+   * @param {string|object} locator clickable element located by CSS|XPath|strict locator.
+   * @param {string|object} context (optional, `null` by default) element located by CSS|XPath|strict locator.
+   * {--end--}
    *
-   * * *Appium*: supported, but in apps works as usual click
+   * {{ react }}
    */
   async rightClick(locator, context) {
     const locateFn = prepareLocateFn.call(this, context);
@@ -826,24 +832,23 @@ I.rightClick('Click me', '.context');
 
   /**
    * Fills a text field or textarea, after clearing its value, with the given string.
-Field is located by name, label, CSS, or XPath.
-
-```js
-// by label
-I.fillField('Email', 'hello@world.com');
-// by name
-I.fillField('password', secret('123456'));
-// by CSS
-I.fillField('form#login input[name=username]', 'John');
-// or by strict locator
-I.fillField({css: 'form#login input[name=username]'}, 'John');
-```
-@param field located by label|name|CSS|XPath|strict locator.
-@param value text value to fill.
-
-   *
+   * Field is located by name, label, CSS, or XPath.
+   * 
+   * ```js
+   * // by label
+   * I.fillField('Email', 'hello@world.com');
+   * // by name
+   * I.fillField('password', secret('123456'));
+   * // by CSS
+   * I.fillField('form#login input[name=username]', 'John');
+   * // or by strict locator
+   * I.fillField({css: 'form#login input[name=username]'}, 'John');
+   * ```
+   * @param {string|object} field located by label|name|CSS|XPath|strict locator.
+   * @param {string} value text value to fill.
+   * {--end--}
+   * {{ react }}
    *
-   * * *Appium*: supported
    */
   async fillField(field, value) {
     const res = await findFields.call(this, field);
@@ -854,16 +859,15 @@ I.fillField({css: 'form#login input[name=username]'}, 'John');
 
   /**
    * Appends text to a input field or textarea.
-Field is located by name, label, CSS or XPath
-
-```js
-I.appendField('#myTextField', 'appended');
-```
-@param field located by label|name|CSS|XPath|strict locator
-@param value text value to append.
-   *
-   *
-   * * *Appium*: supported, but it's clear a field before insert in apps
+   * Field is located by name, label, CSS or XPath
+   * 
+   * ```js
+   * I.appendField('#myTextField', 'appended');
+   * ```
+   * @param {string|object} field located by label|name|CSS|XPath|strict locator
+   * @param {string} value text value to append.
+   * {--end--}
+   * {{ react }}
    */
   async appendField(field, value) {
     const res = await findFields.call(this, field);
@@ -875,16 +879,15 @@ I.appendField('#myTextField', 'appended');
 
   /**
    * Clears a `<textarea>` or text `<input>` element's value.
-
-```js
-I.clearField('Email');
-I.clearField('user[email]');
-I.clearField('#email');
-```
-@param field located by label|name|CSS|XPath|strict locator.
-   *
+   * 
+   * ```js
+   * I.clearField('Email');
+   * I.clearField('user[email]');
+   * I.clearField('#email');
+   * ```
+   * @param {string|object} editable field located by label|name|CSS|XPath|strict locator.
+   * {--end--}
    *
-   * * *Appium*: supported
    */
   async clearField(field) {
     const res = await findFields.call(this, field);
@@ -896,25 +899,26 @@ I.clearField('#email');
 
   /**
    * Selects an option in a drop-down select.
-Field is searched by label | name | CSS | XPath.
-Option is selected by visible text or by value.
-
-```js
-I.selectOption('Choose Plan', 'Monthly'); // select by label
-I.selectOption('subscription', 'Monthly'); // match option by text
-I.selectOption('subscription', '0'); // or by value
-I.selectOption('//form/select[@name=account]','Premium');
-I.selectOption('form select[name=account]', 'Premium');
-I.selectOption({css: 'form select[name=account]'}, 'Premium');
-```
-
-Provide an array for the second argument to select multiple options.
-
-```js
-I.selectOption('Which OS do you use?', ['Android', 'iOS']);
-```
-@param select field located by label|name|CSS|XPath|strict locator.
-@param option visible text or value of option.
+   * Field is searched by label | name | CSS | XPath.
+   * Option is selected by visible text or by value.
+   * 
+   * ```js
+   * I.selectOption('Choose Plan', 'Monthly'); // select by label
+   * I.selectOption('subscription', 'Monthly'); // match option by text
+   * I.selectOption('subscription', '0'); // or by value
+   * I.selectOption('//form/select[@name=account]','Premium');
+   * I.selectOption('form select[name=account]', 'Premium');
+   * I.selectOption({css: 'form select[name=account]'}, 'Premium');
+   * ```
+   * 
+   * Provide an array for the second argument to select multiple options.
+   * 
+   * ```js
+   * I.selectOption('Which OS do you use?', ['Android', 'iOS']);
+   * ```
+   * @param {string|object} select field located by label|name|CSS|XPath|strict locator.
+   * @param {string|array} option visible text or value of option.
+   * {--end--}
    */
   async selectOption(select, option) {
     const res = await findFields.call(this, select);
@@ -947,16 +951,17 @@ I.selectOption('Which OS do you use?', ['Android', 'iOS']);
 
   /**
    * Attaches a file to element located by label, name, CSS or XPath
-Path to file is relative current codecept directory (where codecept.json or codecept.conf.js is located).
-File will be uploaded to remote system (if tests are running remotely).
-
-```js
-I.attachFile('Avatar', 'data/avatar.jpg');
-I.attachFile('form input[name=avatar]', 'data/avatar.jpg');
-```
-
-@param locator field located by label|name|CSS|XPath|strict locator.
-@param pathToFile local file path relative to codecept.json config file.
+   * Path to file is relative current codecept directory (where codecept.json or codecept.conf.js is located).
+   * File will be uploaded to remote system (if tests are running remotely).
+   * 
+   * ```js
+   * I.attachFile('Avatar', 'data/avatar.jpg');
+   * I.attachFile('form input[name=avatar]', 'data/avatar.jpg');
+   * ```
+   * 
+   * @param {string|object} locator field located by label|name|CSS|XPath|strict locator.
+   * @param {string} pathToFile local file path relative to codecept.json config file.
+   * {--end--}
    * Appium: not tested
    */
   async attachFile(locator, pathToFile) {
@@ -970,12 +975,11 @@ I.attachFile('form input[name=avatar]', 'data/avatar.jpg');
     assertElementExists(res, locator, 'File field');
     const el = usingFirstElement(res);
 
-    // Remote Uplaod (when running Selenium Server)
+    // Remote Upload (when running Selenium Server)
     if (this.options.remoteFileUpload) {
-      const fileCompressed = await fileToBase64Zip(file);
       try {
         this.debugSection('File', 'Uploading file to remote server');
-        file = await this.browser.uploadFile(fileCompressed);
+        file = await this.browser.uploadFile(file);
       } catch (err) {
         throw new Error(`File can't be transferred to remote server. Set \`remoteFileUpload: false\` in config to upload file locally.\n${err.message}`);
       }
@@ -986,17 +990,18 @@ I.attachFile('form input[name=avatar]', 'data/avatar.jpg');
 
   /**
    * Selects a checkbox or radio button.
-Element is located by label or name or CSS or XPath.
-
-The second parameter is a context (CSS or XPath locator) to narrow the search.
-
-```js
-I.checkOption('#agree');
-I.checkOption('I Agree to Terms and Conditions');
-I.checkOption('agree', '//form');
-```
-@param field checkbox located by label | name | CSS | XPath | strict locator.
-@param context (optional) element located by CSS | XPath | strict locator.
+   * Element is located by label or name or CSS or XPath.
+   * 
+   * The second parameter is a context (CSS or XPath locator) to narrow the search.
+   * 
+   * ```js
+   * I.checkOption('#agree');
+   * I.checkOption('I Agree to Terms and Conditions');
+   * I.checkOption('agree', '//form');
+   * ```
+   * @param {string|object} field checkbox located by label | name | CSS | XPath | strict locator.
+   * @param {string} context (optional, `null` by default) element located by CSS | XPath | strict locator.
+   * {--end--}
    * Appium: not tested
    */
   async checkOption(field, context = null) {
@@ -1010,23 +1015,24 @@ I.checkOption('agree', '//form');
     const elementId = getElementId(elem);
 
     const isSelected = await this.browser.isElementSelected(elementId);
-    if (isSelected.value) return Promise.resolve(true);
+    if (isSelected) return Promise.resolve(true);
     return this.browser[clickMethod](elementId);
   }
 
   /**
    * Unselects a checkbox or radio button.
-Element is located by label or name or CSS or XPath.
-
-The second parameter is a context (CSS or XPath locator) to narrow the search.
-
-```js
-I.uncheckOption('#agree');
-I.uncheckOption('I Agree to Terms and Conditions');
-I.uncheckOption('agree', '//form');
-```
-@param field checkbox located by label | name | CSS | XPath | strict locator.
-@param context (optional) element located by CSS | XPath | strict locator.
+   * Element is located by label or name or CSS or XPath.
+   * 
+   * The second parameter is a context (CSS or XPath locator) to narrow the search.
+   * 
+   * ```js
+   * I.uncheckOption('#agree');
+   * I.uncheckOption('I Agree to Terms and Conditions');
+   * I.uncheckOption('agree', '//form');
+   * ```
+   * @param {string|object} field checkbox located by label | name | CSS | XPath | strict locator.
+   * @param {string} context (optional, `null` by default) element located by CSS | XPath | strict locator.
+   * {--end--}
    * Appium: not tested
    */
   async uncheckOption(field, context = null) {
@@ -1040,23 +1046,23 @@ I.uncheckOption('agree', '//form');
     const elementId = getElementId(elem);
 
     const isSelected = await this.browser.isElementSelected(elementId);
-    if (!isSelected.value) return Promise.resolve(true);
+    if (!isSelected) return Promise.resolve(true);
     return this.browser[clickMethod](elementId);
   }
 
   /**
    * Retrieves a text from an element located by CSS or XPath and returns it to test.
-Resumes test execution, so **should be used inside async with `await`** operator.
-
-```js
-let pin = await I.grabTextFrom('#pin');
-```
-If multiple elements found returns an array of texts.
-
-@param locator element located by CSS|XPath|strict locator.
-   *
+   * Resumes test execution, so **should be used inside async with `await`** operator.
+   * 
+   * ```js
+   * let pin = await I.grabTextFrom('#pin');
+   * ```
+   * If multiple elements found returns an array of texts.
+   * 
+   * @param locator element located by CSS|XPath|strict locator.
+   * @returns {Promise<string>} attribute value
+   * {--end--}
    *
-   * * *Appium*: supported
    */
   async grabTextFrom(locator) {
     const res = await this._locate(locator, true);
@@ -1073,17 +1079,17 @@ If multiple elements found returns an array of texts.
 
   /**
    * Retrieves the innerHTML from an element located by CSS or XPath and returns it to test.
-Resumes test execution, so **should be used inside async function with `await`** operator.
-If more than one element is found - an array of HTMLs returned.
-
-```js
-let postHTML = await I.grabHTMLFrom('#post');
-```
-
-@param locator element located by CSS|XPath|strict locator.
-   *
+   * Resumes test execution, so **should be used inside async function with `await`** operator.
+   * If more than one element is found - an array of HTMLs returned.
+   * 
+   * ```js
+   * let postHTML = await I.grabHTMLFrom('#post');
+   * ```
+   * 
+   * @param locator element located by CSS|XPath|strict locator.
+   * @returns {Promise<string>} HTML code for an element
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async grabHTMLFrom(locator) {
     const elems = await this._locate(locator, true);
@@ -1098,15 +1104,15 @@ let postHTML = await I.grabHTMLFrom('#post');
 
   /**
    * Retrieves a value from a form element located by CSS or XPath and returns it to test.
-Resumes test execution, so **should be used inside async function with `await`** operator.
-
-```js
-let email = await I.grabValueFrom('input[name=email]');
-```
-@param locator field located by label|name|CSS|XPath|strict locator.
-   *
+   * Resumes test execution, so **should be used inside async function with `await`** operator.
+   * 
+   * ```js
+   * let email = await I.grabValueFrom('input[name=email]');
+   * ```
+   * @param {string|object} locator field located by label|name|CSS|XPath|strict locator.
+   * @returns {Promise<string>} attribute value
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async grabValueFrom(locator) {
     const res = await this._locate(locator, true);
@@ -1117,14 +1123,16 @@ let email = await I.grabValueFrom('input[name=email]');
 
   /**
    * Grab CSS property for given locator
-Resumes test execution, so **should be used inside an async function with `await`** operator.
-
-```js
-const value = await I.grabCssPropertyFrom('h3', 'font-weight');
-```
-
-@param locator element located by CSS|XPath|strict locator.
-@param cssProperty CSS property name.
+   * Resumes test execution, so **should be used inside an async function with `await`** operator.
+   * 
+   * ```js
+   * const value = await I.grabCssPropertyFrom('h3', 'font-weight');
+   * ```
+   * 
+   * @param {string|object} locator element located by CSS|XPath|strict locator.
+   * @param {string} cssProperty CSS property name.
+   * @returns {Promise<string>} CSS value
+   * {--end--}
    */
   async grabCssPropertyFrom(locator, cssProperty) {
     const res = await this._locate(locator, true);
@@ -1134,14 +1142,16 @@ const value = await I.grabCssPropertyFrom('h3', 'font-weight');
 
   /**
    * Retrieves an attribute from an element located by CSS or XPath and returns it to test.
-An array as a result will be returned if there are more than one matched element.
-Resumes test execution, so **should be used inside async with `await`** operator.
-
-```js
-let hint = await I.grabAttributeFrom('#tooltip', 'title');
-```
-@param locator element located by CSS|XPath|strict locator.
-@param attr attribute name.
+   * An array as a result will be returned if there are more than one matched element.
+   * Resumes test execution, so **should be used inside async with `await`** operator.
+   * 
+   * ```js
+   * let hint = await I.grabAttributeFrom('#tooltip', 'title');
+   * ```
+   * @param {string|object} locator element located by CSS|XPath|strict locator.
+   * @param {string} attr attribute name.
+   * @returns {Promise<string>} attribute value
+   * {--end--}
    * Appium: can be used for apps only with several values ("contentDescription", "text", "className", "resourceId")
    */
   async grabAttributeFrom(locator, attr) {
@@ -1152,11 +1162,14 @@ let hint = await I.grabAttributeFrom('#tooltip', 'title');
 
   /**
    * Checks that title contains text.
-
-@param text text value to check.
-   *
+   * 
+   * ```js
+   * I.seeInTitle('Home Page');
+   * ```
+   * 
+   * @param {string} text text value to check.
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async seeInTitle(text) {
     const title = await this.browser.getTitle();
@@ -1179,11 +1192,14 @@ let hint = await I.grabAttributeFrom('#tooltip', 'title');
 
   /**
    * Checks that title does not contain text.
-
-@param text text value to check.
-   *
+   * 
+   * ```js
+   * I.dontSeeInTitle('Error');
+   * ```
+   * 
+   * @param {string} text value to check.
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async dontSeeInTitle(text) {
     const title = await this.browser.getTitle();
@@ -1192,14 +1208,15 @@ let hint = await I.grabAttributeFrom('#tooltip', 'title');
 
   /**
    * Retrieves a page title and returns it to test.
-Resumes test execution, so **should be used inside async with `await`** operator.
-
-```js
-let title = await I.grabTitle();
-```
-   *
+   * Resumes test execution, so **should be used inside async with `await`** operator.
+   * 
+   * ```js
+   * let title = await I.grabTitle();
+   * ```
+   * 
+   * @returns {Promise<string>} title
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async grabTitle() {
     const title = await this.browser.getTitle();
@@ -1209,18 +1226,18 @@ let title = await I.grabTitle();
 
   /**
    * Checks that a page contains a visible text.
-Use context parameter to narrow down the search.
-
-```js
-I.see('Welcome'); // text welcome on a page
-I.see('Welcome', '.content'); // text inside .content div
-I.see('Register', {css: 'form.register'}); // use strict locator
-```
-@param text expected on page.
-@param context (optional) element located by CSS|Xpath|strict locator in which to search for text.
-   *
+   * Use context parameter to narrow down the search.
+   * 
+   * ```js
+   * I.see('Welcome'); // text welcome on a page
+   * I.see('Welcome', '.content'); // text inside .content div
+   * I.see('Register', {css: 'form.register'}); // use strict locator
+   * ```
+   * @param {string} text expected on page.
+   * @param {string|object} context (optional, `null` by default) element located by CSS|Xpath|strict locator in which to search for text.
+   * {--end--}
    *
-   * * *Appium*: supported with context in apps
+   * {{ react }}
    */
   async see(text, context = null) {
     return proceedSee.call(this, 'assert', text, context);
@@ -1242,16 +1259,19 @@ I.see('Register', {css: 'form.register'}); // use strict locator
 
   /**
    * Opposite to `see`. Checks that a text is not present on a page.
-Use context parameter to narrow down the search.
-
-```js
-I.dontSee('Login'); // assume we are already logged in
-```
-@param text is not present.
-@param context (optional) element located by CSS|XPath|strict locator in which to perfrom search.
+   * Use context parameter to narrow down the search.
+   * 
+   * ```js
+   * I.dontSee('Login'); // assume we are already logged in.
+   * I.dontSee('Login', '.nav'); // no login inside .nav element
+   * ```
+   * 
+   * @param {string} text which is not present.
+   * @param {string|object} context (optional) element located by CSS|XPath|strict locator in which to perfrom search.
    *
+   * {--end--}
    *
-   * * *Appium*: supported with context in apps
+   * {{ react }}
    */
   async dontSee(text, context = null) {
     return proceedSee.call(this, 'negate', text, context);
@@ -1259,19 +1279,18 @@ I.dontSee('Login'); // assume we are already logged in
 
   /**
    * Checks that the given input field or textarea equals to given value.
-For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
-
-```js
-I.seeInField('Username', 'davert');
-I.seeInField({css: 'form textarea'},'Type your comment here');
-I.seeInField('form input[type=hidden]','hidden_value');
-I.seeInField('#searchform input','Search');
-```
-@param field located by label|name|CSS|XPath|strict locator.
-@param value value to check.
-   *
+   * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
+   * 
+   * ```js
+   * I.seeInField('Username', 'davert');
+   * I.seeInField({css: 'form textarea'},'Type your comment here');
+   * I.seeInField('form input[type=hidden]','hidden_value');
+   * I.seeInField('#searchform input','Search');
+   * ```
+   * @param {string|object} field located by label|name|CSS|XPath|strict locator.
+   * @param {string} value value to check.
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async seeInField(field, value) {
     return proceedSeeField.call(this, 'assert', field, value);
@@ -1279,13 +1298,17 @@ I.seeInField('#searchform input','Search');
 
   /**
    * Checks that value of input field or textare doesn't equal to given value
-Opposite to `seeInField`.
-
-@param field located by label|name|CSS|XPath|strict locator.
-@param value value to check.
-   *
+   * Opposite to `seeInField`.
+   * 
+   * ```js
+   * I.dontSeeInField('email', 'user@user.com'); // field by name
+   * I.dontSeeInField({ css: 'form input.email' }, 'user@user.com'); // field by CSS
+   * ```
+   * 
+   * @param {string|object} field located by label|name|CSS|XPath|strict locator.
+   * @param {string} value value to check.
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async dontSeeInField(field, value) {
     return proceedSeeField.call(this, 'negate', field, value);
@@ -1293,13 +1316,15 @@ Opposite to `seeInField`.
 
   /**
    * Verifies that the specified checkbox is checked.
-
-```js
-I.seeCheckboxIsChecked('Agree');
-I.seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
-I.seeCheckboxIsChecked({css: '#signup_form input[type=checkbox]'});
-```
-@param field located by label|name|CSS|XPath|strict locator.
+   * 
+   * ```js
+   * I.seeCheckboxIsChecked('Agree');
+   * I.seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
+   * I.seeCheckboxIsChecked({css: '#signup_form input[type=checkbox]'});
+   * ```
+   * 
+   * @param {string|object} field located by label|name|CSS|XPath|strict locator.
+   * {--end--}
    * Appium: not tested
    */
   async seeCheckboxIsChecked(field) {
@@ -1308,8 +1333,15 @@ I.seeCheckboxIsChecked({css: '#signup_form input[type=checkbox]'});
 
   /**
    * Verifies that the specified checkbox is not checked.
-
-@param field located by label|name|CSS|XPath|strict locator.
+   * 
+   * ```js
+   * I.dontSeeeCheckboxIsChedcked('#agree'); // located by ID
+   * I.dontSeeeCheckboxIsChedcked('I agree to terms'); // located by label
+   * I.dontSeeeCheckboxIsChedcked('agree'); // located by name
+   * ```
+   * 
+   * @param {string|object} field located by label|name|CSS|XPath|strict locator.
+   * {--end--}
    * Appium: not tested
    */
   async dontSeeCheckboxIsChecked(field) {
@@ -1318,15 +1350,15 @@ I.seeCheckboxIsChecked({css: '#signup_form input[type=checkbox]'});
 
   /**
    * Checks that a given Element is visible
-Element is located by CSS or XPath.
-
-```js
-I.seeElement('#modal');
-```
-@param locator located by CSS|XPath|strict locator.
-   *
+   * Element is located by CSS or XPath.
+   * 
+   * ```js
+   * I.seeElement('#modal');
+   * ```
+   * @param {string|object} locator located by CSS|XPath|strict locator.
+   * {--end--}
+   * {{ react }}
    *
-   * * *Appium*: supported
    */
   async seeElement(locator) {
     const res = await this._locate(locator, true);
@@ -1337,11 +1369,14 @@ I.seeElement('#modal');
 
   /**
    * Opposite to `seeElement`. Checks that element is not visible (or in DOM)
-
-@param locator located by CSS|XPath|Strict locator.
-   *
-   *
-   * * *Appium*: supported
+   * 
+   * ```js
+   * I.dontSeeElement('.modal'); // modal is not shown
+   * ```
+   * 
+   * @param {string|object} locator located by CSS|XPath|Strict locator.
+   * {--end--}
+   * {{ react }}
    */
   async dontSeeElement(locator) {
     const res = await this._locate(locator, false);
@@ -1354,15 +1389,14 @@ I.seeElement('#modal');
 
   /**
    * Checks that a given Element is present in the DOM
-Element is located by CSS or XPath.
-
-```js
-I.seeElementInDOM('#modal');
-```
-@param locator located by CSS|XPath|strict locator.
-   *
+   * Element is located by CSS or XPath.
+   * 
+   * ```js
+   * I.seeElementInDOM('#modal');
+   * ```
+   * @param {string|object} locator element located by CSS|XPath|strict locator.
+   * {--end--}
    *
-   * * *Appium*: supported
    */
   async seeElementInDOM(locator) {
     const res = await this.$$(withStrictLocator(locator));
@@ -1371,11 +1405,14 @@ I.seeElementInDOM('#modal');
 
   /**
    * Opposite to `seeElementInDOM`. Checks that element is not on page.
-
-@param locator located by CSS|XPath|Strict locator.
-   *
+   * 
+   * ```js
+   * I.dontSeeElementInDOM('.nav'); // checks that element is not on page visible or not
+   * ```
+   * 
+   * @param {string|object} locator located by CSS|XPath|Strict locator.
+   * {--end--}
    *
-   * * *Appium*: supported
    */
   async dontSeeElementInDOM(locator) {
     const res = await this.$$(withStrictLocator(locator));
@@ -1384,14 +1421,13 @@ I.seeElementInDOM('#modal');
 
   /**
    * Checks that the current page contains the given string in its raw source code.
-
-```js
-I.seeInSource('<h1>Green eggs &amp; ham</h1>');
-```
-@param text value to check.
-   *
+   * 
+   * ```js
+   * I.seeInSource('<h1>Green eggs &amp; ham</h1>');
+   * ```
+   * @param {string} text value to check.
+   * {--end--}
    *
-   * * *Appium*: supported
    */
   async seeInSource(text) {
     const source = await this.browser.getPageSource();
@@ -1400,14 +1436,15 @@ I.seeInSource('<h1>Green eggs &amp; ham</h1>');
 
   /**
    * Retrieves page source and returns it to test.
-Resumes test execution, so should be used inside an async function.
-
-```js
-let pageSource = await I.grabSource();
-```
-   *
+   * Resumes test execution, so should be used inside an async function.
+   * 
+   * ```js
+   * let pageSource = await I.grabSource();
+   * ```
+   * 
+   * @returns {Promise<string>} source code
+   * {--end--}
    *
-   * * *Appium*: supported
    */
   async grabSource() {
     return this.browser.getPageSource();
@@ -1431,12 +1468,15 @@ let pageSource = await I.grabSource();
 
   /**
    * Get current URL from browser.
-Resumes test execution, so should be used inside an async function.
-
-```js
-let url = await I.grabCurrentUrl();
-console.log(`Current URL is [${url}]`);
-```
+   * Resumes test execution, so should be used inside an async function.
+   * 
+   * ```js
+   * let url = await I.grabCurrentUrl();
+   * console.log(`Current URL is [${url}]`);
+   * ```
+   * 
+   * @returns {Promise<string>} current URL
+   * {--end--}
    */
   async grabCurrentUrl() {
     const res = await this.browser.getUrl();
@@ -1446,12 +1486,13 @@ console.log(`Current URL is [${url}]`);
 
   /**
    * Checks that the current page does not contains the given string in its raw source code.
-
-@param text value to check.
-
-   *
-   *
-   * * *Appium*: supported
+   * 
+   * ```js
+   * I.dontSeeInSource('<!--'); // no comments in source
+   * ```
+   * 
+   * @param {string} value to check.
+   * {--end--}
    */
   async dontSeeInSource(text) {
     const source = await this.browser.getPageSource();
@@ -1461,16 +1502,16 @@ console.log(`Current URL is [${url}]`);
   /**
    * Asserts that an element appears a given number of times in the DOM.
    * Element is located by label or name or CSS or XPath.
-   *
-   *
-   * * *Appium*: supported
-   *
+   * 
+   * 
    * ```js
    * I.seeNumberOfElements('#submitBtn', 1);
    * ```
-   *
-   * @param locator element located by CSS|XPath|strict locator.
-   * @param num number of elements.
+   * 
+   * @param {string|object} locator element located by CSS|XPath|strict locator.
+   * @param {number} num number of elements.
+   * {--end--}
+   * {{ react }}
    */
   async seeNumberOfElements(locator, num) {
     const res = await this._locate(locator);
@@ -1479,14 +1520,16 @@ console.log(`Current URL is [${url}]`);
 
   /**
    * Asserts that an element is visible a given number of times.
-Element is located by CSS or XPath.
-
-```js
-I.seeNumberOfVisibleElements('.buttons', 3);
-```
-
-@param locator element located by CSS|XPath|strict locator.
-@param num number of elements.
+   * Element is located by CSS or XPath.
+   * 
+   * ```js
+   * I.seeNumberOfVisibleElements('.buttons', 3);
+   * ```
+   * 
+   * @param {string|object} locator element located by CSS|XPath|strict locator.
+   * @param {number} num number of elements.
+   * {--end--}
+   * {{ react }}
    */
   async seeNumberOfVisibleElements(locator, num) {
     const res = await this.grabNumberOfVisibleElements(locator);
@@ -1495,13 +1538,14 @@ I.seeNumberOfVisibleElements('.buttons', 3);
 
   /**
    * Checks that all elements with given locator have given CSS properties.
-
-```js
-I.seeCssPropertiesOnElements('h3', { 'font-weight': "bold"});
-```
-
-@param locator located by CSS|XPath|strict locator.
-@param cssProperties object with CSS properties and their values to check.
+   * 
+   * ```js
+   * I.seeCssPropertiesOnElements('h3', { 'font-weight': "bold"});
+   * ```
+   * 
+   * @param {string|object} locator located by CSS|XPath|strict locator.
+   * @param {object} cssProperties object with CSS properties and their values to check.
+   * {--end--}
    */
   async seeCssPropertiesOnElements(locator, cssProperties) {
     const res = await this._locate(locator);
@@ -1537,13 +1581,14 @@ I.seeCssPropertiesOnElements('h3', { 'font-weight': "bold"});
 
   /**
    * Checks that all elements with given locator have given attributes.
-
-```js
-I.seeAttributesOnElements('//form', {'method': "post"});
-```
-
-@param locator located by CSS|XPath|strict locator.
-@param attributes object with attributes and their values to check.
+   * 
+   * ```js
+   * I.seeAttributesOnElements('//form', { method: "post"});
+   * ```
+   * 
+   * @param {string|object} locator located by CSS|XPath|strict locator.
+   * @param {object} attributes attributes and their values to check.
+   * {--end--}
    */
   async seeAttributesOnElements(locator, attributes) {
     const res = await this._locate(locator);
@@ -1571,12 +1616,14 @@ I.seeAttributesOnElements('//form', {'method': "post"});
 
   /**
    * Grab number of visible elements by locator.
-
-```js
-I.grabNumberOfVisibleElements('p');
-```
-
-@param locator located by CSS|XPath|strict locator.
+   * 
+   * ```js
+   * let numOfElements = await I.grabNumberOfVisibleElements('p');
+   * ```
+   * 
+   * @param {string|object} locator located by CSS|XPath|strict locator.
+   * @returns {Promise<number>} number of visible elements
+   * {--end--}
    */
   async grabNumberOfVisibleElements(locator) {
     const res = await this._locate(locator);
@@ -1589,15 +1636,14 @@ I.grabNumberOfVisibleElements('p');
 
   /**
    * Checks that current url contains a provided fragment.
-
-```js
-I.seeInCurrentUrl('/register'); // we are on registration page
-```
-
-@param url value to check.
-   *
+   * 
+   * ```js
+   * I.seeInCurrentUrl('/register'); // we are on registration page
+   * ```
+   * 
+   * @param {string} url a fragment to check
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async seeInCurrentUrl(url) {
     const res = await this.browser.getUrl();
@@ -1606,11 +1652,10 @@ I.seeInCurrentUrl('/register'); // we are on registration page
 
   /**
    * Checks that current url does not contain a provided fragment.
-
-@param url value to check.
+   * 
+   * @param {string} url value to check.
+   * {--end--}
    *
-   *
-   * * *Appium*: supported only for web testing
    */
   async dontSeeInCurrentUrl(url) {
     const res = await this.browser.getUrl();
@@ -1619,18 +1664,17 @@ I.seeInCurrentUrl('/register'); // we are on registration page
 
   /**
    * Checks that current url is equal to provided one.
-If a relative url provided, a configured url will be prepended to it.
-So both examples will work:
-
-```js
-I.seeCurrentUrlEquals('/register');
-I.seeCurrentUrlEquals('http://my.site.com/register');
-```
-
-@param url value to check.
-   *
+   * If a relative url provided, a configured url will be prepended to it.
+   * So both examples will work:
+   * 
+   * ```js
+   * I.seeCurrentUrlEquals('/register');
+   * I.seeCurrentUrlEquals('http://my.site.com/register');
+   * ```
+   * 
+   * @param {string} url value to check.
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async seeCurrentUrlEquals(url) {
     const res = await this.browser.getUrl();
@@ -1639,12 +1683,16 @@ I.seeCurrentUrlEquals('http://my.site.com/register');
 
   /**
    * Checks that current url is not equal to provided one.
-If a relative url provided, a configured url will be prepended to it.
-
-@param url value to check.
-   *
+   * If a relative url provided, a configured url will be prepended to it.
+   * 
+   * ```js
+   * I.dontSeeCurrentUrlEquals('/login'); // relative url are ok
+   * I.dontSeeCurrentUrlEquals('http://mysite.com/login'); // absolute urls are also ok
+   * ```
+   * 
+   * @param {string} url value to check.
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async dontSeeCurrentUrlEquals(url) {
     const res = await this.browser.getUrl();
@@ -1653,33 +1701,32 @@ If a relative url provided, a configured url will be prepended to it.
 
   /**
    * Executes sync script on a page.
-Pass arguments to function as additional parameters.
-Will return execution result to a test.
-In this case you should use async function and await to receive results.
-
-Example with jQuery DatePicker:
-
-```js
-// change date of jQuery DatePicker
-I.executeScript(function() {
-  // now we are inside browser context
-  $('date').datetimepicker('setDate', new Date());
-});
-```
-Can return values. Don't forget to use `await` to get them.
-
-```js
-let date = await I.executeScript(function(el) {
-  // only basic types can be returned
-  return $(el).datetimepicker('getDate').toString();
-}, '#date'); // passing jquery selector
-```
-
-@param fn function to be executed in browser context.
-@param ...args args to be passed to function.
-   *
+   * Pass arguments to function as additional parameters.
+   * Will return execution result to a test.
+   * In this case you should use async function and await to receive results.
+   * 
+   * Example with jQuery DatePicker:
+   * 
+   * ```js
+   * // change date of jQuery DatePicker
+   * I.executeScript(function() {
+   *   // now we are inside browser context
+   *   $('date').datetimepicker('setDate', new Date());
+   * });
+   * ```
+   * Can return values. Don't forget to use `await` to get them.
+   * 
+   * ```js
+   * let date = await I.executeScript(function(el) {
+   *   // only basic types can be returned
+   *   return $(el).datetimepicker('getDate').toString();
+   * }, '#date'); // passing jquery selector
+   * ```
+   * 
+   * @param {string|function} fn function to be executed in browser context.
+   * @param ...args args to be passed to function.
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    *
    * Wraps [execute](http://webdriver.io/api/protocol/execute.html) command.
    */
@@ -1689,31 +1736,30 @@ let date = await I.executeScript(function(el) {
 
   /**
    * Executes async script on page.
-Provided function should execute a passed callback (as first argument) to signal it is finished.
-
-Example: In Vue.js to make components completely rendered we are waiting for [nextTick](https://vuejs.org/v2/api/#Vue-nextTick).
-
-```js
-I.executeAsyncScript(function(done) {
-  Vue.nextTick(done); // waiting for next tick
-});
-```
-
-By passing value to `done()` function you can return values.
-Additional arguments can be passed as well, while `done` function is always last parameter in arguments list.
-
-```js
-let val = await I.executeAsyncScript(function(url, done) {
-  // in browser context
-  $.ajax(url, { success: (data) => done(data); }
-}, 'http://ajax.callback.url/');
-```
-
-@param fn function to be executed in browser context.
-@param ...args args to be passed to function.
-   *
+   * Provided function should execute a passed callback (as first argument) to signal it is finished.
+   * 
+   * Example: In Vue.js to make components completely rendered we are waiting for [nextTick](https://vuejs.org/v2/api/#Vue-nextTick).
+   * 
+   * ```js
+   * I.executeAsyncScript(function(done) {
+   *   Vue.nextTick(done); // waiting for next tick
+   * });
+   * ```
+   * 
+   * By passing value to `done()` function you can return values.
+   * Additional arguments can be passed as well, while `done` function is always last parameter in arguments list.
+   * 
+   * ```js
+   * let val = await I.executeAsyncScript(function(url, done) {
+   *   // in browser context
+   *   $.ajax(url, { success: (data) => done(data); }
+   * }, 'http://ajax.callback.url/');
+   * ```
+   * 
+   * @param {string|function} fn function to be executed in browser context.
+   * @param ...args args to be passed to function.
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   executeAsyncScript(fn) {
     return this.browser.executeAsync.apply(this.browser, arguments);
@@ -1722,32 +1768,17 @@ let val = await I.executeAsyncScript(function(url, done) {
   /**
    * Scrolls to element matched by locator.
    * Extra shift can be set with offsetX and offsetY options.
-   *
+   * 
    * ```js
    * I.scrollTo('footer');
    * I.scrollTo('#submit', 5, 5);
    * ```
+   * 
+   * @param {string|object} locator located by CSS|XPath|strict locator.
+   * @param {number} offsetX (optional, `0` by default) X-axis offset.
+   * @param {number} offsetY (optional, `0` by default) Y-axis offset.
+   * {--end--}
    *
-   * @param locator located by CSS|XPath|strict locator.
-   * @param offsetX (optional) X-axis offset.
-   * @param offsetY (optional) Y-axis offset.
-   */
-
-  /**
-   * Scrolls to element matched by locator.
-Extra shift can be set with offsetX and offsetY options.
-
-```js
-I.scrollTo('footer');
-I.scrollTo('#submit', 5, 5);
-```
-
-@param locator located by CSS|XPath|strict locator.
-@param offsetX (optional) X-axis offset.
-@param offsetY (optional) Y-axis offset.
-   *
-   *
-   * * *Appium*: supported only for web testing
    */
   async scrollTo(locator, offsetX = 0, offsetY = 0) {
     if (typeof locator === 'number' && typeof offsetX === 'number') {
@@ -1778,19 +1809,18 @@ I.scrollTo('#submit', 5, 5);
 
   /**
    * Moves cursor to element matched by locator.
-Extra shift can be set with offsetX and offsetY options.
-
-```js
-I.moveCursorTo('.tooltip');
-I.moveCursorTo('#submit', 5,5);
-```
-
-@param locator located by CSS|XPath|strict locator.
-@param offsetX (optional) X-axis offset.
-@param offsetY (optional) Y-axis offset.
-   *
+   * Extra shift can be set with offsetX and offsetY options.
+   * 
+   * ```js
+   * I.moveCursorTo('.tooltip');
+   * I.moveCursorTo('#submit', 5,5);
+   * ```
+   * 
+   * @param {string|object} locator located by CSS|XPath|strict locator.
+   * @param {number} offsetX (optional, `0` by default) X-axis offset.
+   * @param {number} offsetY (optional, `0` by default) Y-axis offset.
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async moveCursorTo(locator, offsetX = 0, offsetY = 0) {
     const res = await this._locate(withStrictLocator(locator), true);
@@ -1801,19 +1831,18 @@ I.moveCursorTo('#submit', 5,5);
 
   /**
    * Saves a screenshot to ouput folder (set in codecept.json or codecept.conf.js).
-Filename is relative to output folder. 
-Optionally resize the window to the full available page `scrollHeight` and `scrollWidth` to capture the entire page by passing `true` in as the second argument.
-
-```js
-I.saveScreenshot('debug.png');
-I.saveScreenshot('debug.png', true) //resizes to available scrollHeight and scrollWidth before taking screenshot
-```
-
-@param fileName file name to save. 
-@param fullPage (optional) flag to enable fullscreen screenshot mode.
-   *
+   * Filename is relative to output folder.
+   * Optionally resize the window to the full available page `scrollHeight` and `scrollWidth` to capture the entire page by passing `true` in as the second argument.
+   * 
+   * ```js
+   * I.saveScreenshot('debug.png');
+   * I.saveScreenshot('debug.png', true) //resizes to available scrollHeight and scrollWidth before taking screenshot
+   * ```
+   * 
+   * @param {string} fileName file name to save.
+   * @param {boolean} fullPage (optional, `false` by default) flag to enable fullscreen screenshot mode.
+   * {--end--}
    *
-   * * *Appium*: supported
    */
   async saveScreenshot(fileName, fullPage = false) {
     const outputFile = screenshotOutputFolder(fileName);
@@ -1846,15 +1875,14 @@ I.saveScreenshot('debug.png', true) //resizes to available scrollHeight and scro
 
   /**
    * Sets a cookie.
-
-```js
-I.setCookie({name: 'auth', value: true});
-```
-
-@param cookie cookie JSON object.
-   *
+   * 
+   * ```js
+   * I.setCookie({name: 'auth', value: true});
+   * ```
+   * 
+   * @param {object} cookie a cookie object.
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    *
    * Uses Selenium's JSON [cookie
    * format](https://code.google.com/p/selenium/wiki/JsonWireProtocol#Cookie_JSON_Object).
@@ -1865,17 +1893,16 @@ I.setCookie({name: 'auth', value: true});
 
   /**
    * Clears a cookie by name,
-if none provided clears all cookies.
-
-```js
-I.clearCookie();
-I.clearCookie('test');
-```
-
-@param cookie (optional) cookie name.
-   *
+   * if none provided clears all cookies.
+   * 
+   * ```js
+   * I.clearCookie();
+   * I.clearCookie('test');
+   * ```
+   * 
+   * @param {string} cookie (optional, `null` by default) cookie name
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async clearCookie(cookie) {
     return this.browser.deleteCookies(cookie);
@@ -1883,15 +1910,14 @@ I.clearCookie('test');
 
   /**
    * Checks that cookie with given name exists.
-
-```js
-I.seeCookie('Auth');
-```
-
-@param name cookie name.
-   *
+   * 
+   * ```js
+   * I.seeCookie('Auth');
+   * ```
+   * 
+   * @param {string} name cookie name.
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async seeCookie(name) {
     const cookie = await this.browser.getCookies([name]);
@@ -1900,11 +1926,14 @@ I.seeCookie('Auth');
 
   /**
    * Checks that cookie with given name does not exist.
-
-@param name cookie name.
-   *
+   * 
+   * ```js
+   * I.dontSeeCookie('auth'); // no auth cookie
+   * ```
+   * 
+   * @param {string} name cookie name.
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async dontSeeCookie(name) {
     const cookie = await this.browser.getCookies([name]);
@@ -1913,18 +1942,18 @@ I.seeCookie('Auth');
 
   /**
    * Gets a cookie object by name.
-If none provided gets all cookies.
-* Resumes test execution, so **should be used inside async with `await`** operator.
-
-```js
-let cookie = await I.grabCookie('auth');
-assert(cookie.value, '123456');
-```
-
-@param name (optional) cookie name.
-   *
+   * If none provided gets all cookies.
+   * * Resumes test execution, so **should be used inside async with `await`** operator.
+   * 
+   * ```js
+   * let cookie = await I.grabCookie('auth');
+   * assert(cookie.value, '123456');
+   * ```
+   * 
+   * @param [name=null] cookie name.
+   * @returns {Promise<string>} attribute value
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async grabCookie(name) {
     if (!name) return this.browser.getCookies();
@@ -1937,8 +1966,6 @@ assert(cookie.value, '123456');
    * Accepts the active JavaScript native popup window, as created by window.alert|window.confirm|window.prompt.
    * Don't confuse popups with modal windows, as created by [various
    * libraries](http://jster.net/category/windows-modals-popups).
-   *
-   * * *Appium*: supported only for web testing
    */
   async acceptPopup() {
     return this.browser.getAlertText().then((res) => {
@@ -1951,8 +1978,6 @@ assert(cookie.value, '123456');
   /**
    * Dismisses the active JavaScript popup, as created by window.alert|window.confirm|window.prompt.
    *
-   *
-   * * *Appium*: supported only for web testing
    */
   async cancelPopup() {
     return this.browser.getAlertText().then((res) => {
@@ -1966,8 +1991,6 @@ assert(cookie.value, '123456');
    * Checks that the active JavaScript popup, as created by `window.alert|window.confirm|window.prompt`, contains the
    * given string.
    *
-   * * *Appium*: supported only for web testing
-   *
    * @param text value to check.
    */
   async seeInPopup(text) {
@@ -1996,53 +2019,22 @@ assert(cookie.value, '123456');
 
   /**
    * Presses a key on a focused element.
-Special keys like 'Enter', 'Control', [etc](https://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/value)
-will be replaced with corresponding unicode.
-If modifier key is used (Control, Command, Alt, Shift) in array, it will be released afterwards.
-
-```js
-I.pressKey('Enter');
-I.pressKey(['Control','a']);
-```
-
-@param key key or array of keys to press.
-   * [Valid key names](https://w3c.github.io/webdriver/#keyboard-actions) are:
-
-- `'Add'`,
-- `'Alt'`,
-- `'ArrowDown'` or `'Down arrow'`,
-- `'ArrowLeft'` or `'Left arrow'`,
-- `'ArrowRight'` or `'Right arrow'`,
-- `'ArrowUp'` or `'Up arrow'`,
-- `'Backspace'`,
-- `'Command'`,
-- `'Control'`,
-- `'Del'`,
-- `'Divide'`,
-- `'End'`,
-- `'Enter'`,
-- `'Equals'`,
-- `'Escape'`,
-- `'F1 to F12'`,
-- `'Home'`,
-- `'Insert'`,
-- `'Meta'`,
-- `'Multiply'`,
-- `'Numpad 0'` to `'Numpad 9'`,
-- `'Pagedown'` or `'PageDown'`,
-- `'Pageup'` or `'PageUp'`,
-- `'Pause'`,
-- `'Semicolon'`,
-- `'Shift'`,
-- `'Space'`,
-- `'Subtract'`,
-- `'Tab'`.
+   * Special keys like 'Enter', 'Control', [etc](https://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/value)
+   * will be replaced with corresponding unicode.
+   * If modifier key is used (Control, Command, Alt, Shift) in array, it will be released afterwards.
+   * 
+   * ```js
+   * I.pressKey('Enter');
+   * I.pressKey(['Control','a']);
+   * ```
+   * 
+   * @param {string|array} key key or array of keys to press.
+   * {--end--}
+   * {{ keys }}
    *
    * To make combinations with modifier and mouse clicks (like Ctrl+Click) press a modifier, click, then release it.
    *
    *
-   * * *Appium*: supported, but clear field before pressing in apps:
-   *
    * ```js
    * I.pressKey('Control');
    * I.click('#someelement');
@@ -2062,33 +2054,48 @@ I.pressKey(['Control','a']);
 
   /**
    * Resize the current window to provided width and height.
-First parameter can be set to `maximize`.
-
-@param width width in pixels or `maximize`.
-@param height height in pixels.
+   * First parameter can be set to `maximize`.
+   * 
+   * @param {number} width width in pixels or `maximize`.
+   * @param {number} height height in pixels.
+   * {--end--}
    * Appium: not tested in web, in apps doesn't work
    */
   async resizeWindow(width, height) {
+    return this._resizeBrowserWindow(this.browser, width, height);
+  }
+
+  async _resizeBrowserWindow(browser, width, height) {
     if (width === 'maximize') {
-      const size = await this.browser.maximizeWindow();
+      const size = await browser.maximizeWindow();
       this.debugSection('Window Size', size);
       return;
     }
-    if (this.browser.isW3C) {
-      return this.browser.setWindowRect(null, null, parseInt(width, 10), parseInt(height, 10));
+    if (browser.isW3C) {
+      return browser.setWindowRect(null, null, parseInt(width, 10), parseInt(height, 10));
+    }
+    return browser.setWindowSize(parseInt(width, 10), parseInt(height, 10));
+  }
+
+  async _resizeWindowIfNeeded(browser, windowSize) {
+    if (this.isWeb && windowSize === 'maximize') {
+      await this._resizeBrowserWindow(browser, 'maximize');
+    } else if (this.isWeb && windowSize && windowSize.indexOf('x') > 0) {
+      const dimensions = windowSize.split('x');
+      await this._resizeBrowserWindow(browser, dimensions[0], dimensions[1]);
     }
-    return this.browser.setWindowSize(parseInt(width, 10), parseInt(height, 10));
   }
 
   /**
    * Drag an item to a destination element.
-
-```js
-I.dragAndDrop('#dragHandle', '#container');
-```
-
-@param srcElement located by CSS|XPath|strict locator.
-@param destElement located by CSS|XPath|strict locator.
+   * 
+   * ```js
+   * I.dragAndDrop('#dragHandle', '#container');
+   * ```
+   * 
+   * @param {string|object} srcElement located by CSS|XPath|strict locator.
+   * @param {string|object} destElement located by CSS|XPath|strict locator.
+   * {--end--}
    * Appium: not tested
    */
   async dragAndDrop(srcElement, destElement) {
@@ -2105,15 +2112,16 @@ I.dragAndDrop('#dragHandle', '#container');
 
   /**
    * Drag the scrubber of a slider to a given position
-For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
-
-```js
-I.dragSlider('#slider', 30);
-I.dragSlider('#slider', -70);
-```
-
-@param locator located by label|name|CSS|XPath|strict locator.
-@param offsetX position to drag.
+   * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
+   * 
+   * ```js
+   * I.dragSlider('#slider', 30);
+   * I.dragSlider('#slider', -70);
+   * ```
+   * 
+   * @param {string|object} locator located by label|name|CSS|XPath|strict locator.
+   * @param {number} offsetX position to drag.
+   * {--end--}
    */
   async dragSlider(locator, offsetX = 0) {
     const browser = this.browser;
@@ -2135,12 +2143,51 @@ I.dragSlider('#slider', -70);
     await browser.buttonUp(0);
   }
 
+  /**
+   * Get all Window Handles.
+   * Useful for referencing a specific handle when calling `I.switchToWindow(handle)`
+   *
+   * ```js
+   * const windows = await I.grabAllWindowHandles();
+   * ```
+   */
+  async grabAllWindowHandles() {
+    return this.browser.getWindowHandles();
+  }
 
   /**
-   * Close all tabs except for the current one.
+   * Get the current Window Handle.
+   * Useful for referencing it when calling `I.switchToWindow(handle)`
+   *
+   * ```js
+   * const window = await I.grabCurrentWindowHandle();
+   * ```
+   */
+  async grabCurrentWindowHandle() {
+    return this.browser.getWindowHandle();
+  }
+
+  /**
+   * Switch to the window with a specified handle.
+   *
+   * ```js
+   * const windows = await I.grabAllWindowHandles();
+   * // ... do something
+   * await I.switchToWindow( windows[0] );
    *
+   * const window = await.grabCurrentWindowHandle();
+   * // ... do something
+   * await I.switchToWindow( window );
+   * ```
+   */
+  async switchToWindow(window) {
+    await this.browser.switchToWindow(window);
+  }
+
+
+  /**
+   * Close all tabs except for the current one.
    *
-   * * *Appium*: supported web test
    *
    * ```js
    * I.closeOtherTabs();
@@ -2160,16 +2207,14 @@ I.dragSlider('#slider', -70);
 
   /**
    * Pauses execution for a number of seconds.
-
-```js
-I.wait(2); // wait 2 secs
-```
-
-@param sec number of second to wait.
-@param sec time in seconds to wait.
-   *
+   * 
+   * ```js
+   * I.wait(2); // wait 2 secs
+   * ```
+   * 
+   * @param {number} sec number of second to wait.
+   * {--end--}
    *
-   * * *Appium*: supported
    */
   async wait(sec) {
     return new Promise(resolve => setTimeout(resolve, sec * 1000));
@@ -2177,13 +2222,12 @@ I.wait(2); // wait 2 secs
 
   /**
    * Waits for element to become enabled (by default waits for 1sec).
-Element can be located by CSS or XPath.
-
-@param locator element located by CSS|XPath|strict locator.
-@param sec (optional) time in seconds to wait, 1 by default.
-   *
+   * Element can be located by CSS or XPath.
+   * 
+   * @param {string|object} locator element located by CSS|XPath|strict locator.
+   * @param sec (optional) time in seconds to wait, 1 by default.
+   * {--end--}
    *
-   * * *Appium*: supported
    */
   async waitForEnabled(locator, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
@@ -2202,15 +2246,16 @@ Element can be located by CSS or XPath.
 
   /**
    * Waits for element to be present on page (by default waits for 1sec).
-Element can be located by CSS or XPath.
-
-```js
-I.waitForElement('.btn.continue');
-I.waitForElement('.btn.continue', 5); // wait for 5 secs
-```
-
-@param locator element located by CSS|XPath|strict locator.
-@param sec (optional) time in seconds to wait, 1 by default.
+   * Element can be located by CSS or XPath.
+   * 
+   * ```js
+   * I.waitForElement('.btn.continue');
+   * I.waitForElement('.btn.continue', 5); // wait for 5 secs
+   * ```
+   * 
+   * @param {string|object} locator element located by CSS|XPath|strict locator.
+   * @param {number} sec (optional, `1` by default) time in seconds to wait
+   * {--end--}
    */
   async waitForElement(locator, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
@@ -2230,13 +2275,14 @@ I.waitForElement('.btn.continue', 5); // wait for 5 secs
 
   /**
    * Waiting for the part of the URL to match the expected. Useful for SPA to understand that page was changed.
-
-```js
-I.waitInUrl('/info', 2);
-```
-
-@param urlPart value to check.
-@param sec (optional) time in seconds to wait.
+   * 
+   * ```js
+   * I.waitInUrl('/info', 2);
+   * ```
+   * 
+   * @param {string} urlPart value to check.
+   * @param {number} sec (optional, `1` by default) time in seconds to wait
+   * {--end--}
    */
   async waitInUrl(urlPart, sec = null) {
     const client = this.browser;
@@ -2258,14 +2304,15 @@ I.waitInUrl('/info', 2);
 
   /**
    * Waits for the entire URL to match the expected
-
-```js
-I.waitUrlEquals('/info', 2);
-I.waitUrlEquals('http://127.0.0.1:8000/info');
-```
-
-@param urlPart value to check.
-@param sec (optional) time in seconds to wait.
+   * 
+   * ```js
+   * I.waitUrlEquals('/info', 2);
+   * I.waitUrlEquals('http://127.0.0.1:8000/info');
+   * ```
+   * 
+   * @param {string} urlPart value to check.
+   * @param {number} sec (optional, `1` by default) time in seconds to wait
+   * {--end--}
    */
   async waitUrlEquals(urlPart, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
@@ -2289,17 +2336,18 @@ I.waitUrlEquals('http://127.0.0.1:8000/info');
 
   /**
    * Waits for a text to appear (by default waits for 1sec).
-Element can be located by CSS or XPath.
-Narrow down search results by providing context.
-
-```js
-I.waitForText('Thank you, form has been submitted');
-I.waitForText('Thank you, form has been submitted', 5, '#modal');
-```
-
-@param text to wait for.
-@param sec (optional) time in seconds to wait.
-@param context (optional) element located by CSS|XPath|strict locator.
+   * Element can be located by CSS or XPath.
+   * Narrow down search results by providing context.
+   * 
+   * ```js
+   * I.waitForText('Thank you, form has been submitted');
+   * I.waitForText('Thank you, form has been submitted', 5, '#modal');
+   * ```
+   * 
+   * @param {string }text to wait for.
+   * @param {number} sec (optional, `1` by default) time in seconds to wait
+   * @param {string|object} context (optional) element located by CSS|XPath|strict locator.
+   * {--end--}
    *
    */
   async waitForText(text, sec = null, context = null) {
@@ -2321,14 +2369,15 @@ I.waitForText('Thank you, form has been submitted', 5, '#modal');
 
   /**
    * Waits for the specified value to be in value attribute.
-
-```js
-I.waitForValue('//input', "GoodValue");
-```
-
-@param field input field.
-@param value expected value.
-@param sec (optional) time in seconds to wait, 1 sec by default.
+   * 
+   * ```js
+   * I.waitForValue('//input', "GoodValue");
+   * ```
+   * 
+   * @param {string|object} field input field.
+   * @param {string }value expected value.
+   * @param {number} sec (optional, `1` by default) time in seconds to wait
+   * {--end--}
    */
   async waitForValue(field, value, sec = null) {
     const client = this.browser;
@@ -2349,17 +2398,16 @@ I.waitForValue('//input', "GoodValue");
 
   /**
    * Waits for an element to become visible on a page (by default waits for 1sec).
-Element can be located by CSS or XPath.
-
-```
-I.waitForVisible('#popup');
-```
-
-@param locator element located by CSS|XPath|strict locator.
-@param sec (optional) time in seconds to wait, 1 by default.
-   *
+   * Element can be located by CSS or XPath.
+   * 
+   * ```js
+   * I.waitForVisible('#popup');
+   * ```
+   * 
+   * @param {string|object} locator element located by CSS|XPath|strict locator.
+   * @param {number} sec (optional, `1` by default) time in seconds to wait
+   * {--end--}
    *
-   * * *Appium*: supported
    */
   async waitForVisible(locator, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
@@ -2376,14 +2424,15 @@ I.waitForVisible('#popup');
 
   /**
    * Waits for a specified number of elements on the page.
-
-```js
-I.waitNumberOfVisibleElements('a', 3);
-```
-
-@param locator element located by CSS|XPath|strict locator.
-@param num number of elements.
-@param sec (optional) time in seconds to wait.
+   * 
+   * ```js
+   * I.waitNumberOfVisibleElements('a', 3);
+   * ```
+   * 
+   * @param {string|object} locator element located by CSS|XPath|strict locator.
+   * @param {number} num number of elements.
+   * @param {number} sec (optional, `1` by default) time in seconds to wait
+   * {--end--}
    */
   async waitNumberOfVisibleElements(locator, num, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
@@ -2399,17 +2448,16 @@ I.waitNumberOfVisibleElements('a', 3);
 
   /**
    * Waits for an element to be removed or become invisible on a page (by default waits for 1sec).
-Element can be located by CSS or XPath.
-
-```
-I.waitForInvisible('#popup');
-```
-
-@param locator element located by CSS|XPath|strict locator.
-@param sec (optional) time in seconds to wait, 1 by default.
-   *
+   * Element can be located by CSS or XPath.
+   * 
+   * ```js
+   * I.waitForInvisible('#popup');
+   * ```
+   * 
+   * @param {string|object} locator element located by CSS|XPath|strict locator.
+   * @param {number} sec (optional, `1` by default) time in seconds to wait
+   * {--end--}
    *
-   * * *Appium*: supported
    */
   async waitForInvisible(locator, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
@@ -2423,17 +2471,16 @@ I.waitForInvisible('#popup');
 
   /**
    * Waits for an element to hide (by default waits for 1sec).
-Element can be located by CSS or XPath.
-
-```
-I.waitToHide('#popup');
-```
-
-@param locator element located by CSS|XPath|strict locator.
-@param sec (optional) time in seconds to wait, 1 by default.
-   *
+   * Element can be located by CSS or XPath.
+   * 
+   * ```js
+   * I.waitToHide('#popup');
+   * ```
+   * 
+   * @param {string|object} locator element located by CSS|XPath|strict locator.
+   * @param {number} sec (optional, `1` by default) time in seconds to wait
+   * {--end--}
    *
-   * * *Appium*: supported
    */
   async waitToHide(locator, sec = null) {
     return this.waitForInvisible(locator, sec);
@@ -2446,17 +2493,16 @@ I.waitToHide('#popup');
 
   /**
    * Waits for an element to become not attached to the DOM on a page (by default waits for 1sec).
-Element can be located by CSS or XPath.
-
-```
-I.waitForDetached('#popup');
-```
-
-@param locator element located by CSS|XPath|strict locator.
-@param sec (optional) time in seconds to wait, 1 by default.
-   *
+   * Element can be located by CSS or XPath.
+   * 
+   * ```js
+   * I.waitForDetached('#popup');
+   * ```
+   * 
+   * @param {string|object} locator element located by CSS|XPath|strict locator.
+   * @param {number} sec (optional, `1` by default) time in seconds to wait
+   * {--end--}
    *
-   * * *Appium*: supported
    */
   async waitForDetached(locator, sec = null) {
     const aSec = sec || this.options.waitForTimeout;
@@ -2471,24 +2517,23 @@ I.waitForDetached('#popup');
 
   /**
    * Waits for a function to return true (waits for 1 sec by default).
-Running in browser context.
-
-```js
-I.waitForFunction(fn[, [args[, timeout]])
-```
-
-```js
-I.waitForFunction(() => window.requests == 0);
-I.waitForFunction(() => window.requests == 0, 5); // waits for 5 sec
-I.waitForFunction((count) => window.requests == count, [3], 5) // pass args and wait for 5 sec
-```
-
-@param fn to be executed in browser context.
-@param argsOrSec (optional) arguments for function or seconds.
-@param sec (optional) time in seconds to wait, 1 by default.
-   *
+   * Running in browser context.
+   * 
+   * ```js
+   * I.waitForFunction(fn[, [args[, timeout]])
+   * ```
+   * 
+   * ```js
+   * I.waitForFunction(() => window.requests == 0);
+   * I.waitForFunction(() => window.requests == 0, 5); // waits for 5 sec
+   * I.waitForFunction((count) => window.requests == count, [3], 5) // pass args and wait for 5 sec
+   * ```
+   * 
+   * @param {string|function} fn to be executed in browser context.
+   * @param {array|number} argsOrSec (optional, `1` by default) arguments for function or seconds.
+   * @param {number} sec (optional, `1` by default) time in seconds to wait
+   * {--end--}
    *
-   * * *Appium*: supported
    */
   async waitForFunction(fn, argsOrSec = null, sec = null) {
     let args = [];
@@ -2506,18 +2551,17 @@ I.waitForFunction((count) => window.requests == count, [3], 5) // pass args and
 
   /**
    * Waits for a function to return true (waits for 1sec by default).
-
-```js
-I.waitUntil(() => window.requests == 0);
-I.waitUntil(() => window.requests == 0, 5);
-```
-
-@param fn function which is executed in browser context.
-@param sec (optional) time in seconds to wait, 1 by default.
-@param timeoutMsg (optional) message to show in case of timeout fail.
+   * 
+   * ```js
+   * I.waitUntil(() => window.requests == 0);
+   * I.waitUntil(() => window.requests == 0, 5);
+   * ```
+   * 
+   * @param {function|string} fn function which is executed in browser context.
+   * @param {number} sec (optional, `1` by default) time in seconds to wait
+   * @param {string} [timeoutMsg=''] message to show in case of timeout fail.
+   * {--end--}
    *
-   * @param interval (optional) time in seconds between condition checks.
-   * * *Appium*: supported
    */
   async waitUntil(fn, sec = null, timeoutMsg = null, interval = null) {
     const aSec = sec || this.options.waitForTimeout;
@@ -2527,11 +2571,15 @@ I.waitUntil(() => window.requests == 0, 5);
 
   /**
    * Switches frame or in case of null locator reverts to parent.
-
-@param locator element located by CSS|XPath|strict locator.
-   *
+   * 
+   * ```js
+   * I.switchTo('iframe'); // switch to first iframe
+   * I.switchTo(); // switch back to main page
+   * ```
+   * 
+   * @param {string|object} locator (optional, `null` by default) element located by CSS|XPath|strict locator.
+   * {--end--}
    *
-   * * *Appium*: supported only for web testing
    */
   async switchTo(locator) {
     this.browser.isInsideFrame = true;
@@ -2625,10 +2673,13 @@ I.waitUntil(() => window.requests == 0, 5);
 
   /**
    * Grab number of open tabs.
-
-```js
-I.grabNumberOfOpenTabs();
-```
+   * 
+   * ```js
+   * let tabs = await I.grabNumberOfOpenTabs();
+   * ```
+   * 
+   * @returns {Promise<number>} number of open tabs
+   * {--end--}
    */
   async grabNumberOfOpenTabs() {
     const pages = await this.browser.getWindowHandles();
@@ -2638,11 +2689,11 @@ I.grabNumberOfOpenTabs();
 
   /**
    * Reload the current page.
-
-```js
-I.refreshPage();
-```
-
+   * 
+   * ```js
+   * I.refreshPage();
+   * ```
+   * {--end--}
    */
   async refreshPage() {
     const client = this.browser;
@@ -2651,10 +2702,11 @@ I.refreshPage();
 
   /**
    * Scroll page to the top.
-
-```js
-I.scrollPageToTop();
-```
+   * 
+   * ```js
+   * I.scrollPageToTop();
+   * ```
+   * {--end--}
    */
   scrollPageToTop() {
     const client = this.browser;
@@ -2667,10 +2719,11 @@ I.scrollPageToTop();
 
   /**
    * Scroll page to the bottom.
-
-```js
-I.scrollPageToBottom();
-```
+   * 
+   * ```js
+   * I.scrollPageToBottom();
+   * ```
+   * {--end--}
    */
   scrollPageToBottom() {
     const client = this.browser;
@@ -2688,11 +2741,14 @@ I.scrollPageToBottom();
 
   /**
    * Retrieves a page scroll position and returns it to test.
-Resumes test execution, so **should be used inside an async function with `await`** operator.
-
-```js
-let { x, y } = await I.grabPageScrollPosition();
-```
+   * Resumes test execution, so **should be used inside an async function with `await`** operator.
+   * 
+   * ```js
+   * let { x, y } = await I.grabPageScrollPosition();
+   * ```
+   * 
+   * @returns {Promise<object>} scroll position
+   * {--end--}
    */
   async grabPageScrollPosition() {
     /* eslint-disable comma-dangle */