chore(webdriver): remove configuration file, let webdriver-manager maintain it

Author: cnishina

Diff for: config.json

@@ -15,6 +15,10 @@ import {Logger} from '../logger2';
 let webdriver = require('selenium-webdriver'),
     chrome = require('selenium-webdriver/chrome'),
     firefox = require('selenium-webdriver/firefox');
+let SeleniumConfig = require('webdriver-manager/built/lib/config').Config;
+let SeleniumChrome = require('webdriver-manager/built/lib/binaries/chrome_driver').ChromeDriver;
+let SeleniumStandAlone = require('webdriver-manager/built/lib/binaries/stand_alone').StandAlone;
+
 
 let logger = new Logger('direct');
 export class Direct extends DriverProvider {
@@ -54,8 +58,8 @@ export class Direct extends DriverProvider {
     switch (this.config_.capabilities.browserName) {
       case 'chrome':
         let defaultChromeDriverPath = path.resolve(
-            __dirname, '../../selenium/chromedriver_' +
-                require('../../config.json').webdriverVersions.chromedriver);
+          SeleniumConfig.getSeleniumDir(),
+          new SeleniumChrome().executableFilename());
 
         if (process.platform.indexOf('win') === 0) {
           defaultChromeDriverPath += '.exe';

Diff for: lib/driverProviders/direct.ts

@@ -15,6 +15,9 @@ import {Config} from '../configParser';
 import {DriverProvider} from './driverProvider';
 import {Logger} from '../logger2';
 
+let SeleniumConfig = require('webdriver-manager/built/lib/config').Config;
+let SeleniumChrome = require('webdriver-manager/built/lib/binaries/chrome_driver').ChromeDriver;
+let SeleniumStandAlone = require('webdriver-manager/built/lib/binaries/stand_alone').StandAlone;
 let remote = require('selenium-webdriver/remote');
 
 let logger = new Logger('local');
@@ -35,8 +38,8 @@ export class Local extends DriverProvider {
           'Attempting to find the SeleniumServerJar in the default ' +
           'location used by webdriver-manager');
       this.config_.seleniumServerJar = path.resolve(
-          __dirname, '../../selenium/selenium-server-standalone-' +
-              require('../../config.json').webdriverVersions.selenium + '.jar');
+        SeleniumConfig.getSeleniumDir(),
+        new SeleniumStandAlone().executableFilename());
     }
     if (!fs.existsSync(this.config_.seleniumServerJar)) {
       throw new Error(
@@ -50,8 +53,8 @@ export class Local extends DriverProvider {
             'Attempting to find the chromedriver binary in the default ' +
             'location used by webdriver-manager');
         this.config_.chromeDriver = path.resolve(
-            __dirname, '../../selenium/chromedriver_' +
-                require('../../config.json').webdriverVersions.chromedriver);
+          SeleniumConfig.getSeleniumDir(),
+          new SeleniumChrome().executableFilename());
       }
 
       // Check if file exists, if not try .exe or fail accordingly

Diff for: lib/driverProviders/local.ts

@@ -23,7 +23,7 @@
     "saucelabs": "~1.0.1",
     "selenium-webdriver": "2.53.2",
     "source-map-support": "~0.4.0",
-    "webdriver-manager": "^10.0.1"
+    "webdriver-manager": "^10.0.4"
   },
   "devDependencies": {
     "body-parser": "1.14.2",

Diff for: package.json

@@ -15,6 +15,11 @@ var argv = require('optimist').argv;
 var q = require('q');
 var env = require('./environment');
 
+var Direct = require('../built/driverProviders/direct').Direct;
+var Hosted = require('../built/driverProviders/hosted').Hosted;
+var Local = require('../built/driverProviders/local').Local;
+var Sauce = require('../built/driverProviders/sauce').Sauce;
+
 var testDriverProvider = function(driverProvider) {
   return driverProvider.setupEnv().then(function() {
     var driver = driverProvider.getNewDriver();
@@ -45,7 +50,7 @@ var chromeConfig = {
     browserName: 'chrome'
   }
 };
-testDriverProvider(require('../built/driverProviders/direct')(chromeConfig)).
+testDriverProvider(new Direct(chromeConfig)).
     then(function() {
       console.log('direct.dp with chrome working!');
     }, function(err) {
@@ -57,7 +62,7 @@ var firefoxConfig = {
     browserName: 'firefox'
   }
 };
-testDriverProvider(require('../built/driverProviders/direct')(firefoxConfig)).
+testDriverProvider(new Direct(firefoxConfig)).
     then(function() {
       console.log('direct.dp with firefox working!');
     }, function(err) {
@@ -70,7 +75,7 @@ var hostedConfig = {
     browserName: 'firefox'
   }
 };
-testDriverProvider(require('../built/driverProviders/hosted')(hostedConfig)).
+testDriverProvider(new Hosted(hostedConfig)).
     then(function() {
       console.log('hosted.dp working!');
     }, function(err) {
@@ -83,7 +88,7 @@ var hostedPromisedConfig = {
     browserName: 'firefox'
   }
 };
-testDriverProvider(require('../built/driverProviders/hosted')(hostedPromisedConfig)).
+testDriverProvider(new Hosted(hostedPromisedConfig)).
     then(function() {
       console.log('hosted.dp with promises working!');
     }, function(err) {
@@ -96,7 +101,7 @@ var localConfig = {
     browserName: 'chrome'
   }
 };
-testDriverProvider(require('../built/driverProviders/local')(localConfig)).
+testDriverProvider(new Local(localConfig)).
     then(function() {
       console.log('local.dp working!');
     }, function(err) {
@@ -112,7 +117,7 @@ if (argv.sauceUser && argv.sauceKey) {
       browserName: 'chrome'
     }
   };
-  testDriverProvider(require('../built/driverProviders/sauce')(sauceConfig)).
+  testDriverProvider(new Sauce(sauceConfig)).
       then(function() {
         console.log('sauce.dp working!');
       }, function(err) {