[javascript] Removing service parameter from getPath

diemol · diemol · commit 1c72078c352b · 2023-07-21T23:29:28.000+02:00
Not used anymore.

Adjusting tests to use SM.
diff --git a/javascript/node/selenium-webdriver/chromium.js b/javascript/node/selenium-webdriver/chromium.js
@@ -686,7 +686,7 @@ class Driver extends webdriver.WebDriver {
     } else {
       let service = opt_serviceExecutor || this.getDefaultService()
       if (!service.getExecutable()) {
-        service.setExecutable(getPath(service, caps))
+        service.setExecutable(getPath(caps))
       }
       onQuit = () => service.kill()
       executor = createExecutor(service.start(), this.VENDOR_COMMAND_PREFIX)
diff --git a/javascript/node/selenium-webdriver/common/driverFinder.js b/javascript/node/selenium-webdriver/common/driverFinder.js
@@ -27,7 +27,7 @@ const { driverLocation } = require('./seleniumManager')
  * Determines the path of the correct Selenium Manager binary
  * @returns {string}
  */
-function getPath(service, capabilities) {
+function getPath(capabilities) {
   try {
     return driverLocation(capabilities)
   } catch (e) {
diff --git a/javascript/node/selenium-webdriver/firefox.js b/javascript/node/selenium-webdriver/firefox.js
@@ -588,14 +588,14 @@ class Driver extends webdriver.WebDriver {
       configureExecutor(executor)
     } else if (opt_executor instanceof remote.DriverService) {
       if (!opt_executor.getExecutable()) {
-        opt_executor.setExecutable(getPath(opt_executor, opt_config))
+        opt_executor.setExecutable(getPath(opt_config))
       }
       executor = createExecutor(opt_executor.start())
       onQuit = () => opt_executor.kill()
     } else {
       let service = new ServiceBuilder().build()
       if (!service.getExecutable()) {
-        service.setExecutable(getPath(service, opt_config))
+        service.setExecutable(getPath(opt_config))
       }
       executor = createExecutor(service.start())
       onQuit = () => service.kill()
diff --git a/javascript/node/selenium-webdriver/ie.js b/javascript/node/selenium-webdriver/ie.js
@@ -455,7 +455,7 @@ class Driver extends webdriver.WebDriver {
       service = createServiceFromCapabilities(options)
     }
     if (!service.getExecutable()) {
-      service.setExecutable(getPath(service, options))
+      service.setExecutable(getPath(options))
     }
 
     let client = service.start().then((url) => new http.HttpClient(url))
diff --git a/javascript/node/selenium-webdriver/test/chrome/service_test.js b/javascript/node/selenium-webdriver/test/chrome/service_test.js
@@ -35,7 +35,7 @@ test.suite(
       it('can be started on a custom path', function () {
         service = new chrome.ServiceBuilder().setPath('/foo/bar/baz').build()
         if (!service.getExecutable()) {
-          service.setExecutable(getPath(service, new chrome.Options()))
+          service.setExecutable(getPath(new chrome.Options()))
         }
         return service.start().then(function (url) {
           assert.ok(url.endsWith('/foo/bar/baz'), 'unexpected url: ' + url)
diff --git a/javascript/node/selenium-webdriver/test/edge/service_test.js b/javascript/node/selenium-webdriver/test/edge/service_test.js
@@ -35,7 +35,7 @@ test.suite(
 
       it('can start msedgedriver', async function () {
         service = new edge.ServiceBuilder().build()
-        service.setExecutable(getPath(service, new edge.Options()))
+        service.setExecutable(getPath(new edge.Options()))
         let url = await service.start()
         assert(/127\.0\.0\.1/.test(url), `unexpected url: ${url}`)
       })
diff --git a/javascript/node/selenium-webdriver/testing/index.js b/javascript/node/selenium-webdriver/testing/index.js
@@ -41,6 +41,7 @@ const remote = require('../remote')
 const safari = require('../safari')
 const { Browser } = require('../lib/capabilities')
 const { Builder } = require('../index')
+const { getPath } = require('../common/driverFinder')
 
 /**
  * Describes a browser targeted by a {@linkplain suite test suite}.
@@ -116,20 +117,21 @@ function getBrowsersToTestFromEnv() {
 function getAvailableBrowsers() {
   info(`Searching for WebDriver executables installed on the current system...`)
 
+  getPath(safari.Options)
   let targets = [
-    [chrome.locateSynchronously, Browser.CHROME],
-    [edge.locateSynchronously, Browser.EDGE],
-    [firefox.locateSynchronously, Browser.FIREFOX],
-    [ie.locateSynchronously, Browser.INTERNET_EXPLORER],
-    [safari.locateSynchronously, Browser.SAFARI],
+    [getPath(chrome.Options), Browser.CHROME],
+    [getPath(edge.Options), Browser.EDGE],
+    [getPath(firefox.Options), Browser.FIREFOX],
+    [getPath(ie.Options), Browser.INTERNET_EXPLORER],
+    [getPath(safari.Options), Browser.SAFARI],
   ]
 
   let availableBrowsers = []
   for (let pair of targets) {
-    const fn = pair[0]
+    const driverPath = pair[0]
     const name = pair[1]
     const capabilities = pair[2]
-    if (fn()) {
+    if (driverPath.length > 0) {
       info(`... located ${name}`)
       availableBrowsers.push({ name, capabilities })
     }

Original file line number	Diff line number	Diff line change
`@@ -686,7 +686,7 @@ class Driver extends webdriver.WebDriver {`
`686`	`686`	`} else {`
`687`	`687`	`let service = opt_serviceExecutor \|\| this.getDefaultService()`
`688`	`688`	`if (!service.getExecutable()) {`
`689`		`- service.setExecutable(getPath(service, caps))`
	`689`	`+ service.setExecutable(getPath(caps))`
`690`	`690`	`}`
`691`	`691`	`onQuit = () => service.kill()`
`692`	`692`	`executor = createExecutor(service.start(), this.VENDOR_COMMAND_PREFIX)`
Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@ class Driver extends webdriver.WebDriver {`
`455`	`455`	`service = createServiceFromCapabilities(options)`
`456`	`456`	`}`
`457`	`457`	`if (!service.getExecutable()) {`
`458`		`- service.setExecutable(getPath(service, options))`
	`458`	`+ service.setExecutable(getPath(options))`
`459`	`459`	`}`
`460`	`460`
`461`	`461`	`let client = service.start().then((url) => new http.HttpClient(url))`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ test.suite(`
`35`	`35`	`it('can be started on a custom path', function () {`
`36`	`36`	`service = new chrome.ServiceBuilder().setPath('/foo/bar/baz').build()`
`37`	`37`	`if (!service.getExecutable()) {`
`38`		`- service.setExecutable(getPath(service, new chrome.Options()))`
	`38`	`+ service.setExecutable(getPath(new chrome.Options()))`
`39`	`39`	`}`
`40`	`40`	`return service.start().then(function (url) {`
`41`	`41`	`assert.ok(url.endsWith('/foo/bar/baz'), 'unexpected url: ' + url)`