diff --git a/docs/referenceConf.js b/docs/referenceConf.js index 4c633b928..288a424aa 100644 --- a/docs/referenceConf.js +++ b/docs/referenceConf.js @@ -59,6 +59,10 @@ exports.config = { // browser session. The selenium session is maintained after the test has // completed. Ignored if seleniumAddress is null. seleniumSessionId: null, + // The address of a proxy server to use for the connection to the + // Selenium Server. If not specified no proxy is configured. Looks like + // webDriverProxy: 'http://localhost:3128' + webDriverProxy: null, // ---- 3. To use remote browsers via Sauce Labs ----------------------------- // If sauceUser and sauceKey are specified, seleniumServerJar will be ignored. diff --git a/lib/driverProviders/driverProvider.js b/lib/driverProviders/driverProvider.js index 55f4785b4..ba2e2df10 100644 --- a/lib/driverProviders/driverProvider.js +++ b/lib/driverProviders/driverProvider.js @@ -34,6 +34,7 @@ DriverProvider.prototype.getExistingDrivers = function() { DriverProvider.prototype.getNewDriver = function() { var builder = new webdriver.Builder(). usingServer(this.config_.seleniumAddress). + usingWebDriverProxy(this.config_.webDriverProxy). withCapabilities(this.config_.capabilities); if (this.config_.disableEnvironmentOverrides === true) { builder.disableEnvironmentOverrides();