fix(jvmArgs): fixes jvmArgs launching selenium from config (#3698)

closes #3697
angular · Nov 9, 2016 · f3938f9 · f3938f9
1 parent 21d534f
commit f3938f9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/config.ts b/lib/config.ts
@@ -46,6 +46,13 @@ export interface Config {
      * seleniumArgs: ['-browserTimeout=60']
      */
     args?: any;
+
+    /**
+     * Additional command line jvm options to pass to selenium. For example,
+     * if you need to change the browser driver, use
+     * jvmArgs: ['-Dwebdriver.ie.driver=IEDriverServer_Win32_2.53.1.exe']
+     */
+    jvmArgs?: string[];
   };
   /**
    * ChromeDriver location is used to help find the chromedriver binary.
@@ -588,6 +595,7 @@ export interface Config {
   ng12Hybrid?: boolean;
 
   seleniumArgs?: Array<any>;
+  jvmArgs?: string[];
   configDir?: string;
   troubleshoot?: boolean;
   seleniumPort?: number;

diff --git a/lib/driverProviders/local.ts b/lib/driverProviders/local.ts
@@ -89,13 +89,16 @@ export class Local extends DriverProvider {
     if (serverConf.args === undefined) {
       serverConf.args = this.config_.seleniumArgs || [];
     }
+    if (serverConf.jvmArgs === undefined) {
+      serverConf.jvmArgs = this.config_.jvmArgs || [];
+    }
     if (serverConf.port === undefined) {
       serverConf.port = this.config_.seleniumPort;
     }
 
     // configure server
     if (this.config_.chromeDriver) {
-      serverConf.args.push('-Dwebdriver.chrome.driver=' + this.config_.chromeDriver);
+      serverConf.jvmArgs.push('-Dwebdriver.chrome.driver=' + this.config_.chromeDriver);
     }
 
     this.server_ = new remote.SeleniumServer(this.config_.seleniumServerJar, serverConf);