chromedriver: make v6 compatible

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wdio-chromedriver-service",
-  "version": "5.0.2",
+  "version": "6.0.0",
   "description": "WebdriverIO service to start & stop ChromeDriver",
   "author": "Mattias Ekstrand <mattias.ekstrand@gmail.com>",
   "homepage": "https://github.com/atti187/wdio-chromedriver-service#readme",
@@ -33,7 +33,7 @@
   },
   "peerDependencies": {
     "chromedriver": "*",
-    "@wdio/cli": "^5.0.0"
+    "@wdio/cli": "^6.0.0"
   },
   "dependencies": {
     "fs-extra": "^0.30.0"
@@ -66,7 +66,8 @@
     "wdio-mocha-framework": "^0.2.12"
   },
   "contributors": [
-    "Mattias Ekstrand <mattias.ekstrand@gmail.com>"
+    "Mattias Ekstrand <mattias.ekstrand@gmail.com>",
+    "Erwin Heitzman <erwin.heitzman@gmail.com>"
   ],
   "jest": {
     "testMatch": [

src/launcher.js

@@ -3,42 +3,55 @@ import ChromeDriver from 'chromedriver'
 
 import getFilePath from './utils/getFilePath'
 
-const DEFAULT_LOG_FILENAME = 'ChromeDriver.txt'
+const DEFAULT_LOG_FILENAME = 'chromedriver.log'
+
+const DEFAULT_CONNECTION = {
+    protocol: 'http',
+    hostname: 'localhost',
+    port: 9515,
+    path: '/'
+}
+
+const isMultiremote = obj => typeof obj === 'object' && !Array.isArray(obj)
+const isChrome = cap => cap.browserName.toLowerCase() === 'chrome'
 
 export default class ChromeDriverLauncher {
-    constructor () {
-        this.chromeDriverLogs = null
-        this.chromeDriverArgs = null
-        this.logToStdout = false
+    constructor(options, capabilities, config) {
+        this.options = {
+            protocol: options.protocol || DEFAULT_CONNECTION.protocol,
+            hostname: options.hostname || DEFAULT_CONNECTION.hostname,
+            port: options.port || DEFAULT_CONNECTION.port,
+            path: options.path || DEFAULT_CONNECTION.path,
+        }
 
-        return this
+        this.outputDir = options.outputDir || config.outputDir
+        this.capabilities = capabilities
+        this.chromeDriverArgs = []
     }
 
-    async onPrepare (config) {
-        this.chromeDriverArgs = config.chromeDriverArgs || []
-        this.chromeDriverLogs = config.chromeDriverLogs
+    async onPrepare() {
+        this.chromeDriverArgs.push(`--port=${this.options.port}`)
+        this.chromeDriverArgs.push(`--url-base=${this.options.path}`)
 
-        if (!this.chromeDriverArgs.find(arg => arg.startsWith('--port'))) {
-            this.chromeDriverArgs.push(`--port=${config.port}`)
-        }
+        /**
+         * update capability connection options to connect
+         * to chromedriver
+         */
+        this._mapCapabilities()
 
-        if (!this.chromeDriverArgs.find(arg => arg.startsWith('--url-base'))) {
-            this.chromeDriverArgs.push(`--url-base=${config.path}`)
-        }
-
         this.process = await ChromeDriver.start(this.chromeDriverArgs, true)
 
-        if (typeof this.chromeDriverLogs === 'string') {
+        if (typeof this.outputDir === 'string') {
             this._redirectLogStream()
         }
     }
 
-    onComplete () {
+    onComplete() {
         ChromeDriver.stop()
     }
 
-    _redirectLogStream () {
-        const logFile = getFilePath(this.chromeDriverLogs, DEFAULT_LOG_FILENAME)
+    _redirectLogStream() {
+        const logFile = getFilePath(this.outputDir, DEFAULT_LOG_FILENAME)
 
         // ensure file & directory exists
         fs.ensureFileSync(logFile)
@@ -47,4 +60,20 @@ export default class ChromeDriverLauncher {
         this.process.stdout.pipe(logStream)
         this.process.stderr.pipe(logStream)
     }
+
+    _mapCapabilities() {
+        if (isMultiremote(this.capabilities)) {
+            for (const cap in this.capabilities) {
+                if (isChrome(this.capabilities[cap])) {
+                    Object.assign(this.capabilities[cap], this.options)
+                }
+            }
+        } else {
+            for (const cap of this.capabilities) {
+                if (isChrome(cap)) {
+                    Object.assign(cap, this.options)
+                }
+            }
+        }
+    }
 }