fix(driverProviders): Check config in the right place. (#3991)

angular · Jan 20, 2017 · e68dcf1 · e68dcf1
1 parent eb89920
commit e68dcf1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/driverProviders/local.ts b/lib/driverProviders/local.ts
@@ -100,17 +100,17 @@ export class Local extends DriverProvider {
 
  let serverConf = this.config_.localSeleniumStandaloneOpts || {};
 
- if (!Array.isArray(serverConf.jvmArgs)) {
- throw new ConfigError(logger, 'jvmArgs should be an array.');
- }
-
  // If args or port is not set use seleniumArgs and seleniumPort
  // for backward compatibility
  if (serverConf.args === undefined) {
  serverConf.args = this.config_.seleniumArgs || [];
  }
  if (serverConf.jvmArgs === undefined) {
  serverConf.jvmArgs = this.config_.jvmArgs || [];
+ } else {
+ if (!Array.isArray(serverConf.jvmArgs)) {
+ throw new ConfigError(logger, 'jvmArgs should be an array.');
+ }
  }
  if (serverConf.port === undefined) {
  serverConf.port = this.config_.seleniumPort;