feat(webdriver): Allow users to use webdriver's disableEnvironmentOve…

…rrides Fixes #2300
angular · Jan 14, 2016 · fb10c5c · fb10c5c
1 parent bd5c290
commit fb10c5c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/docs/referenceConf.js b/docs/referenceConf.js
@@ -340,5 +340,10 @@ exports.config = {
 
   // Turns off source map support.  Stops protractor from registering global
   // variable `source-map-support`.  Defaults to `false`
-  skipSourceMapSupport: false
+  skipSourceMapSupport: false,
+
+  // Turns off WebDriver's environment variables overrides to ignore any
+  // environment variable and to only use the configuration in this file.
+  // Defaults to `true`
+  environmentOverrides: true
 };
diff --git a/lib/driverProviders/driverProvider.js b/lib/driverProviders/driverProvider.js
@@ -32,10 +32,13 @@ DriverProvider.prototype.getExistingDrivers = function() {
  * @return webdriver instance
  */
 DriverProvider.prototype.getNewDriver = function() {
-  var newDriver = new webdriver.Builder().
-      usingServer(this.config_.seleniumAddress).
-      withCapabilities(this.config_.capabilities).
-      build();
+  var builder = new webdriver.Builder().
+    usingServer(this.config_.seleniumAddress).
+    withCapabilities(this.config_.capabilities);
+  if (this.config_.environmentOverrides === false) {
+    builder.disableEnvironmentOverrides();
+  }
+  var newDriver = builder.build();
   this.drivers_.push(newDriver);
   return newDriver;
 };