@@ -247,19 +247,21 @@ class Options {
247
247
}
248
248
}
249
249
250
-
251
- const WIRES_EXE = process . platform === 'win32' ? 'wires.exe' : 'wires' ;
250
+ // TODO: Wires is the old name of GeckoDriver. Rename to geckodriver, once the
251
+ // first renamed version is out at
252
+ // https://github.com/mozilla/geckodriver/releases
253
+ const GECKO_DRIVER_EXE = process . platform === 'win32' ? 'wires.exe' : 'wires' ;
252
254
253
255
254
256
/**
255
257
* @return {string } .
256
258
* @throws {Error }
257
259
*/
258
- function findWires ( ) {
259
- let exe = io . findInPath ( WIRES_EXE , true ) ;
260
+ function findGeckoDriver ( ) {
261
+ let exe = io . findInPath ( GECKO_DRIVER_EXE , true ) ;
260
262
if ( ! exe ) {
261
263
throw Error (
262
- 'The ' + WIRES_EXE + ' executable could not be found on the current ' +
264
+ 'The ' + GECKO_DRIVER_EXE + ' executable could not be found on the current ' +
263
265
'PATH. Please download the latest version from ' +
264
266
'https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette/' +
265
267
'WebDriver and ensure it can be found on your PATH.' ) ;
@@ -272,7 +274,7 @@ function findWires() {
272
274
* @param {(string|!Binary) } binary .
273
275
* @return {!remote.DriverService } .
274
276
*/
275
- function createWiresService ( binary ) {
277
+ function createGeckoDriverService ( binary ) {
276
278
// Firefox's Developer Edition is currently required for Marionette.
277
279
let exe ;
278
280
if ( typeof binary === 'string' ) {
@@ -282,9 +284,9 @@ function createWiresService(binary) {
282
284
exe = binary . locate ( ) ;
283
285
}
284
286
285
- let wires = findWires ( ) ;
287
+ let geckoDriver = findGeckoDriver ( ) ;
286
288
let port = portprober . findFreePort ( ) ;
287
- return new remote . DriverService ( wires , {
289
+ return new remote . DriverService ( geckoDriver , {
288
290
loopback : true ,
289
291
port : port ,
290
292
args : promise . all ( [ exe , port ] ) . then ( args => {
@@ -352,7 +354,7 @@ class Driver extends webdriver.WebDriver {
352
354
353
355
if ( caps . get ( Capability . MARIONETTE )
354
356
|| / ^ 1 | t r u e $ / i. test ( process . env [ 'SELENIUM_MARIONETTE' ] ) ) {
355
- let service = createWiresService ( binary ) ;
357
+ let service = createGeckoDriverService ( binary ) ;
356
358
serverUrl = service . start ( ) ;
357
359
onQuit = ( ) => service . kill ( ) ;
358
360
0 commit comments