don't pollute wdio caps with chromedriver options - fixes #202

webdriverio-community · Feb 14, 2023 · 34e2be7 · 34e2be7
1 parent fcc9f36
commit 34e2be7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/src/launcher.ts b/src/launcher.ts
@@ -28,26 +28,27 @@ const isMultiremote = (obj: Capabilities.Capabilities) => typeof obj === 'object
 const isChrome = (cap: Capabilities.Capabilities) => cap.browserName && cap.browserName.toLowerCase() === 'chrome'
 
 export default class ChromeDriverLauncher {
-    protected options: { protocol: 'http' | 'https', hostname: string, port: number, path: string, pollTimeout: number }
+    protected options: { protocol: 'http' | 'https', hostname: string, port: number, path: string }
     protected outputDir?: string
     protected logFileName: string
     protected capabilities: Capabilities.Capabilities
     protected args: string[]
     protected chromedriverCustomPath?: string
     private process?: ChildProcessWithoutNullStreams
+    #pollTimeout: number
 
     constructor(
         options: ServiceOptions,
         capabilities: Capabilities.Capabilities,
         config: Options.Testrunner
     ) {
         log.info(`Initiate Chromedriver Launcher (v${pkg.version})`)
+        this.#pollTimeout = options.pollTimeout || DEFAULT_POLL_TIMEOUT
         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,
-            pollTimeout: options.pollTimeout || DEFAULT_POLL_TIMEOUT
+            path: options.path || DEFAULT_CONNECTION.path
         }
 
         this.outputDir = options.outputDir || config.outputDir
@@ -90,7 +91,7 @@ export default class ChromeDriverLauncher {
          * wait for port to be available before starting Chromedriver
          */
         try {
-            await tcpPortUsed.waitUntilFree(this.options.port, POLL_INTERVAL, this.options.pollTimeout)
+            await tcpPortUsed.waitUntilFree(this.options.port, POLL_INTERVAL, this.#pollTimeout)
         } catch (err) {
             throw new SevereServiceError(
                 `Couldn't start Chromedriver: ${err.message}\n` +
@@ -108,7 +109,7 @@ export default class ChromeDriverLauncher {
         }
 
         try {
-            await tcpPortUsed.waitUntilUsed(this.options.port, POLL_INTERVAL, this.options.pollTimeout)
+            await tcpPortUsed.waitUntilUsed(this.options.port, POLL_INTERVAL, this.#pollTimeout)
         } catch (err) {
             throw new SevereServiceError(
                 `Couldn't start Chromedriver: ${err.message}\n` +

diff --git a/tests/launcher.test.ts b/tests/launcher.test.ts
@@ -29,7 +29,7 @@ vi.mock('child_process', () => {
 let config, options, capabilities, multiremoteCaps
 
 describe('ChromeDriverLauncher launcher', () => {
-    
+
     const defaultOptions = {
         defaultLogFileName: 'wdio-chromedriver.log',
         defaultProtocol: 'http',
@@ -119,7 +119,6 @@ describe('ChromeDriverLauncher launcher', () => {
                     protocol: defaultOptions.defaultProtocol,
                     hostname: defaultOptions.defaultHostname,
                     port: defaultOptions.defaultPort,
-                    pollTimeout:defaultOptions.defaultPollTimeOut,
                     path: 'options-path'
                 },
                 {
@@ -141,7 +140,6 @@ describe('ChromeDriverLauncher launcher', () => {
                     protocol: defaultOptions.defaultProtocol,
                     hostname: defaultOptions.defaultHostname,
                     port: 7676,
-                    pollTimeout:defaultOptions.defaultPollTimeOut,
                     path: defaultOptions.defaultPath
                 },
                 {
@@ -163,7 +161,6 @@ describe('ChromeDriverLauncher launcher', () => {
                     protocol: 'https',
                     hostname: defaultOptions.defaultHostname,
                     port: defaultOptions.defaultPort,
-                    pollTimeout:defaultOptions.defaultPollTimeOut,
                     path: defaultOptions.defaultPath
                 },
                 {
@@ -185,7 +182,6 @@ describe('ChromeDriverLauncher launcher', () => {
                     protocol: defaultOptions.defaultProtocol,
                     hostname: 'dummy',
                     port: defaultOptions.defaultPort,
-                    pollTimeout:defaultOptions.defaultPollTimeOut,
                     path: defaultOptions.defaultPath
                 },
                 {
@@ -207,7 +203,6 @@ describe('ChromeDriverLauncher launcher', () => {
                     protocol: defaultOptions.defaultProtocol,
                     hostname: defaultOptions.defaultHostname,
                     port: defaultOptions.defaultPort,
-                    pollTimeout: 15000,
                     path: defaultOptions.defaultPath
                 },
                 {
@@ -228,7 +223,6 @@ describe('ChromeDriverLauncher launcher', () => {
                     protocol: defaultOptions.defaultProtocol,
                     hostname: defaultOptions.defaultHostname,
                     port: defaultOptions.defaultPort,
-                    pollTimeout:defaultOptions.defaultPollTimeOut,
                     path: defaultOptions.defaultPath
                 },
                 {
@@ -248,7 +242,6 @@ describe('ChromeDriverLauncher launcher', () => {
                     protocol: defaultOptions.defaultProtocol,
                     hostname: defaultOptions.defaultHostname,
                     port: defaultOptions.defaultPort,
-                    pollTimeout:defaultOptions.defaultPollTimeOut,
                     path: defaultOptions.defaultPath,
                     capabilities: {
                         browserName: 'chrome',
@@ -284,7 +277,6 @@ describe('ChromeDriverLauncher launcher', () => {
                     protocol: defaultOptions.defaultProtocol,
                     hostname: defaultOptions.defaultHostname,
                     port: defaultOptions.defaultPort,
-                    pollTimeout:defaultOptions.defaultPollTimeOut,
                     path: defaultOptions.defaultPath
                 },
                 {