webdriverio 4.10.1 → 4.12.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # CHANGELOG
 
+## v4.12.0 (2018-03-07)
+* global changes:
+    * docs improvements
+    * allow to set `proxy` and `agent` request options
+* wdio changes:
+    * support for files with `.es6` ending
+
+## v4.11.0 (2018-02-27)
+* global changes:
+    * docs improvements
+    * Add new selector strategies from WebdriverAgent (#2613)
+* bugfixes:
+    * isVisibleWithinViewport check fix if element is not existing (#2593)
+    * propagate `process.execArgv` correctly
+* wdio changes:
+    * increase framework timeout if `--inspect` parameter is found in execArgv
+
+## v4.10.2 (2018-02-02)
+* global changes:
+    * docs improvements
+* bugfixes:
+    * better unknown command detection (#2580)
+
 ## v4.10.1 (2018-01-12)
 * bugfixes:
     * fallback to old JSONWireProtocol commands when running Chromedriver
@@ -12,7 +35,7 @@
 * global changes:
     * docs improvements
     * fallbacks for depcrecated JsonWireProtocol commands (#2493)
-* wdio changes
+* wdio changes:
     * Add ability to specify a spec and suite (#2505)
     * Add support for filtering specs #2520
 

package/GOVERNANCE.md

@@ -0,0 +1,60 @@
+# WebdriverIO Project Governance
+
+The WebdriverIO Project wants as much as possible to operate using procedures that are fair, open, inviting, and ultimately good for the community. For that reason we find it valuable to codify some of the ways that the Project goes about its day-to-day business. We want to make sure that no matter who you are, you have the opportunity to contribute to WebdriverIO. We want to make sure that no one corporation can exert undue influence on the community or hold the Project hostage. And likewise we want to make sure that corporations which benefit from WebdriverIO are also incentivized to give back.
+
+### The Technical Committee
+
+The project is officially led by a Technical Committee (TC), currently
+consisting of:
+
+* [@bromann](https://github.com/christian-bromann)
+* [@camme](https://github.com/camme)
+* [@vvo](https://github.com/vvo)
+* [@georgecrawford](https://github.com/georgecrawford)
+
+They all represent different companies and different types of contribution to the WebdriverIO Project. The TC is responsible for high-level decisions (like establishing a feature roadmap, accepting sponsorship, organizing conferences, etc...), adjudicating conflicts between members of the community, and making changes to the project's governance processes.
+
+* Membership in the TC is granted by unanimous vote of current TC members.
+* TC members can step down at any time.
+* No more than 1/3 of TC members may belong to the same company.
+* Changes to project governance require unanimous vote of the TC.
+
+### Project Committers
+
+Most of the project maintenance is handled by committers, community members who have been granted commit access to the WebdriverIO organization on GitHub. The responsibilities of committers include: reviewing and merging pull requests, walking through changes with developers, weighing in on architectural issues, and so on.
+
+* Any two TC members can decide to make someone a project committer, providing that person has shown an appropriate understanding of the WebdriverIO codebase through prior contributions of code.
+* In general any committer can review and merge a PR. In general committers should only merge code they are qualified to review, which might entail pinging another committer who has greater ownership over a specific code area.
+* Debates between committers about whether code should be merged should happen in GitHub pull requests.
+* Proposals for large changes to the project's code (architectural changes, etc...) should be brought forward as a GitHub issue (with the label `Proposal`), and all committers should be pinged so they can weigh in on the discussion if desired. Substantial changes, whether in proposal stage or in pull request stage should be signed off on by 1 TC member and at least 2 other committers. To assist in the discussion, a small proof of concept can be undertaken on a subset of the WebdriverIO ecosystem and raised as a strawman PR, to give flesh to the proposal and make discussion more helpfully concrete.
+* In general disputes about code should be resolved by discussion, not votes. If there is substantial disagreement, aim for consensus. If that is not possible, committers can bring the dispute to the TC for a vote, with the outcome determined by a majority.
+* Any committer can decide to close a PR or issue if they determine the change doesn't suit the project.
+* WebdriverIO has a large ecosystem of repositories. Some are 'core' in the sense of being central subpackages with a lot of traffic like `webdriverio/webdriverio`. Others are 'peripheral' in the sense of receiving few changes, being maintained by 1 person or no one, etc..., like `webdriverio/cucumber-boilerplate` or `webdriverio/jasmine-boilerplate`. For 'core' repos, committers should not merge their own code straightaway. Like all contributors they should open a PR and get a +1 from another committer. For 'peripheral' repos for which they are the sole maintainer or for which they have a good understanding, it is obtuse to insist on another contributor's +1 and this rule should be relaxed in that case. In sum: use good judgment and don't ram code through without a review when you can help it.
+
+The current committers are (in addition to the TC members above):
+
+* [@WillBrock](https://github.com/WillBrock)
+* [@fijijavis](https://github.com/fijijavis)
+* [@TuHuynhVan](https://github.com/TuHuynhVan)
+* [@wvankuipers](https://github.com/wvankuipers)
+* [@klamping](https://github.com/klamping)
+* [@zinserjan](https://github.com/zinserjan)
+* [@TheSavior](https://github.com/TheSavior)
+* [@lgandecki](https://github.com/lgandecki)
+* [@jankcat](https://github.com/jankcat)
+* [@amitaibu](https://github.com/amitaibu)
+* [@ThomasFett](https://github.com/ThomasFett)
+* [@moizjv](https://github.com/moizjv)
+
+### Contributors
+
+Other, less formal, kinds of contribution are outlined in our
+[CONTRIBUTING](/CONTRIBUTING.md) doc.
+
+### Sponsorship
+
+The WebdriverIO project welcomes sponsorship of various organizations. Specific details are not yet available but in general we will accept monetary donations, contribution of code, contribution of dedicated committers, or donations of other goods or service (internet hosting, etc...). To begin the conversation, reach out to one of the TC members.
+
+### Raising Issues Related to Governance
+
+This governance model necessarily leaves many situations unspecified. If questions arise as to how a given situation should proceed according to the overall goals of the project, the best thing to do is to open a GitHub issue and ping the TC members.

package/build/lib/cli.js

@@ -57,7 +57,7 @@ var SUPPORTED_FRAMEWORKS = ['mocha', // https://github.com/webdriverio/wdio-moch
 'cucumber' // https://github.com/webdriverio/wdio-cucumber-framework
 ];
 var SUPPORTED_REPORTER = [' dot - https://github.com/webdriverio/wdio-dot-reporter', ' spec - https://github.com/webdriverio/wdio-spec-reporter', ' junit - https://github.com/webdriverio/wdio-junit-reporter', ' allure - https://github.com/webdriverio/wdio-allure-reporter', ' teamcity - https://github.com/sullenor/wdio-teamcity-reporter', ' json - https://github.com/fijijavis/wdio-json-reporter', ' concise - https://github.com/FloValence/wdio-concise-reporter', ' testrail - https://github.com/oxynade/wdio-testrail-reporter', ' mochawesome - https://github.com/fijijavis/wdio-mochawesome-reporter'];
-var SUPPORTED_SERVICES = [' sauce - https://github.com/webdriverio/wdio-sauce-service', ' browserstack - https://github.com/itszero/wdio-browserstack-service', ' testingbot - https://github.com/testingbot/wdio-testingbot-service', ' appium - https://github.com/rhysd/wdio-appium-service', ' firefox-profile - https://github.com/webdriverio/wdio-firefox-profile-service', ' selenium-standalone - https://github.com/webdriverio/wdio-selenium-standalone-service', ' phantomjs - https://github.com/cognitom/wdio-phantomjs-service', ' static-server - https://github.com/LeadPages/wdio-static-server-service', ' visual-regression - https://github.com/zinserjan/wdio-visual-regression-service', ' webpack - https://github.com/leadpages/wdio-webpack-service', ' webpack-dev-server - https://gitlab.com/Vinnl/wdio-webpack-dev-server-service', ' chromedriver - https://github.com/atti187/wdio-chromedriver-service', ' iedriver - https://github.com/atti187/wdio-iedriver-service'];
+var SUPPORTED_SERVICES = [' sauce - https://github.com/webdriverio/wdio-sauce-service', ' browserstack - https://github.com/itszero/wdio-browserstack-service', ' testingbot - https://github.com/testingbot/wdio-testingbot-service', ' appium - https://github.com/rhysd/wdio-appium-service', ' firefox-profile - https://github.com/webdriverio/wdio-firefox-profile-service', ' selenium-standalone - https://github.com/webdriverio/wdio-selenium-standalone-service', ' phantomjs - https://github.com/cognitom/wdio-phantomjs-service', ' static-server - https://github.com/LeadPages/wdio-static-server-service', ' visual-regression - https://github.com/zinserjan/wdio-visual-regression-service', ' webpack - https://github.com/leadpages/wdio-webpack-service', ' webpack-dev-server - https://gitlab.com/Vinnl/wdio-webpack-dev-server-service', ' chromedriver - https://github.com/atti187/wdio-chromedriver-service', ' iedriver - https://github.com/atti187/wdio-iedriver-service', ' docker - https://github.com/stsvilik/wdio-docker-service', ' screenshots-cleanup - https://github.com/andriilazebnyi/wdio-screenshots-cleanup-service'];
 
 var VERSION = _package2.default.version;
 var ALLOWED_ARGV = ['host', 'port', 'path', 'user', 'key', 'logLevel', 'coloredLogs', 'screenshotPath', 'baseUrl', 'waitforTimeout', 'framework', 'reporters', 'suite', 'spec', 'cucumberOpts', 'jasmineOpts', 'mochaOpts', 'connectionRetryTimeout', 'connectionRetryCount', 'watch'];
@@ -453,9 +453,8 @@ var launch = function launch() {
  * if stdin.isTTY, then no piped input is present and launcher should be
  * called immediately, otherwise piped input is processed, expecting
  * a list of files to process.
- * stdin.isTTY is false when command is from nodes spawn since it's treated as a pipe
  */
-if (process.stdin.isTTY || !process.stdout.isTTY) {
+if (process.stdin.isTTY) {
     launch();
 } else {
     var stdinData = '';

package/build/lib/commands/isVisibleWithinViewport.js

@@ -36,7 +36,7 @@ module.exports = function isVisibleWithinViewport(selector) {
          * if element does not exist it is automatically not visible :-)
          */
         if (err.message.indexOf('NoSuchElement') > -1) {
-            return true;
+            return false;
         }
 
         throw err;

package/build/lib/commands/touchAction.js

@@ -67,12 +67,20 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
             'release'
         ])
 
+        // multi action using x y variables
+        // moveTo location is relative from the starting coordinate
+        browser.touchAction([
+            { action: 'press', x: 20, y: 550 },
+            { action: 'moveTo', x: 0, y: -500},
+            'release'
+        ])
+
         // drag&drop to element
         screen.touchAction([
             'press',
             { action: 'moveTo', selector: '//UIAApplication[1]/UIAElement[2]' },
             'release'
-        ]))
+        ])
     });
 
     :multiTouchAction.js
@@ -80,7 +88,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
         // drag&drop with two fingers 200px down
         browser.touchAction([
             [{action: 'press', x:  10, y: 10}, { action: 'moveTo', x: 0, y: 200 }, 'release'],
-            [{action: 'press', x: 100, y: 10}, { action: 'moveTo', x: 0, y: 200 }, 'release']]
+            [{action: 'press', x: 100, y: 10}, { action: 'moveTo', x: 0, y: 200 }, 'release']
         ])
     })
  * </example>

package/build/lib/helpers/findElementStrategy.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 var _ErrorHandler = require('../utils/ErrorHandler');
 
 var DEFAULT_SELECTOR = 'css selector';
-var DIRECT_SELECTOR_REGEXP = /^(id|css selector|xpath|link text|partial link text|name|tag name|class name|-android uiautomator|-ios uiautomation|accessibility id):(.+)/;
+var DIRECT_SELECTOR_REGEXP = /^(id|css selector|xpath|link text|partial link text|name|tag name|class name|-android uiautomator|-ios uiautomation|-ios predicate string|-ios class chain|accessibility id):(.+)/;
 
 var findStrategy = function findStrategy() {
     var value = arguments.length <= 0 ? undefined : arguments[0];
@@ -67,11 +67,23 @@ var findStrategy = function findStrategy() {
         using = '-android uiautomator';
         value = value.slice(8);
 
-        // recursive element search using the UIAutomation library (iOS-only)
+        // recursive element search using the UIAutomation or XCUITest library (iOS-only)
     } else if (value.indexOf('ios=') === 0) {
-        using = '-ios uiautomation';
         value = value.slice(4);
 
+        if (value.indexOf('predicate=') === 0) {
+            // Using 'ios=predicate=' (iOS 10+ only)
+            using = '-ios predicate string';
+            value = value.slice(10);
+        } else if (value.indexOf('chain=') === 0) {
+            // Using 'ios=chain=' (iOS 10+ only)
+            using = '-ios class chain';
+            value = value.slice(6);
+        } else {
+            // Legacy iOS (<= 9.3) UIAutomation library
+            using = '-ios uiautomation';
+        }
+
         // recursive element search using accessibility id
     } else if (value.indexOf('~') === 0) {
         using = 'accessibility id';

package/build/lib/helpers/sanitize.js

@@ -16,16 +16,13 @@ var _jsonStringifySafe = require('json-stringify-safe');
 
 var _jsonStringifySafe2 = _interopRequireDefault(_jsonStringifySafe);
 
-var _validator = require('validator');
-
-var _validator2 = _interopRequireDefault(_validator);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var OBJLENGTH = 10;
 var ARRLENGTH = 10;
 var STRINGLIMIT = 1000;
 var STRINGTRUNCATE = 200;
+var notBase64 = /[^A-Z0-9+/=]/i;
 
 var sanitizeString = function sanitizeString(str) {
     if (!str) {
@@ -91,6 +88,20 @@ var css = function css(value) {
     return value.trim().replace(/'/g, '').replace(/"/g, '').toLowerCase();
 };
 
+var isBase64 = function isBase64(str) {
+    if (typeof str !== 'string') {
+        return false;
+    }
+
+    var len = str.length;
+    if (!len || len % 4 !== 0 || notBase64.test(str)) {
+        return false;
+    }
+
+    var firstPaddingChar = str.indexOf('=');
+    return firstPaddingChar === -1 || firstPaddingChar === len - 1 || firstPaddingChar === len - 2 && str[len - 1] === '=';
+};
+
 /**
  * Limit the length of an arbitrary variable of any type, suitable for being logged or displayed
  * @param  {Any} val Any variable
@@ -104,7 +115,7 @@ var limit = function limit(val) {
 
     switch (Object.prototype.toString.call(val)) {
         case '[object String]':
-            if (val.length > 100 && _validator2.default.isBase64(val)) {
+            if (val.length > 100 && isBase64(val)) {
                 return `[base64] ${val.length} bytes`;
             }
 

package/build/lib/helpers/utilities.js

@@ -62,7 +62,7 @@ function isUnknownCommand(err) {
     /**
      * when running browser driver directly
      */
-    if (err.message.match(/Invalid Command Method/) || err.message.match(/did not match a known command/) || err.message.match(/unknown command/) || err.message.match(/Driver info: driver\.version: unknown/) || err.message.match(/did not map to a valid resource/)) {
+    if (err.message.match(/Invalid Command Method/) || err.message.match(/did not match a known command/) || err.message.match(/unknown command/) || err.message.match(/Driver info: driver\.version: unknown/) || err.message.match(/Method has not yet been implemented/) || err.message.match(/did not map to a valid resource/)) {
         return true;
     }
 

package/build/lib/helpers/wdio.conf.ejs

@@ -273,13 +273,13 @@ exports.config = {
     // beforeHook: function () {
     // },
     /**
-     * Hook that gets executed _after_ a hook within the suite starts (e.g. runs after calling
+     * Hook that gets executed _after_ a hook within the suite ends (e.g. runs after calling
      * afterEach in Mocha)
      */
     // afterHook: function () {
     // },
     /**
-     * Function to be executed after a test (in Mocha/Jasmine) or a step (in Cucumber) starts.
+     * Function to be executed after a test (in Mocha/Jasmine) or a step (in Cucumber) ends.
      * @param {Object} test test details
      */
     // afterTest: function (test) {

package/build/lib/launcher.js

@@ -521,7 +521,7 @@ var Launcher = function () {
                 return a.runningInstances;
             }).reduce(function (a, b) {
                 return a + b;
-            });
+            }, 0);
         }
 
         /**
@@ -536,7 +536,7 @@ var Launcher = function () {
                 return a.specs.length;
             }).reduce(function (a, b) {
                 return a + b;
-            });
+            }, 0);
         }
 
         /**
@@ -583,7 +583,7 @@ var Launcher = function () {
 
             // The default value for child.fork execArgs is process.execArgs,
             // so continue to use this unless another value is specified in config.
-            var defaultArgs = capExecArgs.length ? process.execArgv : [];
+            var defaultArgs = capExecArgs.length === 0 ? process.execArgv : [];
 
             // If an arg appears multiple times the last occurrence is used
             var execArgv = [].concat((0, _toConsumableArray3.default)(defaultArgs), debugArgs, (0, _toConsumableArray3.default)(capExecArgs));
@@ -593,6 +593,45 @@ var Launcher = function () {
                 execArgv
             });
 
+            /**
+             * increase framework timeout to 10m when debugging is enabled
+             */
+            var _iteratorNormalCompletion4 = true;
+            var _didIteratorError4 = false;
+            var _iteratorError4 = undefined;
+
+            try {
+                for (var _iterator4 = (0, _getIterator3.default)(execArgv), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
+                    var argv = _step4.value;
+
+                    if (argv !== '--inspect') {
+                        continue;
+                    }
+
+                    var frameworkOptsKey = config.framework === 'mocha' ? 'mochaOpts' : config.framework === 'jasmine' ? 'jasmineNodeOpts' : 'cucumberOpts';
+                    var frameworkTimeoutKey = config.framework === 'jasmine' ? 'defaultTimeoutInterval' : 'timeout';
+
+                    if (!this.argv[frameworkOptsKey]) {
+                        this.argv[frameworkOptsKey] = {};
+                    }
+
+                    this.argv[frameworkOptsKey][frameworkTimeoutKey] = 10 * 60 * 1000;
+                }
+            } catch (err) {
+                _didIteratorError4 = true;
+                _iteratorError4 = err;
+            } finally {
+                try {
+                    if (!_iteratorNormalCompletion4 && _iterator4.return) {
+                        _iterator4.return();
+                    }
+                } finally {
+                    if (_didIteratorError4) {
+                        throw _iteratorError4;
+                    }
+                }
+            }
+
             this.processes.push(childProcess);
 
             childProcess.on('message', this.messageHandler.bind(this, cid)).on('exit', this.endHandler.bind(this, cid));
@@ -750,13 +789,13 @@ End selenium sessions properly ...
                 return launchServices;
             }
 
-            var _iteratorNormalCompletion4 = true;
-            var _didIteratorError4 = false;
-            var _iteratorError4 = undefined;
+            var _iteratorNormalCompletion5 = true;
+            var _didIteratorError5 = false;
+            var _iteratorError5 = undefined;
 
             try {
-                for (var _iterator4 = (0, _getIterator3.default)(config.services), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-                    var serviceName = _step4.value;
+                for (var _iterator5 = (0, _getIterator3.default)(config.services), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
+                    var serviceName = _step5.value;
 
                     var service = void 0;
 
@@ -782,16 +821,16 @@ End selenium sessions properly ...
                     }
                 }
             } catch (err) {
-                _didIteratorError4 = true;
-                _iteratorError4 = err;
+                _didIteratorError5 = true;
+                _iteratorError5 = err;
             } finally {
                 try {
-                    if (!_iteratorNormalCompletion4 && _iterator4.return) {
-                        _iterator4.return();
+                    if (!_iteratorNormalCompletion5 && _iterator5.return) {
+                        _iterator5.return();
                     }
                 } finally {
-                    if (_didIteratorError4) {
-                        throw _iteratorError4;
+                    if (_didIteratorError5) {
+                        throw _iteratorError5;
                     }
                 }
             }

package/build/lib/protocol/log.js

@@ -3,56 +3,29 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-
-var _promise = require('babel-runtime/core-js/promise');
-
-var _promise2 = _interopRequireDefault(_promise);
-
 exports.default = log;
 
 var _ErrorHandler = require('../utils/ErrorHandler');
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var logTypes = void 0; /**
-                        *
-                        * Get the log for a given log type. Log buffer is reset after each request.
-                        * (Not part of the official Webdriver specification).
-                        *
-                        * @param {String} type  The [log type](https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#log-type). This must be provided.
-                        * @return {Object[]} The list of [log entries](https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#log-entry-json-object)
-                        *
-                        * @see  https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#sessionsessionidlog
-                        * @type protocol
-                        *
-                        */
-
-function getLogTypes() {
-    if (logTypes) {
-        return _promise2.default.resolve(logTypes);
-    }
-
-    return this.logTypes().then(function (types) {
-        logTypes = types;
-        return logTypes;
-    });
-}
-
 function log(type) {
-    var _this = this;
-
     if (typeof type !== 'string' || type === '') {
         throw new _ErrorHandler.ProtocolError('number or type of arguments don\'t agree with log command');
     }
 
-    return getLogTypes.call(this).then(function (types) {
-        if (types.value.indexOf(type) === -1) {
-            throw new _ErrorHandler.ProtocolError(`this log type ("${type}") is not available for this browser/device`);
-        }
-
-        return _this.requestHandler.create('/session/:sessionId/log', {
-            type: type
-        });
+    return this.requestHandler.create('/session/:sessionId/log', {
+        type: type
     });
-}
+} /**
+   *
+   * Get the log for a given log type. Log buffer is reset after each request.
+   * (Not part of the official Webdriver specification).
+   *
+   * @param {String} type  The [log type](https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#log-type). This must be provided.
+   * @return {Object[]} The list of [log entries](https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#log-entry-json-object)
+   *
+   * @see  https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#sessionsessionidlog
+   * @type protocol
+   *
+   */
+
 module.exports = exports['default'];

package/build/lib/scripts/createSelectorScript.js

@@ -200,7 +200,7 @@ var executeClientSide = function executeClientSide(fn, sArr, args) {
         if (typeof cb === 'function') {
             return cb('NoSuchElement') && new Error('NoSuchElement');
         }
-        return new Error('NoSuchElement');
+        throw new Error('NoSuchElement');
     }
 
     parameter.push(arguments[arguments.length - 1]);

package/build/lib/utils/ConfigParser.js

@@ -112,6 +112,7 @@ var DEFAULT_CONFIGS = {
     afterScenario: [],
     afterStep: []
 };
+var FILE_EXTENSIONS = ['.js', '.ts', '.feature', '.coffee', '.es6'];
 
 var ConfigParser = function () {
     function ConfigParser() {
@@ -475,7 +476,7 @@ var ConfigParser = function () {
                     var filenames = _glob2.default.sync(pattern);
 
                     filenames = filenames.filter(function (filename) {
-                        return filename.slice(-3) === '.js' || filename.slice(-3) === '.ts' || filename.slice(-8) === '.feature' || filename.slice(-7) === '.coffee';
+                        return FILE_EXTENSIONS.indexOf(_path2.default.extname(filename)) !== -1;
                     });
 
                     filenames = filenames.map(function (filename) {

package/build/lib/utils/RequestHandler.js

@@ -144,7 +144,9 @@ var RequestHandler = function () {
             newOptions.json = true;
             newOptions.followAllRedirects = true;
 
-            if (this.defaultOptions.protocol === 'http') {
+            if (this.defaultOptions.agent) {
+                newOptions.agent = this.defaultOptions.agent;
+            } else if (this.defaultOptions.protocol === 'http') {
                 newOptions.agent = httpAgent;
             } else if (this.defaultOptions.protocol === 'https') {
                 newOptions.agent = httpsAgent;
@@ -178,6 +180,7 @@ var RequestHandler = function () {
             }
 
             newOptions.timeout = this.defaultOptions.connectionRetryTimeout;
+            newOptions.proxy = this.defaultOptions.proxy;
 
             return newOptions;
         }

package/build/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webdriverio",
   "description": "A Node.js bindings implementation for the W3C WebDriver protocol",
-  "version": "4.10.1",
+  "version": "4.12.0",
   "homepage": "http://webdriver.io",
   "author": "Camilo Tapia <camilo.tapia@gmail.com>",
   "repository": {
@@ -78,7 +78,6 @@
     "safe-buffer": "~5.1.1",
     "supports-color": "~5.0.0",
     "url": "~0.11.0",
-    "validator": "~9.1.1",
     "wdio-dot-reporter": "~0.0.8",
     "wgxpath": "~1.0.0"
   },

package/docs/guide/getstarted/configuration.md

@@ -91,6 +91,18 @@ Path to WebDriver server.
 Type: `String`<br>
 Default: */wd/hub*
 
+### agent
+http(s).Agent instance to use
+
+Type: `Object`<br>
+Default: `new http(s).Agent({ keepAlive: true })`
+
+### proxy
+An HTTP proxy to be used. Supports proxy Auth with Basic Auth, identical to support for the url parameter (by embedding the auth info in the uri)
+
+Type: `String`<br>
+Default: `undefined` (no proxy used)
+
 ### baseUrl
 Shorten `url` command calls by setting a base url. If your `url` parameter starts with `/`, the base url gets prepended, not including the path portion of your baseUrl. If your `url` parameter starts without a scheme or `/` (like `some/path`), the base url gets prepended directly.
 
@@ -122,7 +134,7 @@ Type: `Boolean`<br>
 Default: *true*
 
 ### bail
-If you only want to run your tests until a specific amount of tests have failed use bail (default is 0 - don't bail, run all tests).
+If you only want to run your tests until a specific amount of tests have failed use bail (default is 0 - don't bail, run all tests). _Note_: Please be aware that when using a third party test runner such as Mocha, additional configuration might be required.
 
 Type: `Number`<br>
 Default: *0* (don't bail, run all tests)
@@ -293,3 +305,23 @@ Similarly for mocha:
         requires: ['./test/helpers/common.js']
     },
 ```
+
+## Run WebdriverIO behind corperate proxy
+
+If your company has a corperate proxy (e.g. on `http://my.corp.proxy.com:9090`) for all outgoing requests you can set it using the `proxy` configuration option. Just set in your `wdio.conf.js` the following:
+
+```js
+exports.config = {
+    // ...
+    proxy: 'http://my.corp.proxy.com:9090',
+    // ...
+}
+```
+
+If you use [Sauce Connect Proxy](https://wiki.saucelabs.com/display/DOCS/Sauce+Connect+Proxy) start it via:
+
+```sh
+$ sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY --no-autodetect -p http://my.corp.proxy.com:9090
+```
+
+and set the config as described above.

package/docs/guide/reporters/allure.md

@@ -60,7 +60,7 @@ Apply and restart the Jenkins server. All assets should now be served correctly.
 Install the [Allure command-line tool](https://www.npmjs.com/package/allure-commandline), and process the results directory:
 
 ```sh
-$ allure generate [allure_output_dir] && allure report open
+$ allure generate [allure_output_dir] && allure open
 ```
 
 This will generate a report (by default in `./allure-report`), and open it in your browser:

package/docs/guide/reporters/dot.md

@@ -8,7 +8,7 @@ title: WebdriverIO - Dot Reporter
 Dot Reporter
 ============
 
-The dot reporter is the default reporter for the WDIO test runner. It's therefor a dependency of WebdriverIO and doesn't need to get downloaded. To use the dot reporter just add `'dot'` to the `reporters` array:
+The dot reporter is the default reporter for the WDIO test runner. It's therefore a dependency of WebdriverIO and doesn't need to get downloaded. To use the dot reporter just add `'dot'` to the `reporters` array:
 
 ```js
 // wdio.conf.js

package/docs/guide/reporters/mochawesome.md

@@ -64,4 +64,4 @@ npm install --save mochawesome-report-generator
   },
 ```
 1) `path/to/results.json` = path and name of json file
-2) `--reportTitle 'My Project Results' = unique report title
+2) `--reportTitle 'My Project Results` = unique report title