appium-geckodriver 0.3.0 → 1.0.0

package/.eslintrc

@@ -1,3 +1,3 @@
 {
-  "extends": "appium"
+  "extends": "@appium/eslint-config-appium"
 }

package/README.md

@@ -1,4 +1,4 @@
-appium-geckodriver
+Appium Geckodriver
 ====
 
 This is Appium driver for automating Firefox on different platforms, including Android.
@@ -14,22 +14,25 @@ Then you need to decide where the automated test is going to be executed. Gecko
  - macOS
  - Windows
  - Linux
- - Android
+ - Android (note that `android` *cannot* be passed as a value to `platformName` capability; it should always equal to the *host* platform name)
 
 In order to run your automated tests on Android it is necessary to have [Android SDK](https://developer.android.com/studio) installed, so the destination device is marked as `online` in the `adb devices -l` command output.
 
+Since the version 1.0.0 this driver is only compatible with Appium 2. Use the `appium driver install gecko` CLI command to add it to your server dist.
+
 Gecko driver allows to define multiple criterions for platform selection and also to fine-tune your automation session properties. This could be done via the following session capabilities:
 
 Capability Name | Description
 --- | ---
-platformName | Gecko Driver supports the following platforms: `mac`, `linux`, `windows`, `android`. Values of platformName are compared case-sensitively.
+platformName | Gecko Driver supports the following platforms: `mac`, `linux`, `windows`. The fact your test must be executed on Android is detected based on `moz:firefoxOptions` entry values. Values of platformName are compared case-insensitively.
 browserName | Any value passed to this capability will be changed to 'firefox'.
 browserVersion | Provide the version number of the browser to automate if there are multiple versions installed on the same machine where the driver is running.
-automationName | Must always be set to `Gecko`.
-noReset | Being set to `true` adds the `--connect-existing` argument to the server, that allows to connect to an existing browser instance instead of starting a new browser instance on session startup.
-systemPort | The number of the port for the driver to listen on. Must be unique for each session. If not provided then Appium will try to detect it automatically.
-verbosity | The verbosity level of driver logging. By default minimum verbosity is applied. Possible values are `debug` or `trace`.
-androidStorage | See https://firefox-source-docs.mozilla.org/testing/geckodriver/Flags.html#code-android-storage-var-android-storage-var-code
+appium:automationName | Must always be set to `Gecko`.
+appium:noReset | Being set to `true` adds the `--connect-existing` argument to the server, that allows to connect to an existing browser instance instead of starting a new browser instance on session startup.
+appium:marionettePort | Selects the port for Geckodriver’s connection to the Marionette remote protocol. The existing Firefox instance must have Marionette enabled. To enable the remote protocol in Firefox, you can pass the `-marionette` flag. Unless the `marionette.port` preference has been user-set, Marionette will listen on port `2828`, which is the default value for this capability.
+appium:systemPort | The number of the port for the driver to listen on. Must be unique for each session. If not provided then Appium will try to detect it automatically.
+appium:verbosity | The verbosity level of driver logging. By default minimum verbosity is applied. Possible values are `debug` or `trace`.
+appium:androidStorage | See https://firefox-source-docs.mozilla.org/testing/geckodriver/Flags.html#code-android-storage-var-android-storage-var-code
 moz:firefoxOptions | See https://developer.mozilla.org/en-US/docs/Web/WebDriver/Capabilities/firefoxOptions
 acceptInsecureCerts | See https://www.w3.org/TR/webdriver/#capabilities
 pageLoadStrategy | See https://www.w3.org/TR/webdriver/#capabilities
@@ -57,10 +60,11 @@ def generate_caps():
         'browserName': 'MozillaFirefox',
         # automationName capability presence is mandatory for this Gecko Driver to be selected
         'automationName': 'Gecko',
+        # Should have the name of the host platform, where the geckodriver binary is deployed
+        'platformName': 'mac',
     }
     android_caps = {
         **common_caps,
-        'platformName': 'Android',
         'moz:firefoxOptions': {
             'androidDeviceSerial': '<device/emulator serial>',
             # These capabilities depend on what you are going to automate
@@ -70,7 +74,6 @@ def generate_caps():
     }
     desktop_browser_caps = {
         **common_caps,
-        'platformName': 'Mac',
     }
     return [android_caps, desktop_browser_caps]
 

package/build/index.js

@@ -11,13 +11,13 @@ Object.defineProperty(exports, "GeckoDriver", {
     return _driver.default;
   }
 });
+exports.default = void 0;
 Object.defineProperty(exports, "startServer", {
   enumerable: true,
   get: function () {
     return _server.startServer;
   }
 });
-exports.default = void 0;
 
 require("source-map-support/register");
 
@@ -25,16 +25,19 @@ var _driver = _interopRequireDefault(require("./lib/driver"));
 
 var _server = require("./lib/server");
 
-var _yargs = _interopRequireDefault(require("yargs"));
-
 var _asyncbox = require("asyncbox");
 
 const DEFAULT_HOST = 'localhost';
 const DEFAULT_PORT = 4797;
 
 async function main() {
-  let port = _yargs.default.argv.port || _yargs.default.argv.p || DEFAULT_PORT;
-  let host = _yargs.default.argv.host || _yargs.default.argv.h || DEFAULT_HOST;
+  const getArgValue = argName => {
+    const argIndex = process.argv.indexOf(argName);
+    return argIndex > 0 ? process.argv[argIndex + 1] : null;
+  };
+
+  const port = parseInt(getArgValue('--port'), 10) || DEFAULT_PORT;
+  const host = getArgValue('--host') || DEFAULT_HOST;
   return await (0, _server.startServer)(port, host);
 }
 
@@ -46,4 +49,4 @@ var _default = _driver.default;
 exports.default = _default;require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmpzIl0sIm5hbWVzIjpbIkRFRkFVTFRfSE9TVCIsIkRFRkFVTFRfUE9SVCIsIm1haW4iLCJwb3J0IiwieWFyZ3MiLCJhcmd2IiwicCIsImhvc3QiLCJoIiwicmVxdWlyZSIsIm1vZHVsZSIsIkdlY2tvRHJpdmVyIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBOztBQUNBOztBQUNBOztBQUNBOztBQUVBLE1BQU1BLFlBQVksR0FBRyxXQUFyQjtBQUNBLE1BQU1DLFlBQVksR0FBRyxJQUFyQjs7QUFFQSxlQUFlQyxJQUFmLEdBQXVCO0FBQ3JCLE1BQUlDLElBQUksR0FBR0MsZUFBTUMsSUFBTixDQUFXRixJQUFYLElBQW1CQyxlQUFNQyxJQUFOLENBQVdDLENBQTlCLElBQW1DTCxZQUE5QztBQUNBLE1BQUlNLElBQUksR0FBR0gsZUFBTUMsSUFBTixDQUFXRSxJQUFYLElBQW1CSCxlQUFNQyxJQUFOLENBQVdHLENBQTlCLElBQW1DUixZQUE5QztBQUNBLFNBQU8sTUFBTSx5QkFBWUcsSUFBWixFQUFrQkksSUFBbEIsQ0FBYjtBQUNEOztBQUVELElBQUlFLE9BQU8sQ0FBQ1AsSUFBUixLQUFpQlEsTUFBckIsRUFBNkI7QUFDM0IsMEJBQVNSLElBQVQ7QUFDRDs7ZUFFY1MsZSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBHZWNrb0RyaXZlciBmcm9tICcuL2xpYi9kcml2ZXInO1xuaW1wb3J0IHsgc3RhcnRTZXJ2ZXIgfSBmcm9tICcuL2xpYi9zZXJ2ZXInO1xuaW1wb3J0IHlhcmdzIGZyb20gJ3lhcmdzJztcbmltcG9ydCB7IGFzeW5jaWZ5IH0gZnJvbSAnYXN5bmNib3gnO1xuXG5jb25zdCBERUZBVUxUX0hPU1QgPSAnbG9jYWxob3N0JztcbmNvbnN0IERFRkFVTFRfUE9SVCA9IDQ3OTc7XG5cbmFzeW5jIGZ1bmN0aW9uIG1haW4gKCkge1xuICBsZXQgcG9ydCA9IHlhcmdzLmFyZ3YucG9ydCB8fCB5YXJncy5hcmd2LnAgfHwgREVGQVVMVF9QT1JUO1xuICBsZXQgaG9zdCA9IHlhcmdzLmFyZ3YuaG9zdCB8fCB5YXJncy5hcmd2LmggfHwgREVGQVVMVF9IT1NUO1xuICByZXR1cm4gYXdhaXQgc3RhcnRTZXJ2ZXIocG9ydCwgaG9zdCk7XG59XG5cbmlmIChyZXF1aXJlLm1haW4gPT09IG1vZHVsZSkge1xuICBhc3luY2lmeShtYWluKTtcbn1cblxuZXhwb3J0IGRlZmF1bHQgR2Vja29Ecml2ZXI7XG5leHBvcnQgeyBHZWNrb0RyaXZlciwgc3RhcnRTZXJ2ZXIgfTtcbiJdLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiLi4ifQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmpzIl0sIm5hbWVzIjpbIkRFRkFVTFRfSE9TVCIsIkRFRkFVTFRfUE9SVCIsIm1haW4iLCJnZXRBcmdWYWx1ZSIsImFyZ05hbWUiLCJhcmdJbmRleCIsInByb2Nlc3MiLCJhcmd2IiwiaW5kZXhPZiIsInBvcnQiLCJwYXJzZUludCIsImhvc3QiLCJyZXF1aXJlIiwibW9kdWxlIiwiR2Vja29Ecml2ZXIiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7O0FBQ0E7O0FBQ0E7O0FBRUEsTUFBTUEsWUFBWSxHQUFHLFdBQXJCO0FBQ0EsTUFBTUMsWUFBWSxHQUFHLElBQXJCOztBQUVBLGVBQWVDLElBQWYsR0FBdUI7QUFDckIsUUFBTUMsV0FBVyxHQUFJQyxPQUFELElBQWE7QUFDL0IsVUFBTUMsUUFBUSxHQUFHQyxPQUFPLENBQUNDLElBQVIsQ0FBYUMsT0FBYixDQUFxQkosT0FBckIsQ0FBakI7QUFDQSxXQUFPQyxRQUFRLEdBQUcsQ0FBWCxHQUFlQyxPQUFPLENBQUNDLElBQVIsQ0FBYUYsUUFBUSxHQUFHLENBQXhCLENBQWYsR0FBNEMsSUFBbkQ7QUFDRCxHQUhEOztBQUlBLFFBQU1JLElBQUksR0FBR0MsUUFBUSxDQUFDUCxXQUFXLENBQUMsUUFBRCxDQUFaLEVBQXdCLEVBQXhCLENBQVIsSUFBdUNGLFlBQXBEO0FBQ0EsUUFBTVUsSUFBSSxHQUFHUixXQUFXLENBQUMsUUFBRCxDQUFYLElBQXlCSCxZQUF0QztBQUNBLFNBQU8sTUFBTSx5QkFBWVMsSUFBWixFQUFrQkUsSUFBbEIsQ0FBYjtBQUNEOztBQUVELElBQUlDLE9BQU8sQ0FBQ1YsSUFBUixLQUFpQlcsTUFBckIsRUFBNkI7QUFDM0IsMEJBQVNYLElBQVQ7QUFDRDs7ZUFFY1ksZSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBHZWNrb0RyaXZlciBmcm9tICcuL2xpYi9kcml2ZXInO1xuaW1wb3J0IHsgc3RhcnRTZXJ2ZXIgfSBmcm9tICcuL2xpYi9zZXJ2ZXInO1xuaW1wb3J0IHsgYXN5bmNpZnkgfSBmcm9tICdhc3luY2JveCc7XG5cbmNvbnN0IERFRkFVTFRfSE9TVCA9ICdsb2NhbGhvc3QnO1xuY29uc3QgREVGQVVMVF9QT1JUID0gNDc5NztcblxuYXN5bmMgZnVuY3Rpb24gbWFpbiAoKSB7XG4gIGNvbnN0IGdldEFyZ1ZhbHVlID0gKGFyZ05hbWUpID0+IHtcbiAgICBjb25zdCBhcmdJbmRleCA9IHByb2Nlc3MuYXJndi5pbmRleE9mKGFyZ05hbWUpO1xuICAgIHJldHVybiBhcmdJbmRleCA+IDAgPyBwcm9jZXNzLmFyZ3ZbYXJnSW5kZXggKyAxXSA6IG51bGw7XG4gIH07XG4gIGNvbnN0IHBvcnQgPSBwYXJzZUludChnZXRBcmdWYWx1ZSgnLS1wb3J0JyksIDEwKSB8fCBERUZBVUxUX1BPUlQ7XG4gIGNvbnN0IGhvc3QgPSBnZXRBcmdWYWx1ZSgnLS1ob3N0JykgfHwgREVGQVVMVF9IT1NUO1xuICByZXR1cm4gYXdhaXQgc3RhcnRTZXJ2ZXIocG9ydCwgaG9zdCk7XG59XG5cbmlmIChyZXF1aXJlLm1haW4gPT09IG1vZHVsZSkge1xuICBhc3luY2lmeShtYWluKTtcbn1cblxuZXhwb3J0IGRlZmF1bHQgR2Vja29Ecml2ZXI7XG5leHBvcnQgeyBHZWNrb0RyaXZlciwgc3RhcnRTZXJ2ZXIgfTtcbiJdLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiLi4ifQ==

package/build/lib/commands/find.js

@@ -7,13 +7,13 @@ exports.default = exports.commands = void 0;
 
 require("source-map-support/register");
 
-var _appiumSupport = require("appium-support");
+var _support = require("@appium/support");
 
 const commands = {};
 exports.commands = commands;
 
 commands.findElOrEls = async function findElOrEls(strategy, selector, mult, context) {
-  context = _appiumSupport.util.unwrapElement(context);
+  context = _support.util.unwrapElement(context);
   const endpoint = `/element${context ? `/${context}/element` : ''}${mult ? 's' : ''}`;
   return await this.gecko.proxy.command(endpoint, 'POST', {
     using: strategy,
@@ -25,4 +25,4 @@ var _default = commands;
 exports.default = _default;require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9jb21tYW5kcy9maW5kLmpzIl0sIm5hbWVzIjpbImNvbW1hbmRzIiwiZmluZEVsT3JFbHMiLCJzdHJhdGVneSIsInNlbGVjdG9yIiwibXVsdCIsImNvbnRleHQiLCJ1dGlsIiwidW53cmFwRWxlbWVudCIsImVuZHBvaW50IiwiZ2Vja28iLCJwcm94eSIsImNvbW1hbmQiLCJ1c2luZyIsInZhbHVlIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQTs7QUFHQSxNQUFNQSxRQUFRLEdBQUcsRUFBakI7OztBQUdBQSxRQUFRLENBQUNDLFdBQVQsR0FBdUIsZUFBZUEsV0FBZixDQUE0QkMsUUFBNUIsRUFBc0NDLFFBQXRDLEVBQWdEQyxJQUFoRCxFQUFzREMsT0FBdEQsRUFBK0Q7QUFDcEZBLEVBQUFBLE9BQU8sR0FBR0Msb0JBQUtDLGFBQUwsQ0FBbUJGLE9BQW5CLENBQVY7QUFDQSxRQUFNRyxRQUFRLEdBQUksV0FBVUgsT0FBTyxHQUFJLElBQUdBLE9BQVEsVUFBZixHQUEyQixFQUFHLEdBQUVELElBQUksR0FBRyxHQUFILEdBQVMsRUFBRyxFQUFuRjtBQUVBLFNBQU8sTUFBTSxLQUFLSyxLQUFMLENBQVdDLEtBQVgsQ0FBaUJDLE9BQWpCLENBQXlCSCxRQUF6QixFQUFtQyxNQUFuQyxFQUEyQztBQUN0REksSUFBQUEsS0FBSyxFQUFFVixRQUQrQztBQUV0RFcsSUFBQUEsS0FBSyxFQUFFVjtBQUYrQyxHQUEzQyxDQUFiO0FBSUQsQ0FSRDs7ZUFZZUgsUSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHV0aWwgfSBmcm9tICdhcHBpdW0tc3VwcG9ydCc7XG5cblxuY29uc3QgY29tbWFuZHMgPSB7fTtcblxuLy8gVGhpcyBpcyBuZWVkZWQgdG8gbWFrZSBsb29rdXAgYnkgaW1hZ2Ugd29ya2luZ1xuY29tbWFuZHMuZmluZEVsT3JFbHMgPSBhc3luYyBmdW5jdGlvbiBmaW5kRWxPckVscyAoc3RyYXRlZ3ksIHNlbGVjdG9yLCBtdWx0LCBjb250ZXh0KSB7XG4gIGNvbnRleHQgPSB1dGlsLnVud3JhcEVsZW1lbnQoY29udGV4dCk7XG4gIGNvbnN0IGVuZHBvaW50ID0gYC9lbGVtZW50JHtjb250ZXh0ID8gYC8ke2NvbnRleHR9L2VsZW1lbnRgIDogJyd9JHttdWx0ID8gJ3MnIDogJyd9YDtcblxuICByZXR1cm4gYXdhaXQgdGhpcy5nZWNrby5wcm94eS5jb21tYW5kKGVuZHBvaW50LCAnUE9TVCcsIHtcbiAgICB1c2luZzogc3RyYXRlZ3ksXG4gICAgdmFsdWU6IHNlbGVjdG9yLFxuICB9KTtcbn07XG5cblxuZXhwb3J0IHsgY29tbWFuZHMgfTtcbmV4cG9ydCBkZWZhdWx0IGNvbW1hbmRzO1xuIl0sImZpbGUiOiJsaWIvY29tbWFuZHMvZmluZC5qcyIsInNvdXJjZVJvb3QiOiIuLi8uLi8uLiJ9
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9jb21tYW5kcy9maW5kLmpzIl0sIm5hbWVzIjpbImNvbW1hbmRzIiwiZmluZEVsT3JFbHMiLCJzdHJhdGVneSIsInNlbGVjdG9yIiwibXVsdCIsImNvbnRleHQiLCJ1dGlsIiwidW53cmFwRWxlbWVudCIsImVuZHBvaW50IiwiZ2Vja28iLCJwcm94eSIsImNvbW1hbmQiLCJ1c2luZyIsInZhbHVlIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQTs7QUFHQSxNQUFNQSxRQUFRLEdBQUcsRUFBakI7OztBQUdBQSxRQUFRLENBQUNDLFdBQVQsR0FBdUIsZUFBZUEsV0FBZixDQUE0QkMsUUFBNUIsRUFBc0NDLFFBQXRDLEVBQWdEQyxJQUFoRCxFQUFzREMsT0FBdEQsRUFBK0Q7QUFDcEZBLEVBQUFBLE9BQU8sR0FBR0MsY0FBS0MsYUFBTCxDQUFtQkYsT0FBbkIsQ0FBVjtBQUNBLFFBQU1HLFFBQVEsR0FBSSxXQUFVSCxPQUFPLEdBQUksSUFBR0EsT0FBUSxVQUFmLEdBQTJCLEVBQUcsR0FBRUQsSUFBSSxHQUFHLEdBQUgsR0FBUyxFQUFHLEVBQW5GO0FBRUEsU0FBTyxNQUFNLEtBQUtLLEtBQUwsQ0FBV0MsS0FBWCxDQUFpQkMsT0FBakIsQ0FBeUJILFFBQXpCLEVBQW1DLE1BQW5DLEVBQTJDO0FBQ3RESSxJQUFBQSxLQUFLLEVBQUVWLFFBRCtDO0FBRXREVyxJQUFBQSxLQUFLLEVBQUVWO0FBRitDLEdBQTNDLENBQWI7QUFJRCxDQVJEOztlQVllSCxRIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgdXRpbCB9IGZyb20gJ0BhcHBpdW0vc3VwcG9ydCc7XG5cblxuY29uc3QgY29tbWFuZHMgPSB7fTtcblxuLy8gVGhpcyBpcyBuZWVkZWQgdG8gbWFrZSBsb29rdXAgYnkgaW1hZ2Ugd29ya2luZ1xuY29tbWFuZHMuZmluZEVsT3JFbHMgPSBhc3luYyBmdW5jdGlvbiBmaW5kRWxPckVscyAoc3RyYXRlZ3ksIHNlbGVjdG9yLCBtdWx0LCBjb250ZXh0KSB7XG4gIGNvbnRleHQgPSB1dGlsLnVud3JhcEVsZW1lbnQoY29udGV4dCk7XG4gIGNvbnN0IGVuZHBvaW50ID0gYC9lbGVtZW50JHtjb250ZXh0ID8gYC8ke2NvbnRleHR9L2VsZW1lbnRgIDogJyd9JHttdWx0ID8gJ3MnIDogJyd9YDtcblxuICByZXR1cm4gYXdhaXQgdGhpcy5nZWNrby5wcm94eS5jb21tYW5kKGVuZHBvaW50LCAnUE9TVCcsIHtcbiAgICB1c2luZzogc3RyYXRlZ3ksXG4gICAgdmFsdWU6IHNlbGVjdG9yLFxuICB9KTtcbn07XG5cblxuZXhwb3J0IHsgY29tbWFuZHMgfTtcbmV4cG9ydCBkZWZhdWx0IGNvbW1hbmRzO1xuIl0sImZpbGUiOiJsaWIvY29tbWFuZHMvZmluZC5qcyIsInNvdXJjZVJvb3QiOiIuLi8uLi8uLiJ9

package/build/lib/desired-caps.js

@@ -37,6 +37,9 @@ const desiredCapConstraints = {
   systemPort: {
     isNumber: true
   },
+  marionettePort: {
+    isNumber: true
+  },
   verbosity: {
     isString: true,
     inclusionCaseInsensitive: Object.values(_constants.VERBOSITY)
@@ -52,4 +55,4 @@ const desiredCapConstraints = {
 exports.desiredCapConstraints = desiredCapConstraints;require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9kZXNpcmVkLWNhcHMuanMiXSwibmFtZXMiOlsiZGVzaXJlZENhcENvbnN0cmFpbnRzIiwiYnJvd3Nlck5hbWUiLCJpc1N0cmluZyIsImJyb3dzZXJWZXJzaW9uIiwiYWNjZXB0SW5zZWN1cmVDZXJ0cyIsImlzQm9vbGVhbiIsInBhZ2VMb2FkU3RyYXRlZ3kiLCJwcm94eSIsImlzT2JqZWN0Iiwic2V0V2luZG93UmVjdCIsInRpbWVvdXRzIiwidW5oYW5kbGVkUHJvbXB0QmVoYXZpb3IiLCJzeXN0ZW1Qb3J0IiwiaXNOdW1iZXIiLCJ2ZXJib3NpdHkiLCJpbmNsdXNpb25DYXNlSW5zZW5zaXRpdmUiLCJPYmplY3QiLCJ2YWx1ZXMiLCJWRVJCT1NJVFkiLCJhbmRyb2lkU3RvcmFnZSJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUE7O0FBRUEsTUFBTUEscUJBQXFCLEdBQUc7QUFDNUJDLEVBQUFBLFdBQVcsRUFBRTtBQUNYQyxJQUFBQSxRQUFRLEVBQUU7QUFEQyxHQURlO0FBSTVCQyxFQUFBQSxjQUFjLEVBQUU7QUFDZEQsSUFBQUEsUUFBUSxFQUFFO0FBREksR0FKWTtBQU81QkUsRUFBQUEsbUJBQW1CLEVBQUU7QUFDbkJDLElBQUFBLFNBQVMsRUFBRTtBQURRLEdBUE87QUFVNUJDLEVBQUFBLGdCQUFnQixFQUFFO0FBQ2hCSixJQUFBQSxRQUFRLEVBQUU7QUFETSxHQVZVO0FBYTVCSyxFQUFBQSxLQUFLLEVBQUU7QUFDTEMsSUFBQUEsUUFBUSxFQUFFO0FBREwsR0FicUI7QUFnQjVCQyxFQUFBQSxhQUFhLEVBQUU7QUFDYkosSUFBQUEsU0FBUyxFQUFFO0FBREUsR0FoQmE7QUFtQjVCSyxFQUFBQSxRQUFRLEVBQUU7QUFDUkYsSUFBQUEsUUFBUSxFQUFFO0FBREYsR0FuQmtCO0FBc0I1QkcsRUFBQUEsdUJBQXVCLEVBQUU7QUFDdkJULElBQUFBLFFBQVEsRUFBRTtBQURhLEdBdEJHO0FBeUI1QlUsRUFBQUEsVUFBVSxFQUFFO0FBQ1ZDLElBQUFBLFFBQVEsRUFBRTtBQURBLEdBekJnQjtBQTRCNUJDLEVBQUFBLFNBQVMsRUFBRTtBQUNUWixJQUFBQSxRQUFRLEVBQUUsSUFERDtBQUVUYSxJQUFBQSx3QkFBd0IsRUFBRUMsTUFBTSxDQUFDQyxNQUFQLENBQWNDLG9CQUFkO0FBRmpCLEdBNUJpQjtBQWdDNUJDLEVBQUFBLGNBQWMsRUFBRTtBQUNkakIsSUFBQUEsUUFBUSxFQUFFLElBREk7QUFFZGEsSUFBQUEsd0JBQXdCLEVBQUUsQ0FBQyxNQUFELEVBQVMsS0FBVCxFQUFnQixVQUFoQixFQUE0QixRQUE1QjtBQUZaLEdBaENZO0FBb0M1Qix3QkFBc0I7QUFDcEJQLElBQUFBLFFBQVEsRUFBRTtBQURVO0FBcENNLENBQTlCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVkVSQk9TSVRZIH0gZnJvbSAnLi9jb25zdGFudHMnO1xuXG5jb25zdCBkZXNpcmVkQ2FwQ29uc3RyYWludHMgPSB7XG4gIGJyb3dzZXJOYW1lOiB7XG4gICAgaXNTdHJpbmc6IHRydWVcbiAgfSxcbiAgYnJvd3NlclZlcnNpb246IHtcbiAgICBpc1N0cmluZzogdHJ1ZVxuICB9LFxuICBhY2NlcHRJbnNlY3VyZUNlcnRzOiB7XG4gICAgaXNCb29sZWFuOiB0cnVlXG4gIH0sXG4gIHBhZ2VMb2FkU3RyYXRlZ3k6IHtcbiAgICBpc1N0cmluZzogdHJ1ZVxuICB9LFxuICBwcm94eToge1xuICAgIGlzT2JqZWN0OiB0cnVlXG4gIH0sXG4gIHNldFdpbmRvd1JlY3Q6IHtcbiAgICBpc0Jvb2xlYW46IHRydWVcbiAgfSxcbiAgdGltZW91dHM6IHtcbiAgICBpc09iamVjdDogdHJ1ZVxuICB9LFxuICB1bmhhbmRsZWRQcm9tcHRCZWhhdmlvcjoge1xuICAgIGlzU3RyaW5nOiB0cnVlXG4gIH0sXG4gIHN5c3RlbVBvcnQ6IHtcbiAgICBpc051bWJlcjogdHJ1ZVxuICB9LFxuICB2ZXJib3NpdHk6IHtcbiAgICBpc1N0cmluZzogdHJ1ZSxcbiAgICBpbmNsdXNpb25DYXNlSW5zZW5zaXRpdmU6IE9iamVjdC52YWx1ZXMoVkVSQk9TSVRZKVxuICB9LFxuICBhbmRyb2lkU3RvcmFnZToge1xuICAgIGlzU3RyaW5nOiB0cnVlLFxuICAgIGluY2x1c2lvbkNhc2VJbnNlbnNpdGl2ZTogWydhdXRvJywgJ2FwcCcsICdpbnRlcm5hbCcsICdzZGNhcmQnXVxuICB9LFxuICAnbW96OmZpcmVmb3hPcHRpb25zJzoge1xuICAgIGlzT2JqZWN0OiB0cnVlXG4gIH1cbn07XG5cbmV4cG9ydCB7IGRlc2lyZWRDYXBDb25zdHJhaW50cyB9O1xuIl0sImZpbGUiOiJsaWIvZGVzaXJlZC1jYXBzLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uIn0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9kZXNpcmVkLWNhcHMuanMiXSwibmFtZXMiOlsiZGVzaXJlZENhcENvbnN0cmFpbnRzIiwiYnJvd3Nlck5hbWUiLCJpc1N0cmluZyIsImJyb3dzZXJWZXJzaW9uIiwiYWNjZXB0SW5zZWN1cmVDZXJ0cyIsImlzQm9vbGVhbiIsInBhZ2VMb2FkU3RyYXRlZ3kiLCJwcm94eSIsImlzT2JqZWN0Iiwic2V0V2luZG93UmVjdCIsInRpbWVvdXRzIiwidW5oYW5kbGVkUHJvbXB0QmVoYXZpb3IiLCJzeXN0ZW1Qb3J0IiwiaXNOdW1iZXIiLCJtYXJpb25ldHRlUG9ydCIsInZlcmJvc2l0eSIsImluY2x1c2lvbkNhc2VJbnNlbnNpdGl2ZSIsIk9iamVjdCIsInZhbHVlcyIsIlZFUkJPU0lUWSIsImFuZHJvaWRTdG9yYWdlIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQTs7QUFFQSxNQUFNQSxxQkFBcUIsR0FBRztBQUM1QkMsRUFBQUEsV0FBVyxFQUFFO0FBQ1hDLElBQUFBLFFBQVEsRUFBRTtBQURDLEdBRGU7QUFJNUJDLEVBQUFBLGNBQWMsRUFBRTtBQUNkRCxJQUFBQSxRQUFRLEVBQUU7QUFESSxHQUpZO0FBTzVCRSxFQUFBQSxtQkFBbUIsRUFBRTtBQUNuQkMsSUFBQUEsU0FBUyxFQUFFO0FBRFEsR0FQTztBQVU1QkMsRUFBQUEsZ0JBQWdCLEVBQUU7QUFDaEJKLElBQUFBLFFBQVEsRUFBRTtBQURNLEdBVlU7QUFhNUJLLEVBQUFBLEtBQUssRUFBRTtBQUNMQyxJQUFBQSxRQUFRLEVBQUU7QUFETCxHQWJxQjtBQWdCNUJDLEVBQUFBLGFBQWEsRUFBRTtBQUNiSixJQUFBQSxTQUFTLEVBQUU7QUFERSxHQWhCYTtBQW1CNUJLLEVBQUFBLFFBQVEsRUFBRTtBQUNSRixJQUFBQSxRQUFRLEVBQUU7QUFERixHQW5Ca0I7QUFzQjVCRyxFQUFBQSx1QkFBdUIsRUFBRTtBQUN2QlQsSUFBQUEsUUFBUSxFQUFFO0FBRGEsR0F0Qkc7QUF5QjVCVSxFQUFBQSxVQUFVLEVBQUU7QUFDVkMsSUFBQUEsUUFBUSxFQUFFO0FBREEsR0F6QmdCO0FBNEI1QkMsRUFBQUEsY0FBYyxFQUFFO0FBQ2RELElBQUFBLFFBQVEsRUFBRTtBQURJLEdBNUJZO0FBK0I1QkUsRUFBQUEsU0FBUyxFQUFFO0FBQ1RiLElBQUFBLFFBQVEsRUFBRSxJQUREO0FBRVRjLElBQUFBLHdCQUF3QixFQUFFQyxNQUFNLENBQUNDLE1BQVAsQ0FBY0Msb0JBQWQ7QUFGakIsR0EvQmlCO0FBbUM1QkMsRUFBQUEsY0FBYyxFQUFFO0FBQ2RsQixJQUFBQSxRQUFRLEVBQUUsSUFESTtBQUVkYyxJQUFBQSx3QkFBd0IsRUFBRSxDQUFDLE1BQUQsRUFBUyxLQUFULEVBQWdCLFVBQWhCLEVBQTRCLFFBQTVCO0FBRlosR0FuQ1k7QUF1QzVCLHdCQUFzQjtBQUNwQlIsSUFBQUEsUUFBUSxFQUFFO0FBRFU7QUF2Q00sQ0FBOUIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBWRVJCT1NJVFkgfSBmcm9tICcuL2NvbnN0YW50cyc7XG5cbmNvbnN0IGRlc2lyZWRDYXBDb25zdHJhaW50cyA9IHtcbiAgYnJvd3Nlck5hbWU6IHtcbiAgICBpc1N0cmluZzogdHJ1ZVxuICB9LFxuICBicm93c2VyVmVyc2lvbjoge1xuICAgIGlzU3RyaW5nOiB0cnVlXG4gIH0sXG4gIGFjY2VwdEluc2VjdXJlQ2VydHM6IHtcbiAgICBpc0Jvb2xlYW46IHRydWVcbiAgfSxcbiAgcGFnZUxvYWRTdHJhdGVneToge1xuICAgIGlzU3RyaW5nOiB0cnVlXG4gIH0sXG4gIHByb3h5OiB7XG4gICAgaXNPYmplY3Q6IHRydWVcbiAgfSxcbiAgc2V0V2luZG93UmVjdDoge1xuICAgIGlzQm9vbGVhbjogdHJ1ZVxuICB9LFxuICB0aW1lb3V0czoge1xuICAgIGlzT2JqZWN0OiB0cnVlXG4gIH0sXG4gIHVuaGFuZGxlZFByb21wdEJlaGF2aW9yOiB7XG4gICAgaXNTdHJpbmc6IHRydWVcbiAgfSxcbiAgc3lzdGVtUG9ydDoge1xuICAgIGlzTnVtYmVyOiB0cnVlXG4gIH0sXG4gIG1hcmlvbmV0dGVQb3J0OiB7XG4gICAgaXNOdW1iZXI6IHRydWVcbiAgfSxcbiAgdmVyYm9zaXR5OiB7XG4gICAgaXNTdHJpbmc6IHRydWUsXG4gICAgaW5jbHVzaW9uQ2FzZUluc2Vuc2l0aXZlOiBPYmplY3QudmFsdWVzKFZFUkJPU0lUWSlcbiAgfSxcbiAgYW5kcm9pZFN0b3JhZ2U6IHtcbiAgICBpc1N0cmluZzogdHJ1ZSxcbiAgICBpbmNsdXNpb25DYXNlSW5zZW5zaXRpdmU6IFsnYXV0bycsICdhcHAnLCAnaW50ZXJuYWwnLCAnc2RjYXJkJ11cbiAgfSxcbiAgJ21vejpmaXJlZm94T3B0aW9ucyc6IHtcbiAgICBpc09iamVjdDogdHJ1ZVxuICB9XG59O1xuXG5leHBvcnQgeyBkZXNpcmVkQ2FwQ29uc3RyYWludHMgfTtcbiJdLCJmaWxlIjoibGliL2Rlc2lyZWQtY2Fwcy5qcyIsInNvdXJjZVJvb3QiOiIuLi8uLiJ9

package/build/lib/driver.js

@@ -11,7 +11,7 @@ require("source-map-support/register");
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _appiumBaseDriver = require("appium-base-driver");
+var _baseDriver = require("@appium/base-driver");
 
 var _logger = _interopRequireDefault(require("./logger"));
 
@@ -25,7 +25,7 @@ var _utils = require("./utils");
 
 const NO_PROXY = [['GET', new RegExp('^/session/[^/]+/appium')], ['POST', new RegExp('^/session/[^/]+/appium')], ['POST', new RegExp('^/session/[^/]+/element/[^/]+/elements?$')], ['POST', new RegExp('^/session/[^/]+/elements?$')]];
 
-class GeckoDriver extends _appiumBaseDriver.BaseDriver {
+class GeckoDriver extends _baseDriver.BaseDriver {
   constructor(opts = {}) {
     super(opts);
     this.desiredCapConstraints = _desiredCaps.desiredCapConstraints;
@@ -85,4 +85,4 @@ var _default = GeckoDriver;
 exports.default = _default;require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9kcml2ZXIuanMiXSwibmFtZXMiOlsiTk9fUFJPWFkiLCJSZWdFeHAiLCJHZWNrb0RyaXZlciIsIkJhc2VEcml2ZXIiLCJjb25zdHJ1Y3RvciIsIm9wdHMiLCJkZXNpcmVkQ2FwQ29uc3RyYWludHMiLCJsb2NhdG9yU3RyYXRlZ2llcyIsInJlc2V0U3RhdGUiLCJjbWQiLCJmbiIsIl8iLCJ0b1BhaXJzIiwiY29tbWFuZHMiLCJwcm90b3R5cGUiLCJnZWNrbyIsInByb3h5UmVxUmVzIiwiaXNQcm94eUFjdGl2ZSIsInByb3h5QWN0aXZlIiwiZ2V0UHJveHlBdm9pZExpc3QiLCJjYW5Qcm94eSIsImNyZWF0ZVNlc3Npb24iLCJhcmdzIiwic2Vzc2lvbklkIiwiY2FwcyIsIkdlY2tvRHJpdmVyU2VydmVyIiwic3RhcnQiLCJlIiwiZGVsZXRlU2Vzc2lvbiIsInByb3h5IiwiYmluZCIsImxvZyIsImluZm8iLCJzdG9wIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUVBLE1BQU1BLFFBQVEsR0FBRyxDQUNmLENBQUMsS0FBRCxFQUFRLElBQUlDLE1BQUosQ0FBVyx3QkFBWCxDQUFSLENBRGUsRUFFZixDQUFDLE1BQUQsRUFBUyxJQUFJQSxNQUFKLENBQVcsd0JBQVgsQ0FBVCxDQUZlLEVBR2YsQ0FBQyxNQUFELEVBQVMsSUFBSUEsTUFBSixDQUFXLDBDQUFYLENBQVQsQ0FIZSxFQUlmLENBQUMsTUFBRCxFQUFTLElBQUlBLE1BQUosQ0FBVyw0QkFBWCxDQUFULENBSmUsQ0FBakI7O0FBT0EsTUFBTUMsV0FBTixTQUEwQkMsNEJBQTFCLENBQXFDO0FBQ25DQyxFQUFBQSxXQUFXLENBQUVDLElBQUksR0FBRyxFQUFULEVBQWE7QUFDdEIsVUFBTUEsSUFBTjtBQUNBLFNBQUtDLHFCQUFMLEdBQTZCQSxrQ0FBN0I7QUFDQSxTQUFLQyxpQkFBTCxHQUF5QixDQUN2QixPQUR1QixFQUV2QixVQUZ1QixFQUd2QixXQUh1QixFQUl2QixtQkFKdUIsRUFLdkIsY0FMdUIsRUFPdkIsSUFQdUIsRUFRdkIsTUFSdUIsQ0FBekI7QUFVQSxTQUFLQyxVQUFMOztBQUVBLFNBQUssTUFBTSxDQUFDQyxHQUFELEVBQU1DLEVBQU4sQ0FBWCxJQUF3QkMsZ0JBQUVDLE9BQUYsQ0FBVUMsY0FBVixDQUF4QixFQUE2QztBQUMzQ1gsTUFBQUEsV0FBVyxDQUFDWSxTQUFaLENBQXNCTCxHQUF0QixJQUE2QkMsRUFBN0I7QUFDRDtBQUNGOztBQUVERixFQUFBQSxVQUFVLEdBQUk7QUFDWixTQUFLTyxLQUFMLEdBQWEsSUFBYjtBQUNBLFNBQUtDLFdBQUwsR0FBbUIsSUFBbkI7QUFDQSxTQUFLQyxhQUFMLEdBQXFCLEtBQXJCO0FBQ0Q7O0FBRURDLEVBQUFBLFdBQVcsR0FBSTtBQUNiLFdBQU8sS0FBS0QsYUFBWjtBQUNEOztBQUVERSxFQUFBQSxpQkFBaUIsR0FBSTtBQUNuQixXQUFPbkIsUUFBUDtBQUNEOztBQUVEb0IsRUFBQUEsUUFBUSxHQUFJO0FBQ1YsV0FBTyxJQUFQO0FBQ0Q7O0FBRUQsUUFBTUMsYUFBTixDQUFxQixHQUFHQyxJQUF4QixFQUE4QjtBQUM1QixVQUFNLENBQUNDLFNBQUQsRUFBWUMsSUFBWixJQUFvQixNQUFNLE1BQU1ILGFBQU4sQ0FBb0IsR0FBR0MsSUFBdkIsQ0FBaEM7QUFDQSxTQUFLUCxLQUFMLEdBQWEsSUFBSVUsY0FBSixDQUFzQkQsSUFBdEIsQ0FBYjs7QUFDQSxRQUFJO0FBQ0YsWUFBTSxLQUFLVCxLQUFMLENBQVdXLEtBQVgsQ0FBaUIsZ0NBQW9CRixJQUFwQixDQUFqQixDQUFOO0FBQ0QsS0FGRCxDQUVFLE9BQU9HLENBQVAsRUFBVTtBQUNWLFlBQU0sS0FBS0MsYUFBTCxFQUFOO0FBQ0EsWUFBTUQsQ0FBTjtBQUNEOztBQUNELFNBQUtYLFdBQUwsR0FBbUIsS0FBS0QsS0FBTCxDQUFXYyxLQUFYLENBQWlCYixXQUFqQixDQUE2QmMsSUFBN0IsQ0FBa0MsS0FBS2YsS0FBTCxDQUFXYyxLQUE3QyxDQUFuQjtBQUNBLFNBQUtaLGFBQUwsR0FBcUIsSUFBckI7QUFDQSxXQUFPLENBQUNNLFNBQUQsRUFBWUMsSUFBWixDQUFQO0FBQ0Q7O0FBRUQsUUFBTUksYUFBTixHQUF1QjtBQUNyQkcsb0JBQUlDLElBQUosQ0FBUyw2QkFBVDs7QUFDQSxVQUFNLEtBQUtqQixLQUFMLENBQVdrQixJQUFYLEVBQU47QUFDQSxTQUFLekIsVUFBTDtBQUVBLFVBQU0sTUFBTW9CLGFBQU4sRUFBTjtBQUNEOztBQTNEa0M7O2VBOER0QjFCLFciLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXyBmcm9tICdsb2Rhc2gnO1xuaW1wb3J0IHsgQmFzZURyaXZlciB9IGZyb20gJ2FwcGl1bS1iYXNlLWRyaXZlcic7XG5pbXBvcnQgbG9nIGZyb20gJy4vbG9nZ2VyJztcbmltcG9ydCBHZWNrb0RyaXZlclNlcnZlciBmcm9tICcuL2dlY2tvJztcbmltcG9ydCB7IGRlc2lyZWRDYXBDb25zdHJhaW50cyB9IGZyb20gJy4vZGVzaXJlZC1jYXBzJztcbmltcG9ydCBjb21tYW5kcyBmcm9tICcuL2NvbW1hbmRzL2luZGV4JztcbmltcG9ydCB7IGZvcm1hdENhcHNGb3JTZXJ2ZXIgfSBmcm9tICcuL3V0aWxzJztcblxuY29uc3QgTk9fUFJPWFkgPSBbXG4gIFsnR0VUJywgbmV3IFJlZ0V4cCgnXi9zZXNzaW9uL1teL10rL2FwcGl1bScpXSxcbiAgWydQT1NUJywgbmV3IFJlZ0V4cCgnXi9zZXNzaW9uL1teL10rL2FwcGl1bScpXSxcbiAgWydQT1NUJywgbmV3IFJlZ0V4cCgnXi9zZXNzaW9uL1teL10rL2VsZW1lbnQvW14vXSsvZWxlbWVudHM/JCcpXSxcbiAgWydQT1NUJywgbmV3IFJlZ0V4cCgnXi9zZXNzaW9uL1teL10rL2VsZW1lbnRzPyQnKV0sXG5dO1xuXG5jbGFzcyBHZWNrb0RyaXZlciBleHRlbmRzIEJhc2VEcml2ZXIge1xuICBjb25zdHJ1Y3RvciAob3B0cyA9IHt9KSB7XG4gICAgc3VwZXIob3B0cyk7XG4gICAgdGhpcy5kZXNpcmVkQ2FwQ29uc3RyYWludHMgPSBkZXNpcmVkQ2FwQ29uc3RyYWludHM7XG4gICAgdGhpcy5sb2NhdG9yU3RyYXRlZ2llcyA9IFtcbiAgICAgICd4cGF0aCcsXG4gICAgICAndGFnIG5hbWUnLFxuICAgICAgJ2xpbmsgdGV4dCcsXG4gICAgICAncGFydGlhbCBsaW5rIHRleHQnLFxuICAgICAgJ2NzcyBzZWxlY3RvcicsXG4gICAgICAvLyBMZXQgdGhlc2UgdHdvIHJlYWNoIEdlY2tvIERyaXZlciBhbmQgZmFpbCB0aGVyZSB3aXRoIGEgcHJvcGVyIGVycm9yIG1lc3NhZ2VcbiAgICAgICdpZCcsXG4gICAgICAnbmFtZScsXG4gICAgXTtcbiAgICB0aGlzLnJlc2V0U3RhdGUoKTtcblxuICAgIGZvciAoY29uc3QgW2NtZCwgZm5dIG9mIF8udG9QYWlycyhjb21tYW5kcykpIHtcbiAgICAgIEdlY2tvRHJpdmVyLnByb3RvdHlwZVtjbWRdID0gZm47XG4gICAgfVxuICB9XG5cbiAgcmVzZXRTdGF0ZSAoKSB7XG4gICAgdGhpcy5nZWNrbyA9IG51bGw7XG4gICAgdGhpcy5wcm94eVJlcVJlcyA9IG51bGw7XG4gICAgdGhpcy5pc1Byb3h5QWN0aXZlID0gZmFsc2U7XG4gIH1cblxuICBwcm94eUFjdGl2ZSAoKSB7XG4gICAgcmV0dXJuIHRoaXMuaXNQcm94eUFjdGl2ZTtcbiAgfVxuXG4gIGdldFByb3h5QXZvaWRMaXN0ICgpIHtcbiAgICByZXR1cm4gTk9fUFJPWFk7XG4gIH1cblxuICBjYW5Qcm94eSAoKSB7XG4gICAgcmV0dXJuIHRydWU7XG4gIH1cblxuICBhc3luYyBjcmVhdGVTZXNzaW9uICguLi5hcmdzKSB7XG4gICAgY29uc3QgW3Nlc3Npb25JZCwgY2Fwc10gPSBhd2FpdCBzdXBlci5jcmVhdGVTZXNzaW9uKC4uLmFyZ3MpO1xuICAgIHRoaXMuZ2Vja28gPSBuZXcgR2Vja29Ecml2ZXJTZXJ2ZXIoY2Fwcyk7XG4gICAgdHJ5IHtcbiAgICAgIGF3YWl0IHRoaXMuZ2Vja28uc3RhcnQoZm9ybWF0Q2Fwc0ZvclNlcnZlcihjYXBzKSk7XG4gICAgfSBjYXRjaCAoZSkge1xuICAgICAgYXdhaXQgdGhpcy5kZWxldGVTZXNzaW9uKCk7XG4gICAgICB0aHJvdyBlO1xuICAgIH1cbiAgICB0aGlzLnByb3h5UmVxUmVzID0gdGhpcy5nZWNrby5wcm94eS5wcm94eVJlcVJlcy5iaW5kKHRoaXMuZ2Vja28ucHJveHkpO1xuICAgIHRoaXMuaXNQcm94eUFjdGl2ZSA9IHRydWU7XG4gICAgcmV0dXJuIFtzZXNzaW9uSWQsIGNhcHNdO1xuICB9XG5cbiAgYXN5bmMgZGVsZXRlU2Vzc2lvbiAoKSB7XG4gICAgbG9nLmluZm8oJ0VuZGluZyBHZWNrbyBEcml2ZXIgc2Vzc2lvbicpO1xuICAgIGF3YWl0IHRoaXMuZ2Vja28uc3RvcCgpO1xuICAgIHRoaXMucmVzZXRTdGF0ZSgpO1xuXG4gICAgYXdhaXQgc3VwZXIuZGVsZXRlU2Vzc2lvbigpO1xuICB9XG59XG5cbmV4cG9ydCBkZWZhdWx0IEdlY2tvRHJpdmVyO1xuIl0sImZpbGUiOiJsaWIvZHJpdmVyLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uIn0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9kcml2ZXIuanMiXSwibmFtZXMiOlsiTk9fUFJPWFkiLCJSZWdFeHAiLCJHZWNrb0RyaXZlciIsIkJhc2VEcml2ZXIiLCJjb25zdHJ1Y3RvciIsIm9wdHMiLCJkZXNpcmVkQ2FwQ29uc3RyYWludHMiLCJsb2NhdG9yU3RyYXRlZ2llcyIsInJlc2V0U3RhdGUiLCJjbWQiLCJmbiIsIl8iLCJ0b1BhaXJzIiwiY29tbWFuZHMiLCJwcm90b3R5cGUiLCJnZWNrbyIsInByb3h5UmVxUmVzIiwiaXNQcm94eUFjdGl2ZSIsInByb3h5QWN0aXZlIiwiZ2V0UHJveHlBdm9pZExpc3QiLCJjYW5Qcm94eSIsImNyZWF0ZVNlc3Npb24iLCJhcmdzIiwic2Vzc2lvbklkIiwiY2FwcyIsIkdlY2tvRHJpdmVyU2VydmVyIiwic3RhcnQiLCJlIiwiZGVsZXRlU2Vzc2lvbiIsInByb3h5IiwiYmluZCIsImxvZyIsImluZm8iLCJzdG9wIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUVBLE1BQU1BLFFBQVEsR0FBRyxDQUNmLENBQUMsS0FBRCxFQUFRLElBQUlDLE1BQUosQ0FBVyx3QkFBWCxDQUFSLENBRGUsRUFFZixDQUFDLE1BQUQsRUFBUyxJQUFJQSxNQUFKLENBQVcsd0JBQVgsQ0FBVCxDQUZlLEVBR2YsQ0FBQyxNQUFELEVBQVMsSUFBSUEsTUFBSixDQUFXLDBDQUFYLENBQVQsQ0FIZSxFQUlmLENBQUMsTUFBRCxFQUFTLElBQUlBLE1BQUosQ0FBVyw0QkFBWCxDQUFULENBSmUsQ0FBakI7O0FBT0EsTUFBTUMsV0FBTixTQUEwQkMsc0JBQTFCLENBQXFDO0FBQ25DQyxFQUFBQSxXQUFXLENBQUVDLElBQUksR0FBRyxFQUFULEVBQWE7QUFDdEIsVUFBTUEsSUFBTjtBQUNBLFNBQUtDLHFCQUFMLEdBQTZCQSxrQ0FBN0I7QUFDQSxTQUFLQyxpQkFBTCxHQUF5QixDQUN2QixPQUR1QixFQUV2QixVQUZ1QixFQUd2QixXQUh1QixFQUl2QixtQkFKdUIsRUFLdkIsY0FMdUIsRUFPdkIsSUFQdUIsRUFRdkIsTUFSdUIsQ0FBekI7QUFVQSxTQUFLQyxVQUFMOztBQUVBLFNBQUssTUFBTSxDQUFDQyxHQUFELEVBQU1DLEVBQU4sQ0FBWCxJQUF3QkMsZ0JBQUVDLE9BQUYsQ0FBVUMsY0FBVixDQUF4QixFQUE2QztBQUMzQ1gsTUFBQUEsV0FBVyxDQUFDWSxTQUFaLENBQXNCTCxHQUF0QixJQUE2QkMsRUFBN0I7QUFDRDtBQUNGOztBQUVERixFQUFBQSxVQUFVLEdBQUk7QUFDWixTQUFLTyxLQUFMLEdBQWEsSUFBYjtBQUNBLFNBQUtDLFdBQUwsR0FBbUIsSUFBbkI7QUFDQSxTQUFLQyxhQUFMLEdBQXFCLEtBQXJCO0FBQ0Q7O0FBRURDLEVBQUFBLFdBQVcsR0FBSTtBQUNiLFdBQU8sS0FBS0QsYUFBWjtBQUNEOztBQUVERSxFQUFBQSxpQkFBaUIsR0FBSTtBQUNuQixXQUFPbkIsUUFBUDtBQUNEOztBQUVEb0IsRUFBQUEsUUFBUSxHQUFJO0FBQ1YsV0FBTyxJQUFQO0FBQ0Q7O0FBRWtCLFFBQWJDLGFBQWEsQ0FBRSxHQUFHQyxJQUFMLEVBQVc7QUFDNUIsVUFBTSxDQUFDQyxTQUFELEVBQVlDLElBQVosSUFBb0IsTUFBTSxNQUFNSCxhQUFOLENBQW9CLEdBQUdDLElBQXZCLENBQWhDO0FBQ0EsU0FBS1AsS0FBTCxHQUFhLElBQUlVLGNBQUosQ0FBc0JELElBQXRCLENBQWI7O0FBQ0EsUUFBSTtBQUNGLFlBQU0sS0FBS1QsS0FBTCxDQUFXVyxLQUFYLENBQWlCLGdDQUFvQkYsSUFBcEIsQ0FBakIsQ0FBTjtBQUNELEtBRkQsQ0FFRSxPQUFPRyxDQUFQLEVBQVU7QUFDVixZQUFNLEtBQUtDLGFBQUwsRUFBTjtBQUNBLFlBQU1ELENBQU47QUFDRDs7QUFDRCxTQUFLWCxXQUFMLEdBQW1CLEtBQUtELEtBQUwsQ0FBV2MsS0FBWCxDQUFpQmIsV0FBakIsQ0FBNkJjLElBQTdCLENBQWtDLEtBQUtmLEtBQUwsQ0FBV2MsS0FBN0MsQ0FBbkI7QUFDQSxTQUFLWixhQUFMLEdBQXFCLElBQXJCO0FBQ0EsV0FBTyxDQUFDTSxTQUFELEVBQVlDLElBQVosQ0FBUDtBQUNEOztBQUVrQixRQUFiSSxhQUFhLEdBQUk7QUFDckJHLG9CQUFJQyxJQUFKLENBQVMsNkJBQVQ7O0FBQ0EsVUFBTSxLQUFLakIsS0FBTCxDQUFXa0IsSUFBWCxFQUFOO0FBQ0EsU0FBS3pCLFVBQUw7QUFFQSxVQUFNLE1BQU1vQixhQUFOLEVBQU47QUFDRDs7QUEzRGtDOztlQThEdEIxQixXIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IF8gZnJvbSAnbG9kYXNoJztcbmltcG9ydCB7IEJhc2VEcml2ZXIgfSBmcm9tICdAYXBwaXVtL2Jhc2UtZHJpdmVyJztcbmltcG9ydCBsb2cgZnJvbSAnLi9sb2dnZXInO1xuaW1wb3J0IEdlY2tvRHJpdmVyU2VydmVyIGZyb20gJy4vZ2Vja28nO1xuaW1wb3J0IHsgZGVzaXJlZENhcENvbnN0cmFpbnRzIH0gZnJvbSAnLi9kZXNpcmVkLWNhcHMnO1xuaW1wb3J0IGNvbW1hbmRzIGZyb20gJy4vY29tbWFuZHMvaW5kZXgnO1xuaW1wb3J0IHsgZm9ybWF0Q2Fwc0ZvclNlcnZlciB9IGZyb20gJy4vdXRpbHMnO1xuXG5jb25zdCBOT19QUk9YWSA9IFtcbiAgWydHRVQnLCBuZXcgUmVnRXhwKCdeL3Nlc3Npb24vW14vXSsvYXBwaXVtJyldLFxuICBbJ1BPU1QnLCBuZXcgUmVnRXhwKCdeL3Nlc3Npb24vW14vXSsvYXBwaXVtJyldLFxuICBbJ1BPU1QnLCBuZXcgUmVnRXhwKCdeL3Nlc3Npb24vW14vXSsvZWxlbWVudC9bXi9dKy9lbGVtZW50cz8kJyldLFxuICBbJ1BPU1QnLCBuZXcgUmVnRXhwKCdeL3Nlc3Npb24vW14vXSsvZWxlbWVudHM/JCcpXSxcbl07XG5cbmNsYXNzIEdlY2tvRHJpdmVyIGV4dGVuZHMgQmFzZURyaXZlciB7XG4gIGNvbnN0cnVjdG9yIChvcHRzID0ge30pIHtcbiAgICBzdXBlcihvcHRzKTtcbiAgICB0aGlzLmRlc2lyZWRDYXBDb25zdHJhaW50cyA9IGRlc2lyZWRDYXBDb25zdHJhaW50cztcbiAgICB0aGlzLmxvY2F0b3JTdHJhdGVnaWVzID0gW1xuICAgICAgJ3hwYXRoJyxcbiAgICAgICd0YWcgbmFtZScsXG4gICAgICAnbGluayB0ZXh0JyxcbiAgICAgICdwYXJ0aWFsIGxpbmsgdGV4dCcsXG4gICAgICAnY3NzIHNlbGVjdG9yJyxcbiAgICAgIC8vIExldCB0aGVzZSB0d28gcmVhY2ggR2Vja28gRHJpdmVyIGFuZCBmYWlsIHRoZXJlIHdpdGggYSBwcm9wZXIgZXJyb3IgbWVzc2FnZVxuICAgICAgJ2lkJyxcbiAgICAgICduYW1lJyxcbiAgICBdO1xuICAgIHRoaXMucmVzZXRTdGF0ZSgpO1xuXG4gICAgZm9yIChjb25zdCBbY21kLCBmbl0gb2YgXy50b1BhaXJzKGNvbW1hbmRzKSkge1xuICAgICAgR2Vja29Ecml2ZXIucHJvdG90eXBlW2NtZF0gPSBmbjtcbiAgICB9XG4gIH1cblxuICByZXNldFN0YXRlICgpIHtcbiAgICB0aGlzLmdlY2tvID0gbnVsbDtcbiAgICB0aGlzLnByb3h5UmVxUmVzID0gbnVsbDtcbiAgICB0aGlzLmlzUHJveHlBY3RpdmUgPSBmYWxzZTtcbiAgfVxuXG4gIHByb3h5QWN0aXZlICgpIHtcbiAgICByZXR1cm4gdGhpcy5pc1Byb3h5QWN0aXZlO1xuICB9XG5cbiAgZ2V0UHJveHlBdm9pZExpc3QgKCkge1xuICAgIHJldHVybiBOT19QUk9YWTtcbiAgfVxuXG4gIGNhblByb3h5ICgpIHtcbiAgICByZXR1cm4gdHJ1ZTtcbiAgfVxuXG4gIGFzeW5jIGNyZWF0ZVNlc3Npb24gKC4uLmFyZ3MpIHtcbiAgICBjb25zdCBbc2Vzc2lvbklkLCBjYXBzXSA9IGF3YWl0IHN1cGVyLmNyZWF0ZVNlc3Npb24oLi4uYXJncyk7XG4gICAgdGhpcy5nZWNrbyA9IG5ldyBHZWNrb0RyaXZlclNlcnZlcihjYXBzKTtcbiAgICB0cnkge1xuICAgICAgYXdhaXQgdGhpcy5nZWNrby5zdGFydChmb3JtYXRDYXBzRm9yU2VydmVyKGNhcHMpKTtcbiAgICB9IGNhdGNoIChlKSB7XG4gICAgICBhd2FpdCB0aGlzLmRlbGV0ZVNlc3Npb24oKTtcbiAgICAgIHRocm93IGU7XG4gICAgfVxuICAgIHRoaXMucHJveHlSZXFSZXMgPSB0aGlzLmdlY2tvLnByb3h5LnByb3h5UmVxUmVzLmJpbmQodGhpcy5nZWNrby5wcm94eSk7XG4gICAgdGhpcy5pc1Byb3h5QWN0aXZlID0gdHJ1ZTtcbiAgICByZXR1cm4gW3Nlc3Npb25JZCwgY2Fwc107XG4gIH1cblxuICBhc3luYyBkZWxldGVTZXNzaW9uICgpIHtcbiAgICBsb2cuaW5mbygnRW5kaW5nIEdlY2tvIERyaXZlciBzZXNzaW9uJyk7XG4gICAgYXdhaXQgdGhpcy5nZWNrby5zdG9wKCk7XG4gICAgdGhpcy5yZXNldFN0YXRlKCk7XG5cbiAgICBhd2FpdCBzdXBlci5kZWxldGVTZXNzaW9uKCk7XG4gIH1cbn1cblxuZXhwb3J0IGRlZmF1bHQgR2Vja29Ecml2ZXI7XG4iXSwiZmlsZSI6ImxpYi9kcml2ZXIuanMiLCJzb3VyY2VSb290IjoiLi4vLi4ifQ==

package/build/lib/gecko.js

@@ -15,9 +15,9 @@ var _os = _interopRequireDefault(require("os"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _appiumBaseDriver = require("appium-base-driver");
+var _baseDriver = require("@appium/base-driver");
 
-var _appiumSupport = require("appium-support");
+var _support = require("@appium/support");
 
 var _teen_process = require("teen_process");
 
@@ -29,21 +29,30 @@ var _child_process = require("child_process");
 
 var _constants = require("./constants");
 
-const log = _appiumSupport.logger.getLogger('GeckoDriverServer');
+const log = _support.logger.getLogger('GeckoDriverServer');
 
-const GD_BINARY = `geckodriver${_appiumSupport.system.isWindows() ? '.exe' : ''}`;
+const GD_BINARY = `geckodriver${_support.system.isWindows() ? '.exe' : ''}`;
 const STARTUP_TIMEOUT_MS = 10000;
 const GECKO_PORT_RANGE = [5200, 5300];
 
-const GECKO_SERVER_GUARD = _appiumSupport.util.getLockFileGuard(_path.default.resolve(_os.default.tmpdir(), 'gecko_server_guard.lock'), {
+const GECKO_SERVER_GUARD = _support.util.getLockFileGuard(_path.default.resolve(_os.default.tmpdir(), 'gecko_server_guard.lock'), {
   timeout: 5,
   tryRecovery: true
 });
 
-class GeckoProxy extends _appiumBaseDriver.JWProxy {
+const DEFAULT_MARIONETTE_PORT = 2828;
+const PROCESS_SPECIFIC_OPTION_NAMES_MAP = Object.freeze({
+  noReset: 'noReset',
+  verbosity: 'verbosity',
+  androidStorage: 'androidStorage',
+  marionettePort: 'marionettePort',
+  systemPort: 'port'
+});
+
+class GeckoProxy extends _baseDriver.JWProxy {
   async proxyCommand(url, method, body = null) {
     if (this.didProcessExit) {
-      throw new _appiumBaseDriver.errors.InvalidContextError(`'${method} ${url}' cannot be proxied to Gecko Driver server because ` + 'its process is not running (probably crashed). Check the Appium log for more details');
+      throw new _baseDriver.errors.InvalidContextError(`'${method} ${url}' cannot be proxied to Gecko Driver server because ` + 'its process is not running (probably crashed). Check the Appium log for more details');
     }
 
     return await super.proxyCommand(url, method, body);
@@ -53,18 +62,17 @@ class GeckoProxy extends _appiumBaseDriver.JWProxy {
 
 class GeckoDriverProcess {
   constructor(opts = {}) {
-    for (const optName of ['noReset', 'verbosity', 'androidStorage']) {
-      this[optName] = opts[optName];
+    for (const [optName, propName] of _lodash.default.toPairs(PROCESS_SPECIFIC_OPTION_NAMES_MAP)) {
+      this[propName] = opts[optName];
     }
 
-    this.port = opts.systemPort;
     this.proc = null;
   }
 
   get isRunning() {
     var _this$proc;
 
-    return !!((_this$proc = this.proc) === null || _this$proc === void 0 ? void 0 : _this$proc.isRunning);
+    return !!((_this$proc = this.proc) !== null && _this$proc !== void 0 && _this$proc.isRunning);
   }
 
   async init() {
@@ -87,12 +95,12 @@ class GeckoDriverProcess {
     let driverBin;
 
     try {
-      driverBin = await _appiumSupport.fs.which(GD_BINARY);
+      driverBin = await _support.fs.which(GD_BINARY);
     } catch (e) {
       throw new Error(`${GD_BINARY} binary cannot be found in PATH. ` + `Please make sure it is present on your system`);
     }
 
-    const args = ['-p', this.port];
+    const args = [];
 
     switch (_lodash.default.toLower(this.verbosity)) {
       case _constants.VERBOSITY.DEBUG:
@@ -105,11 +113,24 @@ class GeckoDriverProcess {
     }
 
     if (this.noReset) {
+      var _this$marionettePort;
+
       args.push('--connect-existing');
+
+      if (_lodash.default.isNil(this.marionettePort)) {
+        log.info(`'marionettePort' capability value is not provided while 'noReset' is enabled`);
+        log.info(`Assigning 'marionettePort' to the default value (${DEFAULT_MARIONETTE_PORT})`);
+      }
+
+      args.push('--marionette-port', (_this$marionettePort = this.marionettePort) !== null && _this$marionettePort !== void 0 ? _this$marionettePort : DEFAULT_MARIONETTE_PORT);
+    } else if (!_lodash.default.isNil(this.marionettePort)) {
+      args.push('--marionette-port', this.marionettePort);
     }
 
+    args.push('-p', this.port);
+
     if (this.androidStorage) {
-      args.push('–-android-storage', this.androidStorage);
+      args.push('--android-storage', this.androidStorage);
     }
 
     this.proc = new _teen_process.SubProcess(driverBin, args);
@@ -146,7 +167,7 @@ class GeckoDriverProcess {
 const RUNNING_PROCESS_IDS = [];
 process.once('exit', () => {
   for (const pid of RUNNING_PROCESS_IDS) {
-    const command = _appiumSupport.system.isWindows() ? `taskkill.exe /PID ${pid}` : `kill ${pid}`;
+    const command = _support.system.isWindows() ? `taskkill.exe /PID ${pid}` : `kill ${pid}`;
 
     try {
       (0, _child_process.execSync)(command);
@@ -163,7 +184,7 @@ class GeckoDriverServer {
   get isRunning() {
     var _this$process;
 
-    return !!((_this$process = this.process) === null || _this$process === void 0 ? void 0 : _this$process.isRunning);
+    return !!((_this$process = this.process) !== null && _this$process !== void 0 && _this$process.isRunning);
   }
 
   async start(geckoCaps) {
@@ -226,7 +247,7 @@ class GeckoDriverServer {
       return;
     }
 
-    if ((_this$proxy = this.proxy) === null || _this$proxy === void 0 ? void 0 : _this$proxy.sessionId) {
+    if ((_this$proxy = this.proxy) !== null && _this$proxy !== void 0 && _this$proxy.sessionId) {
       try {
         await this.proxy.command(`/session/${this.proxy.sessionId}`, 'DELETE');
       } catch (e) {
@@ -248,4 +269,4 @@ var _default = GeckoDriverServer;
 exports.default = _default;require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/gecko.js"],"names":["log","logger","getLogger","GD_BINARY","system","isWindows","STARTUP_TIMEOUT_MS","GECKO_PORT_RANGE","GECKO_SERVER_GUARD","util","getLockFileGuard","path","resolve","os","tmpdir","timeout","tryRecovery","GeckoProxy","JWProxy","proxyCommand","url","method","body","didProcessExit","errors","InvalidContextError","GeckoDriverProcess","constructor","opts","optName","port","systemPort","proc","isRunning","init","startPort","endPort","e","Error","driverBin","fs","which","args","_","toLower","verbosity","VERBOSITY","DEBUG","push","TRACE","noReset","androidStorage","SubProcess","on","stdout","stderr","line","trim","debug","code","signal","info","JSON","stringify","start","stop","kill","ign","RUNNING_PROCESS_IDS","process","once","pid","command","GeckoDriverServer","caps","proxy","geckoCaps","server","base","keepAlive","err","message","waitMs","intervalMs","test","pull","capabilities","firstMatch","alwaysMatch","sessionId","warn"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport os from 'os';\nimport path from 'path';\nimport { JWProxy, errors } from 'appium-base-driver';\nimport { fs, logger, util, system } from 'appium-support';\nimport { SubProcess } from 'teen_process';\nimport { waitForCondition } from 'asyncbox';\nimport { findAPortNotInUse } from 'portscanner';\nimport { execSync } from 'child_process';\nimport { VERBOSITY } from './constants';\n\nconst log = logger.getLogger('GeckoDriverServer');\n\nconst GD_BINARY = `geckodriver${system.isWindows() ? '.exe' : ''}`;\nconst STARTUP_TIMEOUT_MS = 10000; // 10 seconds\nconst GECKO_PORT_RANGE = [5200, 5300];\nconst GECKO_SERVER_GUARD = util.getLockFileGuard(\n  path.resolve(os.tmpdir(), 'gecko_server_guard.lock'),\n  {timeout: 5, tryRecovery: true}\n);\n\n\nclass GeckoProxy extends JWProxy {\n  async proxyCommand (url, method, body = null) {\n    if (this.didProcessExit) {\n      throw new errors.InvalidContextError(\n        `'${method} ${url}' cannot be proxied to Gecko Driver server because ` +\n        'its process is not running (probably crashed). Check the Appium log for more details');\n    }\n    return await super.proxyCommand(url, method, body);\n  }\n}\n\nclass GeckoDriverProcess {\n  constructor (opts = {}) {\n    for (const optName of ['noReset', 'verbosity', 'androidStorage']) {\n      this[optName] = opts[optName];\n    }\n    this.port = opts.systemPort;\n    this.proc = null;\n  }\n\n  get isRunning () {\n    return !!(this.proc?.isRunning);\n  }\n\n  async init () {\n    if (this.isRunning) {\n      return;\n    }\n\n    if (!this.port) {\n      await GECKO_SERVER_GUARD(async () => {\n        const [startPort, endPort] = GECKO_PORT_RANGE;\n        try {\n          this.port = await findAPortNotInUse(startPort, endPort);\n        } catch (e) {\n          throw new Error(\n            `Cannot find any free port in range ${startPort}..${endPort}. ` +\n            `Double check the processes that are locking ports within this range and terminate ` +\n            `these which are not needed anymore or set any free port number to the 'systemPort' capability`);\n        }\n      });\n    }\n\n    let driverBin;\n    try {\n      driverBin = await fs.which(GD_BINARY);\n    } catch (e) {\n      throw new Error(`${GD_BINARY} binary cannot be found in PATH. ` +\n        `Please make sure it is present on your system`);\n    }\n    const args = [\n      '-p', this.port,\n    ];\n    switch (_.toLower(this.verbosity)) {\n      case VERBOSITY.DEBUG:\n        args.push('-v');\n        break;\n      case VERBOSITY.TRACE:\n        args.push('-vv');\n        break;\n    }\n    if (this.noReset) {\n      args.push('--connect-existing');\n    }\n    if (this.androidStorage) {\n      args.push('–-android-storage', this.androidStorage);\n    }\n    this.proc = new SubProcess(driverBin, args);\n    this.proc.on('output', (stdout, stderr) => {\n      const line = _.trim(stdout || stderr);\n      if (line) {\n        log.debug(`[${GD_BINARY}] ${line}`);\n      }\n    });\n    this.proc.on('exit', (code, signal) => {\n      log.info(`${GD_BINARY} has exited with code ${code}, signal ${signal}`);\n    });\n    log.info(`Starting '${driverBin}' with args ${JSON.stringify(args)}`);\n    await this.proc.start(0);\n  }\n\n  async stop () {\n    if (this.isRunning) {\n      await this.proc.stop('SIGTERM');\n    }\n  }\n\n  async kill () {\n    if (this.isRunning) {\n      try {\n        await this.proc.stop('SIGKILL');\n      } catch (ign) {}\n    }\n  }\n}\n\nconst RUNNING_PROCESS_IDS = [];\nprocess.once('exit', () => {\n  for (const pid of RUNNING_PROCESS_IDS) {\n    const command = system.isWindows() ? `taskkill.exe /PID ${pid}` : `kill ${pid}`;\n    try {\n      execSync(command);\n    } catch (ign) {}\n  }\n});\n\nclass GeckoDriverServer {\n  constructor (caps) {\n    this.process = new GeckoDriverProcess(caps);\n    this.proxy = null;\n  }\n\n  get isRunning () {\n    return !!(this.process?.isRunning);\n  }\n\n  async start (geckoCaps) {\n    await this.process.init();\n\n    this.proxy = new GeckoProxy({\n      server: '127.0.0.1',\n      port: this.process.port,\n      base: '',\n      keepAlive: true,\n    });\n    this.proxy.didProcessExit = false;\n    this.process.proc.on('exit', () => {\n      this.proxy.didProcessExit = true;\n    });\n\n    try {\n      await waitForCondition(async () => {\n        try {\n          await this.proxy.command('/status', 'GET');\n          return true;\n        } catch (err) {\n          if (this.proxy.didProcessExit) {\n            throw new Error(err.message);\n          }\n          return false;\n        }\n      }, {\n        waitMs: STARTUP_TIMEOUT_MS,\n        intervalMs: 1000,\n      });\n    } catch (e) {\n      if (this.process.isRunning) {\n        // avoid \"frozen\" processes,\n        await this.process.kill();\n      }\n      if (/Condition unmet/.test(e.message)) {\n        throw new Error(`Gecko Driver server is not listening within ${STARTUP_TIMEOUT_MS}ms timeout. ` +\n          `Make sure it could be started manually from a terminal`);\n      }\n      throw e;\n    }\n    const pid = this.process.proc.pid;\n    RUNNING_PROCESS_IDS.push(pid);\n    this.process.proc.on('exit', () => void _.pull(RUNNING_PROCESS_IDS, pid));\n\n    await this.proxy.command('/session', 'POST', {\n      capabilities: {\n        firstMatch: [{}],\n        alwaysMatch: geckoCaps,\n      }\n    });\n  }\n\n  async stop () {\n    if (!this.isRunning) {\n      log.info(`Gecko Driver session cannot be stopped, because the server is not running`);\n      return;\n    }\n\n    if (this.proxy?.sessionId) {\n      try {\n        await this.proxy.command(`/session/${this.proxy.sessionId}`, 'DELETE');\n      } catch (e) {\n        log.info(`Gecko Driver session cannot be deleted. Original error: ${e.message}`);\n      }\n    }\n\n    try {\n      await this.process.stop();\n    } catch (e) {\n      log.warn(`Gecko Driver process cannot be stopped (${e.message}). Killing it forcefully`);\n      await this.process.kill();\n    }\n  }\n}\n\nexport default GeckoDriverServer;\n"],"file":"lib/gecko.js","sourceRoot":"../.."}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/gecko.js"],"names":["log","logger","getLogger","GD_BINARY","system","isWindows","STARTUP_TIMEOUT_MS","GECKO_PORT_RANGE","GECKO_SERVER_GUARD","util","getLockFileGuard","path","resolve","os","tmpdir","timeout","tryRecovery","DEFAULT_MARIONETTE_PORT","PROCESS_SPECIFIC_OPTION_NAMES_MAP","Object","freeze","noReset","verbosity","androidStorage","marionettePort","systemPort","GeckoProxy","JWProxy","proxyCommand","url","method","body","didProcessExit","errors","InvalidContextError","GeckoDriverProcess","constructor","opts","optName","propName","_","toPairs","proc","isRunning","init","port","startPort","endPort","e","Error","driverBin","fs","which","args","toLower","VERBOSITY","DEBUG","push","TRACE","isNil","info","SubProcess","on","stdout","stderr","line","trim","debug","code","signal","JSON","stringify","start","stop","kill","ign","RUNNING_PROCESS_IDS","process","once","pid","command","GeckoDriverServer","caps","proxy","geckoCaps","server","base","keepAlive","err","message","waitMs","intervalMs","test","pull","capabilities","firstMatch","alwaysMatch","sessionId","warn"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport os from 'os';\nimport path from 'path';\nimport { JWProxy, errors } from '@appium/base-driver';\nimport { fs, logger, util, system } from '@appium/support';\nimport { SubProcess } from 'teen_process';\nimport { waitForCondition } from 'asyncbox';\nimport { findAPortNotInUse } from 'portscanner';\nimport { execSync } from 'child_process';\nimport { VERBOSITY } from './constants';\n\nconst log = logger.getLogger('GeckoDriverServer');\n\nconst GD_BINARY = `geckodriver${system.isWindows() ? '.exe' : ''}`;\nconst STARTUP_TIMEOUT_MS = 10000; // 10 seconds\nconst GECKO_PORT_RANGE = [5200, 5300];\nconst GECKO_SERVER_GUARD = util.getLockFileGuard(\n  path.resolve(os.tmpdir(), 'gecko_server_guard.lock'),\n  {timeout: 5, tryRecovery: true}\n);\nconst DEFAULT_MARIONETTE_PORT = 2828;\nconst PROCESS_SPECIFIC_OPTION_NAMES_MAP = Object.freeze({\n  noReset: 'noReset',\n  verbosity: 'verbosity',\n  androidStorage: 'androidStorage',\n  marionettePort: 'marionettePort',\n  systemPort: 'port',\n});\n\n\nclass GeckoProxy extends JWProxy {\n  async proxyCommand (url, method, body = null) {\n    if (this.didProcessExit) {\n      throw new errors.InvalidContextError(\n        `'${method} ${url}' cannot be proxied to Gecko Driver server because ` +\n        'its process is not running (probably crashed). Check the Appium log for more details');\n    }\n    return await super.proxyCommand(url, method, body);\n  }\n}\n\nclass GeckoDriverProcess {\n  constructor (opts = {}) {\n    for (const [optName, propName] of _.toPairs(PROCESS_SPECIFIC_OPTION_NAMES_MAP)) {\n      this[propName] = opts[optName];\n    }\n    this.proc = null;\n  }\n\n  get isRunning () {\n    return !!(this.proc?.isRunning);\n  }\n\n  async init () {\n    if (this.isRunning) {\n      return;\n    }\n\n    if (!this.port) {\n      await GECKO_SERVER_GUARD(async () => {\n        const [startPort, endPort] = GECKO_PORT_RANGE;\n        try {\n          this.port = await findAPortNotInUse(startPort, endPort);\n        } catch (e) {\n          throw new Error(\n            `Cannot find any free port in range ${startPort}..${endPort}. ` +\n            `Double check the processes that are locking ports within this range and terminate ` +\n            `these which are not needed anymore or set any free port number to the 'systemPort' capability`);\n        }\n      });\n    }\n\n    let driverBin;\n    try {\n      driverBin = await fs.which(GD_BINARY);\n    } catch (e) {\n      throw new Error(`${GD_BINARY} binary cannot be found in PATH. ` +\n        `Please make sure it is present on your system`);\n    }\n    const args = [];\n    /* #region Options */\n    switch (_.toLower(this.verbosity)) {\n      case VERBOSITY.DEBUG:\n        args.push('-v');\n        break;\n      case VERBOSITY.TRACE:\n        args.push('-vv');\n        break;\n    }\n    if (this.noReset) {\n      args.push('--connect-existing');\n      // https://firefox-source-docs.mozilla.org/testing/geckodriver/Flags.html#code-connect-existing-code\n      if (_.isNil(this.marionettePort)) {\n        log.info(`'marionettePort' capability value is not provided while 'noReset' is enabled`);\n        log.info(`Assigning 'marionettePort' to the default value (${DEFAULT_MARIONETTE_PORT})`);\n      }\n      args.push('--marionette-port', this.marionettePort ?? DEFAULT_MARIONETTE_PORT);\n    } else if (!_.isNil(this.marionettePort)) {\n      args.push('--marionette-port', this.marionettePort);\n    }\n    /* #endregion */\n\n    args.push('-p', this.port);\n    if (this.androidStorage) {\n      args.push('--android-storage', this.androidStorage);\n    }\n    this.proc = new SubProcess(driverBin, args);\n    this.proc.on('output', (stdout, stderr) => {\n      const line = _.trim(stdout || stderr);\n      if (line) {\n        log.debug(`[${GD_BINARY}] ${line}`);\n      }\n    });\n    this.proc.on('exit', (code, signal) => {\n      log.info(`${GD_BINARY} has exited with code ${code}, signal ${signal}`);\n    });\n    log.info(`Starting '${driverBin}' with args ${JSON.stringify(args)}`);\n    await this.proc.start(0);\n  }\n\n  async stop () {\n    if (this.isRunning) {\n      await this.proc.stop('SIGTERM');\n    }\n  }\n\n  async kill () {\n    if (this.isRunning) {\n      try {\n        await this.proc.stop('SIGKILL');\n      } catch (ign) {}\n    }\n  }\n}\n\nconst RUNNING_PROCESS_IDS = [];\nprocess.once('exit', () => {\n  for (const pid of RUNNING_PROCESS_IDS) {\n    const command = system.isWindows() ? `taskkill.exe /PID ${pid}` : `kill ${pid}`;\n    try {\n      execSync(command);\n    } catch (ign) {}\n  }\n});\n\nclass GeckoDriverServer {\n  constructor (caps) {\n    this.process = new GeckoDriverProcess(caps);\n    this.proxy = null;\n  }\n\n  get isRunning () {\n    return !!(this.process?.isRunning);\n  }\n\n  async start (geckoCaps) {\n    await this.process.init();\n\n    this.proxy = new GeckoProxy({\n      server: '127.0.0.1',\n      port: this.process.port,\n      base: '',\n      keepAlive: true,\n    });\n    this.proxy.didProcessExit = false;\n    this.process.proc.on('exit', () => {\n      this.proxy.didProcessExit = true;\n    });\n\n    try {\n      await waitForCondition(async () => {\n        try {\n          await this.proxy.command('/status', 'GET');\n          return true;\n        } catch (err) {\n          if (this.proxy.didProcessExit) {\n            throw new Error(err.message);\n          }\n          return false;\n        }\n      }, {\n        waitMs: STARTUP_TIMEOUT_MS,\n        intervalMs: 1000,\n      });\n    } catch (e) {\n      if (this.process.isRunning) {\n        // avoid \"frozen\" processes,\n        await this.process.kill();\n      }\n      if (/Condition unmet/.test(e.message)) {\n        throw new Error(`Gecko Driver server is not listening within ${STARTUP_TIMEOUT_MS}ms timeout. ` +\n          `Make sure it could be started manually from a terminal`);\n      }\n      throw e;\n    }\n    const pid = this.process.proc.pid;\n    RUNNING_PROCESS_IDS.push(pid);\n    this.process.proc.on('exit', () => void _.pull(RUNNING_PROCESS_IDS, pid));\n\n    await this.proxy.command('/session', 'POST', {\n      capabilities: {\n        firstMatch: [{}],\n        alwaysMatch: geckoCaps,\n      }\n    });\n  }\n\n  async stop () {\n    if (!this.isRunning) {\n      log.info(`Gecko Driver session cannot be stopped, because the server is not running`);\n      return;\n    }\n\n    if (this.proxy?.sessionId) {\n      try {\n        await this.proxy.command(`/session/${this.proxy.sessionId}`, 'DELETE');\n      } catch (e) {\n        log.info(`Gecko Driver session cannot be deleted. Original error: ${e.message}`);\n      }\n    }\n\n    try {\n      await this.process.stop();\n    } catch (e) {\n      log.warn(`Gecko Driver process cannot be stopped (${e.message}). Killing it forcefully`);\n      await this.process.kill();\n    }\n  }\n}\n\nexport default GeckoDriverServer;\n"],"file":"lib/gecko.js","sourceRoot":"../.."}

package/build/lib/logger.js

@@ -7,12 +7,12 @@ exports.default = void 0;
 
 require("source-map-support/register");
 
-var _appiumSupport = require("appium-support");
+var _support = require("@appium/support");
 
-const log = _appiumSupport.logger.getLogger('GeckoDriver');
+const log = _support.logger.getLogger('GeckoDriver');
 
 var _default = log;
 exports.default = _default;require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9sb2dnZXIuanMiXSwibmFtZXMiOlsibG9nIiwibG9nZ2VyIiwiZ2V0TG9nZ2VyIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQTs7QUFFQSxNQUFNQSxHQUFHLEdBQUdDLHNCQUFPQyxTQUFQLENBQWlCLGFBQWpCLENBQVo7O2VBRWVGLEciLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBsb2dnZXIgfSBmcm9tICdhcHBpdW0tc3VwcG9ydCc7XG5cbmNvbnN0IGxvZyA9IGxvZ2dlci5nZXRMb2dnZXIoJ0dlY2tvRHJpdmVyJyk7XG5cbmV4cG9ydCBkZWZhdWx0IGxvZztcbiJdLCJmaWxlIjoibGliL2xvZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIuLi8uLiJ9
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9sb2dnZXIuanMiXSwibmFtZXMiOlsibG9nIiwibG9nZ2VyIiwiZ2V0TG9nZ2VyIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQTs7QUFFQSxNQUFNQSxHQUFHLEdBQUdDLGdCQUFPQyxTQUFQLENBQWlCLGFBQWpCLENBQVo7O2VBRWVGLEciLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBsb2dnZXIgfSBmcm9tICdAYXBwaXVtL3N1cHBvcnQnO1xuXG5jb25zdCBsb2cgPSBsb2dnZXIuZ2V0TG9nZ2VyKCdHZWNrb0RyaXZlcicpO1xuXG5leHBvcnQgZGVmYXVsdCBsb2c7XG4iXSwiZmlsZSI6ImxpYi9sb2dnZXIuanMiLCJzb3VyY2VSb290IjoiLi4vLi4ifQ==

package/build/lib/server.js

@@ -11,7 +11,7 @@ require("source-map-support/register");
 
 var _logger = _interopRequireDefault(require("./logger"));
 
-var _appiumBaseDriver = require("appium-base-driver");
+var _baseDriver = require("@appium/base-driver");
 
 var _driver = _interopRequireDefault(require("./driver"));
 
@@ -20,8 +20,8 @@ async function startServer(port, address) {
     port,
     address
   });
-  let routeConfiguringFunction = (0, _appiumBaseDriver.routeConfiguringFunction)(d);
-  let server = await (0, _appiumBaseDriver.server)({
+  let routeConfiguringFunction = (0, _baseDriver.routeConfiguringFunction)(d);
+  let server = await (0, _baseDriver.server)({
     routeConfiguringFunction,
     port,
     hostname: address
@@ -33,4 +33,4 @@ async function startServer(port, address) {
 }require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9zZXJ2ZXIuanMiXSwibmFtZXMiOlsic3RhcnRTZXJ2ZXIiLCJwb3J0IiwiYWRkcmVzcyIsImQiLCJHZWNrb0RyaXZlciIsInJvdXRlQ29uZmlndXJpbmdGdW5jdGlvbiIsInNlcnZlciIsImhvc3RuYW1lIiwibG9nIiwiaW5mbyJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7QUFFQSxlQUFlQSxXQUFmLENBQTRCQyxJQUE1QixFQUFrQ0MsT0FBbEMsRUFBMkM7QUFDekMsTUFBSUMsQ0FBQyxHQUFHLElBQUlDLGVBQUosQ0FBZ0I7QUFBQ0gsSUFBQUEsSUFBRDtBQUFPQyxJQUFBQTtBQUFQLEdBQWhCLENBQVI7QUFDQSxNQUFJRyx3QkFBd0IsR0FBRyxnREFBV0YsQ0FBWCxDQUEvQjtBQUNBLE1BQUlHLE1BQU0sR0FBRyxNQUFNLDhCQUFXO0FBQUNELElBQUFBLHdCQUFEO0FBQTJCSixJQUFBQSxJQUEzQjtBQUFpQ00sSUFBQUEsUUFBUSxFQUFFTDtBQUEzQyxHQUFYLENBQW5COztBQUNBTSxrQkFBSUMsSUFBSixDQUFVLDJDQUEwQ1AsT0FBUSxJQUFHRCxJQUFLLEVBQXBFOztBQUNBLFNBQU9LLE1BQVA7QUFDRCIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBsb2cgZnJvbSAnLi9sb2dnZXInO1xuaW1wb3J0IHsgc2VydmVyIGFzIGJhc2VTZXJ2ZXIsIHJvdXRlQ29uZmlndXJpbmdGdW5jdGlvbiBhcyBtYWtlUm91dGVyIH0gZnJvbSAnYXBwaXVtLWJhc2UtZHJpdmVyJztcbmltcG9ydCBHZWNrb0RyaXZlciBmcm9tICcuL2RyaXZlcic7XG5cbmFzeW5jIGZ1bmN0aW9uIHN0YXJ0U2VydmVyIChwb3J0LCBhZGRyZXNzKSB7XG4gIGxldCBkID0gbmV3IEdlY2tvRHJpdmVyKHtwb3J0LCBhZGRyZXNzfSk7XG4gIGxldCByb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24gPSBtYWtlUm91dGVyKGQpO1xuICBsZXQgc2VydmVyID0gYXdhaXQgYmFzZVNlcnZlcih7cm91dGVDb25maWd1cmluZ0Z1bmN0aW9uLCBwb3J0LCBob3N0bmFtZTogYWRkcmVzc30pO1xuICBsb2cuaW5mbyhgR2Vja28gRHJpdmVyIHNlcnZlciBsaXN0ZW5pbmcgb24gaHR0cDovLyR7YWRkcmVzc306JHtwb3J0fWApO1xuICByZXR1cm4gc2VydmVyO1xufVxuXG5leHBvcnQgeyBzdGFydFNlcnZlciB9O1xuIl0sImZpbGUiOiJsaWIvc2VydmVyLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uIn0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9zZXJ2ZXIuanMiXSwibmFtZXMiOlsic3RhcnRTZXJ2ZXIiLCJwb3J0IiwiYWRkcmVzcyIsImQiLCJHZWNrb0RyaXZlciIsInJvdXRlQ29uZmlndXJpbmdGdW5jdGlvbiIsInNlcnZlciIsImhvc3RuYW1lIiwibG9nIiwiaW5mbyJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFHQTs7QUFFQSxlQUFlQSxXQUFmLENBQTRCQyxJQUE1QixFQUFrQ0MsT0FBbEMsRUFBMkM7QUFDekMsTUFBSUMsQ0FBQyxHQUFHLElBQUlDLGVBQUosQ0FBZ0I7QUFBQ0gsSUFBQUEsSUFBRDtBQUFPQyxJQUFBQTtBQUFQLEdBQWhCLENBQVI7QUFDQSxNQUFJRyx3QkFBd0IsR0FBRywwQ0FBV0YsQ0FBWCxDQUEvQjtBQUNBLE1BQUlHLE1BQU0sR0FBRyxNQUFNLHdCQUFXO0FBQUNELElBQUFBLHdCQUFEO0FBQTJCSixJQUFBQSxJQUEzQjtBQUFpQ00sSUFBQUEsUUFBUSxFQUFFTDtBQUEzQyxHQUFYLENBQW5COztBQUNBTSxrQkFBSUMsSUFBSixDQUFVLDJDQUEwQ1AsT0FBUSxJQUFHRCxJQUFLLEVBQXBFOztBQUNBLFNBQU9LLE1BQVA7QUFDRCIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBsb2cgZnJvbSAnLi9sb2dnZXInO1xuaW1wb3J0IHtcbiAgc2VydmVyIGFzIGJhc2VTZXJ2ZXIsIHJvdXRlQ29uZmlndXJpbmdGdW5jdGlvbiBhcyBtYWtlUm91dGVyXG59IGZyb20gJ0BhcHBpdW0vYmFzZS1kcml2ZXInO1xuaW1wb3J0IEdlY2tvRHJpdmVyIGZyb20gJy4vZHJpdmVyJztcblxuYXN5bmMgZnVuY3Rpb24gc3RhcnRTZXJ2ZXIgKHBvcnQsIGFkZHJlc3MpIHtcbiAgbGV0IGQgPSBuZXcgR2Vja29Ecml2ZXIoe3BvcnQsIGFkZHJlc3N9KTtcbiAgbGV0IHJvdXRlQ29uZmlndXJpbmdGdW5jdGlvbiA9IG1ha2VSb3V0ZXIoZCk7XG4gIGxldCBzZXJ2ZXIgPSBhd2FpdCBiYXNlU2VydmVyKHtyb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24sIHBvcnQsIGhvc3RuYW1lOiBhZGRyZXNzfSk7XG4gIGxvZy5pbmZvKGBHZWNrbyBEcml2ZXIgc2VydmVyIGxpc3RlbmluZyBvbiBodHRwOi8vJHthZGRyZXNzfToke3BvcnR9YCk7XG4gIHJldHVybiBzZXJ2ZXI7XG59XG5cbmV4cG9ydCB7IHN0YXJ0U2VydmVyIH07XG4iXSwiZmlsZSI6ImxpYi9zZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiLi4vLi4ifQ==

package/build/lib/utils.js

@@ -27,8 +27,12 @@ function formatCapsForServer(caps) {
     }
   }
 
+  if (result.platformName) {
+    result.platformName = _lodash.default.toLower(result.platformName);
+  }
+
   return result;
 }require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy5qcyJdLCJuYW1lcyI6WyJHRUNLT19DQVBfUFJFRklYRVMiLCJTVEFOREFSRF9DQVBTIiwiZm9ybWF0Q2Fwc0ZvclNlcnZlciIsImNhcHMiLCJyZXN1bHQiLCJicm93c2VyTmFtZSIsIm5hbWUiLCJ2YWx1ZSIsIl8iLCJ0b1BhaXJzIiwic29tZSIsInByZWZpeCIsInN0YXJ0c1dpdGgiLCJpbmNsdWRlcyJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQTs7QUFFQSxNQUFNQSxrQkFBa0IsR0FBRyxDQUFDLE1BQUQsQ0FBM0I7QUFFQSxNQUFNQyxhQUFhLEdBQUcsQ0FDcEIsZ0JBRG9CLEVBRXBCLGNBRm9CLEVBR3BCLHFCQUhvQixFQUlwQixrQkFKb0IsRUFLcEIsT0FMb0IsRUFNcEIsZUFOb0IsRUFPcEIsVUFQb0IsRUFRcEIseUJBUm9CLENBQXRCOztBQVdBLFNBQVNDLG1CQUFULENBQThCQyxJQUE5QixFQUFvQztBQUNsQyxRQUFNQyxNQUFNLEdBQUcsRUFBZjs7QUFDQSxNQUFJRCxJQUFJLENBQUNFLFdBQVQsRUFBc0I7QUFDcEJELElBQUFBLE1BQU0sQ0FBQ0MsV0FBUCxHQUFxQixTQUFyQjtBQUNEOztBQUNELE9BQUssTUFBTSxDQUFDQyxJQUFELEVBQU9DLEtBQVAsQ0FBWCxJQUE0QkMsZ0JBQUVDLE9BQUYsQ0FBVU4sSUFBVixDQUE1QixFQUE2QztBQUMzQyxRQUFJSCxrQkFBa0IsQ0FBQ1UsSUFBbkIsQ0FBeUJDLE1BQUQsSUFBWUwsSUFBSSxDQUFDTSxVQUFMLENBQWdCRCxNQUFoQixDQUFwQyxLQUFnRVYsYUFBYSxDQUFDWSxRQUFkLENBQXVCUCxJQUF2QixDQUFwRSxFQUFrRztBQUNoR0YsTUFBQUEsTUFBTSxDQUFDRSxJQUFELENBQU4sR0FBZUMsS0FBZjtBQUNEO0FBQ0Y7O0FBQ0QsU0FBT0gsTUFBUDtBQUNEIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IF8gZnJvbSAnbG9kYXNoJztcblxuY29uc3QgR0VDS09fQ0FQX1BSRUZJWEVTID0gWydtb3o6J107XG4vLyBodHRwczovL3d3dy53My5vcmcvVFIvd2ViZHJpdmVyLyNjYXBhYmlsaXRpZXNcbmNvbnN0IFNUQU5EQVJEX0NBUFMgPSBbXG4gICdicm93c2VyVmVyc2lvbicsXG4gICdwbGF0Zm9ybU5hbWUnLFxuICAnYWNjZXB0SW5zZWN1cmVDZXJ0cycsXG4gICdwYWdlTG9hZFN0cmF0ZWd5JyxcbiAgJ3Byb3h5JyxcbiAgJ3NldFdpbmRvd1JlY3QnLFxuICAndGltZW91dHMnLFxuICAndW5oYW5kbGVkUHJvbXB0QmVoYXZpb3InLFxuXTtcblxuZnVuY3Rpb24gZm9ybWF0Q2Fwc0ZvclNlcnZlciAoY2Fwcykge1xuICBjb25zdCByZXN1bHQgPSB7fTtcbiAgaWYgKGNhcHMuYnJvd3Nlck5hbWUpIHtcbiAgICByZXN1bHQuYnJvd3Nlck5hbWUgPSAnZmlyZWZveCc7XG4gIH1cbiAgZm9yIChjb25zdCBbbmFtZSwgdmFsdWVdIG9mIF8udG9QYWlycyhjYXBzKSkge1xuICAgIGlmIChHRUNLT19DQVBfUFJFRklYRVMuc29tZSgocHJlZml4KSA9PiBuYW1lLnN0YXJ0c1dpdGgocHJlZml4KSkgfHwgU1RBTkRBUkRfQ0FQUy5pbmNsdWRlcyhuYW1lKSkge1xuICAgICAgcmVzdWx0W25hbWVdID0gdmFsdWU7XG4gICAgfVxuICB9XG4gIHJldHVybiByZXN1bHQ7XG59XG5cbmV4cG9ydCB7IGZvcm1hdENhcHNGb3JTZXJ2ZXIgfTtcbiJdLCJmaWxlIjoibGliL3V0aWxzLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uIn0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy5qcyJdLCJuYW1lcyI6WyJHRUNLT19DQVBfUFJFRklYRVMiLCJTVEFOREFSRF9DQVBTIiwiZm9ybWF0Q2Fwc0ZvclNlcnZlciIsImNhcHMiLCJyZXN1bHQiLCJicm93c2VyTmFtZSIsIm5hbWUiLCJ2YWx1ZSIsIl8iLCJ0b1BhaXJzIiwic29tZSIsInByZWZpeCIsInN0YXJ0c1dpdGgiLCJpbmNsdWRlcyIsInBsYXRmb3JtTmFtZSIsInRvTG93ZXIiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUE7O0FBRUEsTUFBTUEsa0JBQWtCLEdBQUcsQ0FBQyxNQUFELENBQTNCO0FBRUEsTUFBTUMsYUFBYSxHQUFHLENBQ3BCLGdCQURvQixFQUVwQixjQUZvQixFQUdwQixxQkFIb0IsRUFJcEIsa0JBSm9CLEVBS3BCLE9BTG9CLEVBTXBCLGVBTm9CLEVBT3BCLFVBUG9CLEVBUXBCLHlCQVJvQixDQUF0Qjs7QUFXQSxTQUFTQyxtQkFBVCxDQUE4QkMsSUFBOUIsRUFBb0M7QUFDbEMsUUFBTUMsTUFBTSxHQUFHLEVBQWY7O0FBQ0EsTUFBSUQsSUFBSSxDQUFDRSxXQUFULEVBQXNCO0FBQ3BCRCxJQUFBQSxNQUFNLENBQUNDLFdBQVAsR0FBcUIsU0FBckI7QUFDRDs7QUFDRCxPQUFLLE1BQU0sQ0FBQ0MsSUFBRCxFQUFPQyxLQUFQLENBQVgsSUFBNEJDLGdCQUFFQyxPQUFGLENBQVVOLElBQVYsQ0FBNUIsRUFBNkM7QUFDM0MsUUFBSUgsa0JBQWtCLENBQUNVLElBQW5CLENBQXlCQyxNQUFELElBQVlMLElBQUksQ0FBQ00sVUFBTCxDQUFnQkQsTUFBaEIsQ0FBcEMsS0FBZ0VWLGFBQWEsQ0FBQ1ksUUFBZCxDQUF1QlAsSUFBdkIsQ0FBcEUsRUFBa0c7QUFDaEdGLE1BQUFBLE1BQU0sQ0FBQ0UsSUFBRCxDQUFOLEdBQWVDLEtBQWY7QUFDRDtBQUNGOztBQUNELE1BQUlILE1BQU0sQ0FBQ1UsWUFBWCxFQUF5QjtBQUV2QlYsSUFBQUEsTUFBTSxDQUFDVSxZQUFQLEdBQXNCTixnQkFBRU8sT0FBRixDQUFVWCxNQUFNLENBQUNVLFlBQWpCLENBQXRCO0FBQ0Q7O0FBQ0QsU0FBT1YsTUFBUDtBQUNEIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IF8gZnJvbSAnbG9kYXNoJztcblxuY29uc3QgR0VDS09fQ0FQX1BSRUZJWEVTID0gWydtb3o6J107XG4vLyBodHRwczovL3d3dy53My5vcmcvVFIvd2ViZHJpdmVyLyNjYXBhYmlsaXRpZXNcbmNvbnN0IFNUQU5EQVJEX0NBUFMgPSBbXG4gICdicm93c2VyVmVyc2lvbicsXG4gICdwbGF0Zm9ybU5hbWUnLFxuICAnYWNjZXB0SW5zZWN1cmVDZXJ0cycsXG4gICdwYWdlTG9hZFN0cmF0ZWd5JyxcbiAgJ3Byb3h5JyxcbiAgJ3NldFdpbmRvd1JlY3QnLFxuICAndGltZW91dHMnLFxuICAndW5oYW5kbGVkUHJvbXB0QmVoYXZpb3InLFxuXTtcblxuZnVuY3Rpb24gZm9ybWF0Q2Fwc0ZvclNlcnZlciAoY2Fwcykge1xuICBjb25zdCByZXN1bHQgPSB7fTtcbiAgaWYgKGNhcHMuYnJvd3Nlck5hbWUpIHtcbiAgICByZXN1bHQuYnJvd3Nlck5hbWUgPSAnZmlyZWZveCc7XG4gIH1cbiAgZm9yIChjb25zdCBbbmFtZSwgdmFsdWVdIG9mIF8udG9QYWlycyhjYXBzKSkge1xuICAgIGlmIChHRUNLT19DQVBfUFJFRklYRVMuc29tZSgocHJlZml4KSA9PiBuYW1lLnN0YXJ0c1dpdGgocHJlZml4KSkgfHwgU1RBTkRBUkRfQ0FQUy5pbmNsdWRlcyhuYW1lKSkge1xuICAgICAgcmVzdWx0W25hbWVdID0gdmFsdWU7XG4gICAgfVxuICB9XG4gIGlmIChyZXN1bHQucGxhdGZvcm1OYW1lKSB7XG4gICAgLy8gR2Vja29kcml2ZXIgb25seSBzdXBwb3J0cyBsb3dlcmNhc2UgcGxhdGZvcm0gbmFtZXNcbiAgICByZXN1bHQucGxhdGZvcm1OYW1lID0gXy50b0xvd2VyKHJlc3VsdC5wbGF0Zm9ybU5hbWUpO1xuICB9XG4gIHJldHVybiByZXN1bHQ7XG59XG5cbmV4cG9ydCB7IGZvcm1hdENhcHNGb3JTZXJ2ZXIgfTtcbiJdLCJmaWxlIjoibGliL3V0aWxzLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uIn0=

package/build/test/functional/desktop-driver-e2e-specs.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 require("source-map-support/register");
 
-var _wd = _interopRequireDefault(require("wd"));
+var _webdriverio = require("webdriverio");
 
 var _ = require("../..");
 
@@ -36,21 +36,24 @@ describe('Desktop Gecko Driver', function () {
     }
   });
   beforeEach(async function () {
-    driver = _wd.default.promiseChainRemote(_utils.HOST, _utils.PORT);
-    await driver.init(CAPS);
+    driver = await (0, _webdriverio.remote)({
+      hostname: _utils.HOST,
+      port: _utils.PORT,
+      capabilities: CAPS
+    });
   });
   afterEach(async function () {
     if (driver) {
-      await driver.quit();
+      await driver.deleteSession();
       driver = null;
     }
   });
   it('should start and stop a session', async function () {
-    await driver.get('https://appium.io/');
-    const button = await driver.elementByCss('#downloadLink');
-    await button.text().should.eventually.eql('Download Appium');
+    await driver.url('https://appium.io/');
+    const button = await driver.$('#downloadLink');
+    await button.getText().should.eventually.eql('Download Appium');
   });
 });require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvZnVuY3Rpb25hbC9kZXNrdG9wLWRyaXZlci1lMmUtc3BlY3MuanMiXSwibmFtZXMiOlsiY2hhaSIsInNob3VsZCIsInVzZSIsImNoYWlBc1Byb21pc2VkIiwiQ0FQUyIsImJyb3dzZXJOYW1lIiwicGxhdGZvcm1OYW1lIiwiZGVzY3JpYmUiLCJ0aW1lb3V0IiwiTU9DSEFfVElNRU9VVCIsInNlcnZlciIsImRyaXZlciIsImJlZm9yZSIsIlBPUlQiLCJIT1NUIiwiYWZ0ZXIiLCJjbG9zZSIsImJlZm9yZUVhY2giLCJ3ZCIsInByb21pc2VDaGFpblJlbW90ZSIsImluaXQiLCJhZnRlckVhY2giLCJxdWl0IiwiaXQiLCJnZXQiLCJidXR0b24iLCJlbGVtZW50QnlDc3MiLCJ0ZXh0IiwiZXZlbnR1YWxseSIsImVxbCJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUE7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBRUFBLGNBQUtDLE1BQUw7O0FBQ0FELGNBQUtFLEdBQUwsQ0FBU0MsdUJBQVQ7O0FBRUEsTUFBTUMsSUFBSSxHQUFHO0FBQ1hDLEVBQUFBLFdBQVcsRUFBRSxnQkFERjtBQUVYQyxFQUFBQSxZQUFZLEVBQUU7QUFGSCxDQUFiO0FBS0FDLFFBQVEsQ0FBQyxzQkFBRCxFQUF5QixZQUFZO0FBQzNDLE9BQUtDLE9BQUwsQ0FBYUMsb0JBQWI7QUFFQSxNQUFJQyxNQUFKO0FBQ0EsTUFBSUMsTUFBSjtBQUNBQyxFQUFBQSxNQUFNLENBQUMsa0JBQWtCO0FBQ3ZCRixJQUFBQSxNQUFNLEdBQUcsTUFBTSxtQkFBWUcsV0FBWixFQUFrQkMsV0FBbEIsQ0FBZjtBQUNELEdBRkssQ0FBTjtBQUdBQyxFQUFBQSxLQUFLLENBQUMsa0JBQWtCO0FBQ3RCLFFBQUlMLE1BQUosRUFBWTtBQUNWLFlBQU1BLE1BQU0sQ0FBQ00sS0FBUCxFQUFOO0FBQ0FOLE1BQUFBLE1BQU0sR0FBRyxJQUFUO0FBQ0Q7QUFDRixHQUxJLENBQUw7QUFNQU8sRUFBQUEsVUFBVSxDQUFDLGtCQUFrQjtBQUMzQk4sSUFBQUEsTUFBTSxHQUFHTyxZQUFHQyxrQkFBSCxDQUFzQkwsV0FBdEIsRUFBNEJELFdBQTVCLENBQVQ7QUFDQSxVQUFNRixNQUFNLENBQUNTLElBQVAsQ0FBWWhCLElBQVosQ0FBTjtBQUNELEdBSFMsQ0FBVjtBQUlBaUIsRUFBQUEsU0FBUyxDQUFDLGtCQUFrQjtBQUMxQixRQUFJVixNQUFKLEVBQVk7QUFDVixZQUFNQSxNQUFNLENBQUNXLElBQVAsRUFBTjtBQUNBWCxNQUFBQSxNQUFNLEdBQUcsSUFBVDtBQUNEO0FBQ0YsR0FMUSxDQUFUO0FBT0FZLEVBQUFBLEVBQUUsQ0FBQyxpQ0FBRCxFQUFvQyxrQkFBa0I7QUFDdEQsVUFBTVosTUFBTSxDQUFDYSxHQUFQLENBQVcsb0JBQVgsQ0FBTjtBQUNBLFVBQU1DLE1BQU0sR0FBRyxNQUFNZCxNQUFNLENBQUNlLFlBQVAsQ0FBb0IsZUFBcEIsQ0FBckI7QUFDQSxVQUFNRCxNQUFNLENBQUNFLElBQVAsR0FBYzFCLE1BQWQsQ0FBcUIyQixVQUFyQixDQUFnQ0MsR0FBaEMsQ0FBb0MsaUJBQXBDLENBQU47QUFDRCxHQUpDLENBQUY7QUFLRCxDQTlCTyxDQUFSIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHdkIGZyb20gJ3dkJztcbmltcG9ydCB7IHN0YXJ0U2VydmVyIH0gZnJvbSAnLi4vLi4nO1xuaW1wb3J0IGNoYWlBc1Byb21pc2VkIGZyb20gJ2NoYWktYXMtcHJvbWlzZWQnO1xuaW1wb3J0IGNoYWkgZnJvbSAnY2hhaSc7XG5pbXBvcnQgeyBIT1NULCBQT1JULCBNT0NIQV9USU1FT1VUIH0gZnJvbSAnLi4vdXRpbHMnO1xuXG5jaGFpLnNob3VsZCgpO1xuY2hhaS51c2UoY2hhaUFzUHJvbWlzZWQpO1xuXG5jb25zdCBDQVBTID0ge1xuICBicm93c2VyTmFtZTogJ01vemlsbGFGaXJlZm94JyxcbiAgcGxhdGZvcm1OYW1lOiAnbGludXgnLFxufTtcblxuZGVzY3JpYmUoJ0Rlc2t0b3AgR2Vja28gRHJpdmVyJywgZnVuY3Rpb24gKCkge1xuICB0aGlzLnRpbWVvdXQoTU9DSEFfVElNRU9VVCk7XG5cbiAgbGV0IHNlcnZlcjtcbiAgbGV0IGRyaXZlcjtcbiAgYmVmb3JlKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBzZXJ2ZXIgPSBhd2FpdCBzdGFydFNlcnZlcihQT1JULCBIT1NUKTtcbiAgfSk7XG4gIGFmdGVyKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBpZiAoc2VydmVyKSB7XG4gICAgICBhd2FpdCBzZXJ2ZXIuY2xvc2UoKTtcbiAgICAgIHNlcnZlciA9IG51bGw7XG4gICAgfVxuICB9KTtcbiAgYmVmb3JlRWFjaChhc3luYyBmdW5jdGlvbiAoKSB7XG4gICAgZHJpdmVyID0gd2QucHJvbWlzZUNoYWluUmVtb3RlKEhPU1QsIFBPUlQpO1xuICAgIGF3YWl0IGRyaXZlci5pbml0KENBUFMpO1xuICB9KTtcbiAgYWZ0ZXJFYWNoKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBpZiAoZHJpdmVyKSB7XG4gICAgICBhd2FpdCBkcml2ZXIucXVpdCgpO1xuICAgICAgZHJpdmVyID0gbnVsbDtcbiAgICB9XG4gIH0pO1xuXG4gIGl0KCdzaG91bGQgc3RhcnQgYW5kIHN0b3AgYSBzZXNzaW9uJywgYXN5bmMgZnVuY3Rpb24gKCkge1xuICAgIGF3YWl0IGRyaXZlci5nZXQoJ2h0dHBzOi8vYXBwaXVtLmlvLycpO1xuICAgIGNvbnN0IGJ1dHRvbiA9IGF3YWl0IGRyaXZlci5lbGVtZW50QnlDc3MoJyNkb3dubG9hZExpbmsnKTtcbiAgICBhd2FpdCBidXR0b24udGV4dCgpLnNob3VsZC5ldmVudHVhbGx5LmVxbCgnRG93bmxvYWQgQXBwaXVtJyk7XG4gIH0pO1xufSk7XG5cblxuIl0sImZpbGUiOiJ0ZXN0L2Z1bmN0aW9uYWwvZGVza3RvcC1kcml2ZXItZTJlLXNwZWNzLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uLy4uIn0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvZnVuY3Rpb25hbC9kZXNrdG9wLWRyaXZlci1lMmUtc3BlY3MuanMiXSwibmFtZXMiOlsiY2hhaSIsInNob3VsZCIsInVzZSIsImNoYWlBc1Byb21pc2VkIiwiQ0FQUyIsImJyb3dzZXJOYW1lIiwicGxhdGZvcm1OYW1lIiwiZGVzY3JpYmUiLCJ0aW1lb3V0IiwiTU9DSEFfVElNRU9VVCIsInNlcnZlciIsImRyaXZlciIsImJlZm9yZSIsIlBPUlQiLCJIT1NUIiwiYWZ0ZXIiLCJjbG9zZSIsImJlZm9yZUVhY2giLCJob3N0bmFtZSIsInBvcnQiLCJjYXBhYmlsaXRpZXMiLCJhZnRlckVhY2giLCJkZWxldGVTZXNzaW9uIiwiaXQiLCJ1cmwiLCJidXR0b24iLCIkIiwiZ2V0VGV4dCIsImV2ZW50dWFsbHkiLCJlcWwiXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUVBQSxjQUFLQyxNQUFMOztBQUNBRCxjQUFLRSxHQUFMLENBQVNDLHVCQUFUOztBQUVBLE1BQU1DLElBQUksR0FBRztBQUNYQyxFQUFBQSxXQUFXLEVBQUUsZ0JBREY7QUFFWEMsRUFBQUEsWUFBWSxFQUFFO0FBRkgsQ0FBYjtBQUtBQyxRQUFRLENBQUMsc0JBQUQsRUFBeUIsWUFBWTtBQUMzQyxPQUFLQyxPQUFMLENBQWFDLG9CQUFiO0FBRUEsTUFBSUMsTUFBSjtBQUNBLE1BQUlDLE1BQUo7QUFDQUMsRUFBQUEsTUFBTSxDQUFDLGtCQUFrQjtBQUN2QkYsSUFBQUEsTUFBTSxHQUFHLE1BQU0sbUJBQVlHLFdBQVosRUFBa0JDLFdBQWxCLENBQWY7QUFDRCxHQUZLLENBQU47QUFHQUMsRUFBQUEsS0FBSyxDQUFDLGtCQUFrQjtBQUN0QixRQUFJTCxNQUFKLEVBQVk7QUFDVixZQUFNQSxNQUFNLENBQUNNLEtBQVAsRUFBTjtBQUNBTixNQUFBQSxNQUFNLEdBQUcsSUFBVDtBQUNEO0FBQ0YsR0FMSSxDQUFMO0FBTUFPLEVBQUFBLFVBQVUsQ0FBQyxrQkFBa0I7QUFDM0JOLElBQUFBLE1BQU0sR0FBRyxNQUFNLHlCQUFPO0FBQ3BCTyxNQUFBQSxRQUFRLEVBQUVKLFdBRFU7QUFFcEJLLE1BQUFBLElBQUksRUFBRU4sV0FGYztBQUdwQk8sTUFBQUEsWUFBWSxFQUFFaEI7QUFITSxLQUFQLENBQWY7QUFLRCxHQU5TLENBQVY7QUFPQWlCLEVBQUFBLFNBQVMsQ0FBQyxrQkFBa0I7QUFDMUIsUUFBSVYsTUFBSixFQUFZO0FBQ1YsWUFBTUEsTUFBTSxDQUFDVyxhQUFQLEVBQU47QUFDQVgsTUFBQUEsTUFBTSxHQUFHLElBQVQ7QUFDRDtBQUNGLEdBTFEsQ0FBVDtBQU9BWSxFQUFBQSxFQUFFLENBQUMsaUNBQUQsRUFBb0Msa0JBQWtCO0FBQ3RELFVBQU1aLE1BQU0sQ0FBQ2EsR0FBUCxDQUFXLG9CQUFYLENBQU47QUFDQSxVQUFNQyxNQUFNLEdBQUcsTUFBTWQsTUFBTSxDQUFDZSxDQUFQLENBQVMsZUFBVCxDQUFyQjtBQUNBLFVBQU1ELE1BQU0sQ0FBQ0UsT0FBUCxHQUFpQjFCLE1BQWpCLENBQXdCMkIsVUFBeEIsQ0FBbUNDLEdBQW5DLENBQXVDLGlCQUF2QyxDQUFOO0FBQ0QsR0FKQyxDQUFGO0FBS0QsQ0FqQ08sQ0FBUiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHJlbW90ZSB9IGZyb20gJ3dlYmRyaXZlcmlvJztcbmltcG9ydCB7IHN0YXJ0U2VydmVyIH0gZnJvbSAnLi4vLi4nO1xuaW1wb3J0IGNoYWlBc1Byb21pc2VkIGZyb20gJ2NoYWktYXMtcHJvbWlzZWQnO1xuaW1wb3J0IGNoYWkgZnJvbSAnY2hhaSc7XG5pbXBvcnQgeyBIT1NULCBQT1JULCBNT0NIQV9USU1FT1VUIH0gZnJvbSAnLi4vdXRpbHMnO1xuXG5jaGFpLnNob3VsZCgpO1xuY2hhaS51c2UoY2hhaUFzUHJvbWlzZWQpO1xuXG5jb25zdCBDQVBTID0ge1xuICBicm93c2VyTmFtZTogJ01vemlsbGFGaXJlZm94JyxcbiAgcGxhdGZvcm1OYW1lOiAnbGludXgnLFxufTtcblxuZGVzY3JpYmUoJ0Rlc2t0b3AgR2Vja28gRHJpdmVyJywgZnVuY3Rpb24gKCkge1xuICB0aGlzLnRpbWVvdXQoTU9DSEFfVElNRU9VVCk7XG5cbiAgbGV0IHNlcnZlcjtcbiAgbGV0IGRyaXZlcjtcbiAgYmVmb3JlKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBzZXJ2ZXIgPSBhd2FpdCBzdGFydFNlcnZlcihQT1JULCBIT1NUKTtcbiAgfSk7XG4gIGFmdGVyKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBpZiAoc2VydmVyKSB7XG4gICAgICBhd2FpdCBzZXJ2ZXIuY2xvc2UoKTtcbiAgICAgIHNlcnZlciA9IG51bGw7XG4gICAgfVxuICB9KTtcbiAgYmVmb3JlRWFjaChhc3luYyBmdW5jdGlvbiAoKSB7XG4gICAgZHJpdmVyID0gYXdhaXQgcmVtb3RlKHtcbiAgICAgIGhvc3RuYW1lOiBIT1NULFxuICAgICAgcG9ydDogUE9SVCxcbiAgICAgIGNhcGFiaWxpdGllczogQ0FQUyxcbiAgICB9KTtcbiAgfSk7XG4gIGFmdGVyRWFjaChhc3luYyBmdW5jdGlvbiAoKSB7XG4gICAgaWYgKGRyaXZlcikge1xuICAgICAgYXdhaXQgZHJpdmVyLmRlbGV0ZVNlc3Npb24oKTtcbiAgICAgIGRyaXZlciA9IG51bGw7XG4gICAgfVxuICB9KTtcblxuICBpdCgnc2hvdWxkIHN0YXJ0IGFuZCBzdG9wIGEgc2Vzc2lvbicsIGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBhd2FpdCBkcml2ZXIudXJsKCdodHRwczovL2FwcGl1bS5pby8nKTtcbiAgICBjb25zdCBidXR0b24gPSBhd2FpdCBkcml2ZXIuJCgnI2Rvd25sb2FkTGluaycpO1xuICAgIGF3YWl0IGJ1dHRvbi5nZXRUZXh0KCkuc2hvdWxkLmV2ZW50dWFsbHkuZXFsKCdEb3dubG9hZCBBcHBpdW0nKTtcbiAgfSk7XG59KTtcblxuXG4iXSwiZmlsZSI6InRlc3QvZnVuY3Rpb25hbC9kZXNrdG9wLWRyaXZlci1lMmUtc3BlY3MuanMiLCJzb3VyY2VSb290IjoiLi4vLi4vLi4ifQ==

package/build/test/functional/mobile-driver-e2e-specs.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 require("source-map-support/register");
 
-var _wd = _interopRequireDefault(require("wd"));
+var _webdriverio = require("webdriverio");
 
 var _ = require("../..");
 
@@ -20,12 +20,13 @@ _chai.default.use(_chaiAsPromised.default);
 
 const DEVICE_NAME = process.env.DEVICE_NAME || 'emulator-5554';
 const CAPS = {
-  platformName: 'android',
+  platformName: 'linux',
   verbosity: 'trace',
   'moz:firefoxOptions': {
     androidDeviceSerial: DEVICE_NAME,
     androidPackage: 'org.mozilla.firefox'
-  }
+  },
+  androidStorage: 'internal'
 };
 describe('Mobile GeckoDriver', function () {
   this.timeout(_utils.MOCHA_TIMEOUT);
@@ -45,21 +46,24 @@ describe('Mobile GeckoDriver', function () {
     }
   });
   beforeEach(async function () {
-    driver = _wd.default.promiseChainRemote(_utils.HOST, _utils.PORT);
-    await driver.init(CAPS);
+    driver = await (0, _webdriverio.remote)({
+      hostname: _utils.HOST,
+      port: _utils.PORT,
+      capabilities: CAPS
+    });
   });
   afterEach(async function () {
     if (driver) {
-      await driver.quit();
+      await driver.deleteSession();
       driver = null;
     }
   });
   it('should start and stop a session', async function () {
-    await driver.get('https://appium.io/');
-    const button = await driver.elementByCss('#downloadLink');
-    await button.text().should.eventually.eql('Download Appium');
+    await driver.url('https://appium.io/');
+    const button = await driver.$('#downloadLink');
+    await button.getText().should.eventually.eql('Download Appium');
   });
 });require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvZnVuY3Rpb25hbC9tb2JpbGUtZHJpdmVyLWUyZS1zcGVjcy5qcyJdLCJuYW1lcyI6WyJjaGFpIiwic2hvdWxkIiwidXNlIiwiY2hhaUFzUHJvbWlzZWQiLCJERVZJQ0VfTkFNRSIsInByb2Nlc3MiLCJlbnYiLCJDQVBTIiwicGxhdGZvcm1OYW1lIiwidmVyYm9zaXR5IiwiYW5kcm9pZERldmljZVNlcmlhbCIsImFuZHJvaWRQYWNrYWdlIiwiZGVzY3JpYmUiLCJ0aW1lb3V0IiwiTU9DSEFfVElNRU9VVCIsInNlcnZlciIsImRyaXZlciIsImJlZm9yZSIsIkNJIiwic2tpcCIsIlBPUlQiLCJIT1NUIiwiYWZ0ZXIiLCJjbG9zZSIsImJlZm9yZUVhY2giLCJ3ZCIsInByb21pc2VDaGFpblJlbW90ZSIsImluaXQiLCJhZnRlckVhY2giLCJxdWl0IiwiaXQiLCJnZXQiLCJidXR0b24iLCJlbGVtZW50QnlDc3MiLCJ0ZXh0IiwiZXZlbnR1YWxseSIsImVxbCJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUE7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBRUFBLGNBQUtDLE1BQUw7O0FBQ0FELGNBQUtFLEdBQUwsQ0FBU0MsdUJBQVQ7O0FBRUEsTUFBTUMsV0FBVyxHQUFHQyxPQUFPLENBQUNDLEdBQVIsQ0FBWUYsV0FBWixJQUEyQixlQUEvQztBQUVBLE1BQU1HLElBQUksR0FBRztBQUNYQyxFQUFBQSxZQUFZLEVBQUUsU0FESDtBQUVYQyxFQUFBQSxTQUFTLEVBQUUsT0FGQTtBQUdYLHdCQUFzQjtBQUNwQkMsSUFBQUEsbUJBQW1CLEVBQUVOLFdBREQ7QUFFcEJPLElBQUFBLGNBQWMsRUFBRTtBQUZJO0FBSFgsQ0FBYjtBQVNBQyxRQUFRLENBQUMsb0JBQUQsRUFBdUIsWUFBWTtBQUN6QyxPQUFLQyxPQUFMLENBQWFDLG9CQUFiO0FBRUEsTUFBSUMsTUFBSjtBQUNBLE1BQUlDLE1BQUo7QUFDQUMsRUFBQUEsTUFBTSxDQUFDLGtCQUFrQjtBQUN2QixRQUFJWixPQUFPLENBQUNDLEdBQVIsQ0FBWVksRUFBaEIsRUFBb0I7QUFFbEIsYUFBTyxLQUFLQyxJQUFMLEVBQVA7QUFDRDs7QUFDREosSUFBQUEsTUFBTSxHQUFHLE1BQU0sbUJBQVlLLFdBQVosRUFBa0JDLFdBQWxCLENBQWY7QUFDRCxHQU5LLENBQU47QUFPQUMsRUFBQUEsS0FBSyxDQUFDLGtCQUFrQjtBQUN0QixRQUFJUCxNQUFKLEVBQVk7QUFDVixZQUFNQSxNQUFNLENBQUNRLEtBQVAsRUFBTjtBQUNBUixNQUFBQSxNQUFNLEdBQUcsSUFBVDtBQUNEO0FBQ0YsR0FMSSxDQUFMO0FBTUFTLEVBQUFBLFVBQVUsQ0FBQyxrQkFBa0I7QUFDM0JSLElBQUFBLE1BQU0sR0FBR1MsWUFBR0Msa0JBQUgsQ0FBc0JMLFdBQXRCLEVBQTRCRCxXQUE1QixDQUFUO0FBQ0EsVUFBTUosTUFBTSxDQUFDVyxJQUFQLENBQVlwQixJQUFaLENBQU47QUFDRCxHQUhTLENBQVY7QUFJQXFCLEVBQUFBLFNBQVMsQ0FBQyxrQkFBa0I7QUFDMUIsUUFBSVosTUFBSixFQUFZO0FBQ1YsWUFBTUEsTUFBTSxDQUFDYSxJQUFQLEVBQU47QUFDQWIsTUFBQUEsTUFBTSxHQUFHLElBQVQ7QUFDRDtBQUNGLEdBTFEsQ0FBVDtBQU9BYyxFQUFBQSxFQUFFLENBQUMsaUNBQUQsRUFBb0Msa0JBQWtCO0FBQ3RELFVBQU1kLE1BQU0sQ0FBQ2UsR0FBUCxDQUFXLG9CQUFYLENBQU47QUFDQSxVQUFNQyxNQUFNLEdBQUcsTUFBTWhCLE1BQU0sQ0FBQ2lCLFlBQVAsQ0FBb0IsZUFBcEIsQ0FBckI7QUFDQSxVQUFNRCxNQUFNLENBQUNFLElBQVAsR0FBY2pDLE1BQWQsQ0FBcUJrQyxVQUFyQixDQUFnQ0MsR0FBaEMsQ0FBb0MsaUJBQXBDLENBQU47QUFDRCxHQUpDLENBQUY7QUFLRCxDQWxDTyxDQUFSIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHdkIGZyb20gJ3dkJztcbmltcG9ydCB7IHN0YXJ0U2VydmVyIH0gZnJvbSAnLi4vLi4nO1xuaW1wb3J0IGNoYWlBc1Byb21pc2VkIGZyb20gJ2NoYWktYXMtcHJvbWlzZWQnO1xuaW1wb3J0IGNoYWkgZnJvbSAnY2hhaSc7XG5pbXBvcnQgeyBIT1NULCBQT1JULCBNT0NIQV9USU1FT1VUIH0gZnJvbSAnLi4vdXRpbHMnO1xuXG5jaGFpLnNob3VsZCgpO1xuY2hhaS51c2UoY2hhaUFzUHJvbWlzZWQpO1xuXG5jb25zdCBERVZJQ0VfTkFNRSA9IHByb2Nlc3MuZW52LkRFVklDRV9OQU1FIHx8ICdlbXVsYXRvci01NTU0Jztcbi8vIFRoZSBGaXJlZm94IGJpbmFyeSBjb3VsZCBiZSByZXRyaWV2ZWQgZnJvbSBodHRwczovL3d3dy5tb3ppbGxhLm9yZy9lbi1HQi9maXJlZm94L2FsbC8jcHJvZHVjdC1hbmRyb2lkLXJlbGVhc2VcbmNvbnN0IENBUFMgPSB7XG4gIHBsYXRmb3JtTmFtZTogJ2FuZHJvaWQnLFxuICB2ZXJib3NpdHk6ICd0cmFjZScsXG4gICdtb3o6ZmlyZWZveE9wdGlvbnMnOiB7XG4gICAgYW5kcm9pZERldmljZVNlcmlhbDogREVWSUNFX05BTUUsXG4gICAgYW5kcm9pZFBhY2thZ2U6ICdvcmcubW96aWxsYS5maXJlZm94JyxcbiAgfSxcbn07XG5cbmRlc2NyaWJlKCdNb2JpbGUgR2Vja29Ecml2ZXInLCBmdW5jdGlvbiAoKSB7XG4gIHRoaXMudGltZW91dChNT0NIQV9USU1FT1VUKTtcblxuICBsZXQgc2VydmVyO1xuICBsZXQgZHJpdmVyO1xuICBiZWZvcmUoYXN5bmMgZnVuY3Rpb24gKCkge1xuICAgIGlmIChwcm9jZXNzLmVudi5DSSkge1xuICAgICAgLy8gRmlndXJlIG91dCBhIHdheSB0byBydW4gdGhpcyBvbiBBenVyZVxuICAgICAgcmV0dXJuIHRoaXMuc2tpcCgpO1xuICAgIH1cbiAgICBzZXJ2ZXIgPSBhd2FpdCBzdGFydFNlcnZlcihQT1JULCBIT1NUKTtcbiAgfSk7XG4gIGFmdGVyKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBpZiAoc2VydmVyKSB7XG4gICAgICBhd2FpdCBzZXJ2ZXIuY2xvc2UoKTtcbiAgICAgIHNlcnZlciA9IG51bGw7XG4gICAgfVxuICB9KTtcbiAgYmVmb3JlRWFjaChhc3luYyBmdW5jdGlvbiAoKSB7XG4gICAgZHJpdmVyID0gd2QucHJvbWlzZUNoYWluUmVtb3RlKEhPU1QsIFBPUlQpO1xuICAgIGF3YWl0IGRyaXZlci5pbml0KENBUFMpO1xuICB9KTtcbiAgYWZ0ZXJFYWNoKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBpZiAoZHJpdmVyKSB7XG4gICAgICBhd2FpdCBkcml2ZXIucXVpdCgpO1xuICAgICAgZHJpdmVyID0gbnVsbDtcbiAgICB9XG4gIH0pO1xuXG4gIGl0KCdzaG91bGQgc3RhcnQgYW5kIHN0b3AgYSBzZXNzaW9uJywgYXN5bmMgZnVuY3Rpb24gKCkge1xuICAgIGF3YWl0IGRyaXZlci5nZXQoJ2h0dHBzOi8vYXBwaXVtLmlvLycpO1xuICAgIGNvbnN0IGJ1dHRvbiA9IGF3YWl0IGRyaXZlci5lbGVtZW50QnlDc3MoJyNkb3dubG9hZExpbmsnKTtcbiAgICBhd2FpdCBidXR0b24udGV4dCgpLnNob3VsZC5ldmVudHVhbGx5LmVxbCgnRG93bmxvYWQgQXBwaXVtJyk7XG4gIH0pO1xufSk7XG5cblxuIl0sImZpbGUiOiJ0ZXN0L2Z1bmN0aW9uYWwvbW9iaWxlLWRyaXZlci1lMmUtc3BlY3MuanMiLCJzb3VyY2VSb290IjoiLi4vLi4vLi4ifQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvZnVuY3Rpb25hbC9tb2JpbGUtZHJpdmVyLWUyZS1zcGVjcy5qcyJdLCJuYW1lcyI6WyJjaGFpIiwic2hvdWxkIiwidXNlIiwiY2hhaUFzUHJvbWlzZWQiLCJERVZJQ0VfTkFNRSIsInByb2Nlc3MiLCJlbnYiLCJDQVBTIiwicGxhdGZvcm1OYW1lIiwidmVyYm9zaXR5IiwiYW5kcm9pZERldmljZVNlcmlhbCIsImFuZHJvaWRQYWNrYWdlIiwiYW5kcm9pZFN0b3JhZ2UiLCJkZXNjcmliZSIsInRpbWVvdXQiLCJNT0NIQV9USU1FT1VUIiwic2VydmVyIiwiZHJpdmVyIiwiYmVmb3JlIiwiQ0kiLCJza2lwIiwiUE9SVCIsIkhPU1QiLCJhZnRlciIsImNsb3NlIiwiYmVmb3JlRWFjaCIsImhvc3RuYW1lIiwicG9ydCIsImNhcGFiaWxpdGllcyIsImFmdGVyRWFjaCIsImRlbGV0ZVNlc3Npb24iLCJpdCIsInVybCIsImJ1dHRvbiIsIiQiLCJnZXRUZXh0IiwiZXZlbnR1YWxseSIsImVxbCJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUE7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBRUFBLGNBQUtDLE1BQUw7O0FBQ0FELGNBQUtFLEdBQUwsQ0FBU0MsdUJBQVQ7O0FBRUEsTUFBTUMsV0FBVyxHQUFHQyxPQUFPLENBQUNDLEdBQVIsQ0FBWUYsV0FBWixJQUEyQixlQUEvQztBQUVBLE1BQU1HLElBQUksR0FBRztBQUNYQyxFQUFBQSxZQUFZLEVBQUUsT0FESDtBQUdYQyxFQUFBQSxTQUFTLEVBQUUsT0FIQTtBQUlYLHdCQUFzQjtBQUNwQkMsSUFBQUEsbUJBQW1CLEVBQUVOLFdBREQ7QUFFcEJPLElBQUFBLGNBQWMsRUFBRTtBQUZJLEdBSlg7QUFRWEMsRUFBQUEsY0FBYyxFQUFFO0FBUkwsQ0FBYjtBQVdBQyxRQUFRLENBQUMsb0JBQUQsRUFBdUIsWUFBWTtBQUN6QyxPQUFLQyxPQUFMLENBQWFDLG9CQUFiO0FBRUEsTUFBSUMsTUFBSjtBQUNBLE1BQUlDLE1BQUo7QUFDQUMsRUFBQUEsTUFBTSxDQUFDLGtCQUFrQjtBQUN2QixRQUFJYixPQUFPLENBQUNDLEdBQVIsQ0FBWWEsRUFBaEIsRUFBb0I7QUFFbEIsYUFBTyxLQUFLQyxJQUFMLEVBQVA7QUFDRDs7QUFDREosSUFBQUEsTUFBTSxHQUFHLE1BQU0sbUJBQVlLLFdBQVosRUFBa0JDLFdBQWxCLENBQWY7QUFDRCxHQU5LLENBQU47QUFPQUMsRUFBQUEsS0FBSyxDQUFDLGtCQUFrQjtBQUN0QixRQUFJUCxNQUFKLEVBQVk7QUFDVixZQUFNQSxNQUFNLENBQUNRLEtBQVAsRUFBTjtBQUNBUixNQUFBQSxNQUFNLEdBQUcsSUFBVDtBQUNEO0FBQ0YsR0FMSSxDQUFMO0FBTUFTLEVBQUFBLFVBQVUsQ0FBQyxrQkFBa0I7QUFDM0JSLElBQUFBLE1BQU0sR0FBRyxNQUFNLHlCQUFPO0FBQ3BCUyxNQUFBQSxRQUFRLEVBQUVKLFdBRFU7QUFFcEJLLE1BQUFBLElBQUksRUFBRU4sV0FGYztBQUdwQk8sTUFBQUEsWUFBWSxFQUFFckI7QUFITSxLQUFQLENBQWY7QUFLRCxHQU5TLENBQVY7QUFPQXNCLEVBQUFBLFNBQVMsQ0FBQyxrQkFBa0I7QUFDMUIsUUFBSVosTUFBSixFQUFZO0FBQ1YsWUFBTUEsTUFBTSxDQUFDYSxhQUFQLEVBQU47QUFDQWIsTUFBQUEsTUFBTSxHQUFHLElBQVQ7QUFDRDtBQUNGLEdBTFEsQ0FBVDtBQU9BYyxFQUFBQSxFQUFFLENBQUMsaUNBQUQsRUFBb0Msa0JBQWtCO0FBQ3RELFVBQU1kLE1BQU0sQ0FBQ2UsR0FBUCxDQUFXLG9CQUFYLENBQU47QUFDQSxVQUFNQyxNQUFNLEdBQUcsTUFBTWhCLE1BQU0sQ0FBQ2lCLENBQVAsQ0FBUyxlQUFULENBQXJCO0FBQ0EsVUFBTUQsTUFBTSxDQUFDRSxPQUFQLEdBQWlCbEMsTUFBakIsQ0FBd0JtQyxVQUF4QixDQUFtQ0MsR0FBbkMsQ0FBdUMsaUJBQXZDLENBQU47QUFDRCxHQUpDLENBQUY7QUFLRCxDQXJDTyxDQUFSIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgcmVtb3RlIH0gZnJvbSAnd2ViZHJpdmVyaW8nO1xuaW1wb3J0IHsgc3RhcnRTZXJ2ZXIgfSBmcm9tICcuLi8uLic7XG5pbXBvcnQgY2hhaUFzUHJvbWlzZWQgZnJvbSAnY2hhaS1hcy1wcm9taXNlZCc7XG5pbXBvcnQgY2hhaSBmcm9tICdjaGFpJztcbmltcG9ydCB7IEhPU1QsIFBPUlQsIE1PQ0hBX1RJTUVPVVQgfSBmcm9tICcuLi91dGlscyc7XG5cbmNoYWkuc2hvdWxkKCk7XG5jaGFpLnVzZShjaGFpQXNQcm9taXNlZCk7XG5cbmNvbnN0IERFVklDRV9OQU1FID0gcHJvY2Vzcy5lbnYuREVWSUNFX05BTUUgfHwgJ2VtdWxhdG9yLTU1NTQnO1xuLy8gVGhlIEZpcmVmb3ggYmluYXJ5IGNvdWxkIGJlIHJldHJpZXZlZCBmcm9tIGh0dHBzOi8vd3d3Lm1vemlsbGEub3JnL2VuLUdCL2ZpcmVmb3gvYWxsLyNwcm9kdWN0LWFuZHJvaWQtcmVsZWFzZVxuY29uc3QgQ0FQUyA9IHtcbiAgcGxhdGZvcm1OYW1lOiAnbGludXgnLFxuICAvLyBwbGF0Zm9ybU5hbWU6ICdtYWMnLFxuICB2ZXJib3NpdHk6ICd0cmFjZScsXG4gICdtb3o6ZmlyZWZveE9wdGlvbnMnOiB7XG4gICAgYW5kcm9pZERldmljZVNlcmlhbDogREVWSUNFX05BTUUsXG4gICAgYW5kcm9pZFBhY2thZ2U6ICdvcmcubW96aWxsYS5maXJlZm94JyxcbiAgfSxcbiAgYW5kcm9pZFN0b3JhZ2U6ICdpbnRlcm5hbCcsXG59O1xuXG5kZXNjcmliZSgnTW9iaWxlIEdlY2tvRHJpdmVyJywgZnVuY3Rpb24gKCkge1xuICB0aGlzLnRpbWVvdXQoTU9DSEFfVElNRU9VVCk7XG5cbiAgbGV0IHNlcnZlcjtcbiAgbGV0IGRyaXZlcjtcbiAgYmVmb3JlKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBpZiAocHJvY2Vzcy5lbnYuQ0kpIHtcbiAgICAgIC8vIEZpZ3VyZSBvdXQgYSB3YXkgdG8gcnVuIHRoaXMgb24gQXp1cmVcbiAgICAgIHJldHVybiB0aGlzLnNraXAoKTtcbiAgICB9XG4gICAgc2VydmVyID0gYXdhaXQgc3RhcnRTZXJ2ZXIoUE9SVCwgSE9TVCk7XG4gIH0pO1xuICBhZnRlcihhc3luYyBmdW5jdGlvbiAoKSB7XG4gICAgaWYgKHNlcnZlcikge1xuICAgICAgYXdhaXQgc2VydmVyLmNsb3NlKCk7XG4gICAgICBzZXJ2ZXIgPSBudWxsO1xuICAgIH1cbiAgfSk7XG4gIGJlZm9yZUVhY2goYXN5bmMgZnVuY3Rpb24gKCkge1xuICAgIGRyaXZlciA9IGF3YWl0IHJlbW90ZSh7XG4gICAgICBob3N0bmFtZTogSE9TVCxcbiAgICAgIHBvcnQ6IFBPUlQsXG4gICAgICBjYXBhYmlsaXRpZXM6IENBUFMsXG4gICAgfSk7XG4gIH0pO1xuICBhZnRlckVhY2goYXN5bmMgZnVuY3Rpb24gKCkge1xuICAgIGlmIChkcml2ZXIpIHtcbiAgICAgIGF3YWl0IGRyaXZlci5kZWxldGVTZXNzaW9uKCk7XG4gICAgICBkcml2ZXIgPSBudWxsO1xuICAgIH1cbiAgfSk7XG5cbiAgaXQoJ3Nob3VsZCBzdGFydCBhbmQgc3RvcCBhIHNlc3Npb24nLCBhc3luYyBmdW5jdGlvbiAoKSB7XG4gICAgYXdhaXQgZHJpdmVyLnVybCgnaHR0cHM6Ly9hcHBpdW0uaW8vJyk7XG4gICAgY29uc3QgYnV0dG9uID0gYXdhaXQgZHJpdmVyLiQoJyNkb3dubG9hZExpbmsnKTtcbiAgICBhd2FpdCBidXR0b24uZ2V0VGV4dCgpLnNob3VsZC5ldmVudHVhbGx5LmVxbCgnRG93bmxvYWQgQXBwaXVtJyk7XG4gIH0pO1xufSk7XG5cblxuIl0sImZpbGUiOiJ0ZXN0L2Z1bmN0aW9uYWwvbW9iaWxlLWRyaXZlci1lMmUtc3BlY3MuanMiLCJzb3VyY2VSb290IjoiLi4vLi4vLi4ifQ==

package/build/test/unit/utils-specs.js

@@ -19,7 +19,7 @@ describe('formatCapsForServer', function () {
     const result = (0, _utils.formatCapsForServer)({
       browserName: 'yolo',
       browserVersion: '52',
-      platformName: 'mac'
+      platformName: 'Mac'
     });
     result.should.eql({
       browserName: 'firefox',
@@ -43,4 +43,4 @@ describe('formatCapsForServer', function () {
 });require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvdW5pdC91dGlscy1zcGVjcy5qcyJdLCJuYW1lcyI6WyJjaGFpIiwic2hvdWxkIiwiZGVzY3JpYmUiLCJpdCIsInJlc3VsdCIsImVxbCIsImJyb3dzZXJOYW1lIiwiYnJvd3NlclZlcnNpb24iLCJwbGF0Zm9ybU5hbWUiLCJiYXIiXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBOztBQUNBOztBQUVBQSxjQUFLQyxNQUFMOztBQUVBQyxRQUFRLENBQUMscUJBQUQsRUFBd0IsWUFBWTtBQUMxQ0MsRUFBQUEsRUFBRSxDQUFDLDBCQUFELEVBQTZCLFlBQVk7QUFDekMsVUFBTUMsTUFBTSxHQUFHLGdDQUFvQixFQUFwQixDQUFmO0FBQ0FBLElBQUFBLE1BQU0sQ0FBQ0gsTUFBUCxDQUFjSSxHQUFkLENBQWtCLEVBQWxCO0FBQ0QsR0FIQyxDQUFGO0FBS0FGLEVBQUFBLEVBQUUsQ0FBQyw0QkFBRCxFQUErQixZQUFZO0FBQzNDLFVBQU1DLE1BQU0sR0FBRyxnQ0FBb0I7QUFDakNFLE1BQUFBLFdBQVcsRUFBRSxNQURvQjtBQUVqQ0MsTUFBQUEsY0FBYyxFQUFFLElBRmlCO0FBR2pDQyxNQUFBQSxZQUFZLEVBQUU7QUFIbUIsS0FBcEIsQ0FBZjtBQUtBSixJQUFBQSxNQUFNLENBQUNILE1BQVAsQ0FBY0ksR0FBZCxDQUFrQjtBQUNoQkMsTUFBQUEsV0FBVyxFQUFFLFNBREc7QUFFaEJDLE1BQUFBLGNBQWMsRUFBRSxJQUZBO0FBR2hCQyxNQUFBQSxZQUFZLEVBQUU7QUFIRSxLQUFsQjtBQUtELEdBWEMsQ0FBRjtBQWFBTCxFQUFBQSxFQUFFLENBQUMsK0NBQUQsRUFBa0QsWUFBWTtBQUM5RCxVQUFNQyxNQUFNLEdBQUcsZ0NBQW9CO0FBQ2pDRyxNQUFBQSxjQUFjLEVBQUUsSUFEaUI7QUFFakNFLE1BQUFBLEdBQUcsRUFBRSxJQUY0QjtBQUdqQyxpQkFBVyxNQUhzQjtBQUlqQyxxQkFBZSxLQUprQjtBQUtqQyxvQkFBYztBQUxtQixLQUFwQixDQUFmO0FBT0FMLElBQUFBLE1BQU0sQ0FBQ0gsTUFBUCxDQUFjSSxHQUFkLENBQWtCO0FBQ2hCRSxNQUFBQSxjQUFjLEVBQUUsSUFEQTtBQUVoQixpQkFBVztBQUZLLEtBQWxCO0FBSUQsR0FaQyxDQUFGO0FBYUQsQ0FoQ08sQ0FBUiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGZvcm1hdENhcHNGb3JTZXJ2ZXIgfSBmcm9tICcuLi8uLi9saWIvdXRpbHMnO1xuaW1wb3J0IGNoYWkgZnJvbSAnY2hhaSc7XG5cbmNoYWkuc2hvdWxkKCk7XG5cbmRlc2NyaWJlKCdmb3JtYXRDYXBzRm9yU2VydmVyJywgZnVuY3Rpb24gKCkge1xuICBpdCgnc2hvdWxkIGZvcm1hdCBlbXB0eSBjYXBzJywgZnVuY3Rpb24gKCkge1xuICAgIGNvbnN0IHJlc3VsdCA9IGZvcm1hdENhcHNGb3JTZXJ2ZXIoe30pO1xuICAgIHJlc3VsdC5zaG91bGQuZXFsKHt9KTtcbiAgfSk7XG5cbiAgaXQoJ3Nob3VsZCBhc3NpZ24gZGVmYXVsdCBjYXBzJywgZnVuY3Rpb24gKCkge1xuICAgIGNvbnN0IHJlc3VsdCA9IGZvcm1hdENhcHNGb3JTZXJ2ZXIoe1xuICAgICAgYnJvd3Nlck5hbWU6ICd5b2xvJyxcbiAgICAgIGJyb3dzZXJWZXJzaW9uOiAnNTInLFxuICAgICAgcGxhdGZvcm1OYW1lOiAnbWFjJyxcbiAgICB9KTtcbiAgICByZXN1bHQuc2hvdWxkLmVxbCh7XG4gICAgICBicm93c2VyTmFtZTogJ2ZpcmVmb3gnLFxuICAgICAgYnJvd3NlclZlcnNpb246ICc1MicsXG4gICAgICBwbGF0Zm9ybU5hbWU6ICdtYWMnLFxuICAgIH0pO1xuICB9KTtcblxuICBpdCgnc2hvdWxkIG9ubHkgcGFzcyBjYXBzIHdpdGggc3VwcG9ydGVkIHByZWZpeGVzJywgZnVuY3Rpb24gKCkge1xuICAgIGNvbnN0IHJlc3VsdCA9IGZvcm1hdENhcHNGb3JTZXJ2ZXIoe1xuICAgICAgYnJvd3NlclZlcnNpb246ICc1MicsXG4gICAgICBiYXI6ICc2NycsXG4gICAgICAnbW96OmZvbyc6ICcxMjM0JyxcbiAgICAgICd3ZWJraXQ6eW9sbyc6ICc1NjcnLFxuICAgICAgJ2FwcGl1bTpiYXInOiAnNzg5JyxcbiAgICB9KTtcbiAgICByZXN1bHQuc2hvdWxkLmVxbCh7XG4gICAgICBicm93c2VyVmVyc2lvbjogJzUyJyxcbiAgICAgICdtb3o6Zm9vJzogJzEyMzQnLFxuICAgIH0pO1xuICB9KTtcbn0pO1xuIl0sImZpbGUiOiJ0ZXN0L3VuaXQvdXRpbHMtc3BlY3MuanMiLCJzb3VyY2VSb290IjoiLi4vLi4vLi4ifQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvdW5pdC91dGlscy1zcGVjcy5qcyJdLCJuYW1lcyI6WyJjaGFpIiwic2hvdWxkIiwiZGVzY3JpYmUiLCJpdCIsInJlc3VsdCIsImVxbCIsImJyb3dzZXJOYW1lIiwiYnJvd3NlclZlcnNpb24iLCJwbGF0Zm9ybU5hbWUiLCJiYXIiXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBOztBQUNBOztBQUVBQSxjQUFLQyxNQUFMOztBQUVBQyxRQUFRLENBQUMscUJBQUQsRUFBd0IsWUFBWTtBQUMxQ0MsRUFBQUEsRUFBRSxDQUFDLDBCQUFELEVBQTZCLFlBQVk7QUFDekMsVUFBTUMsTUFBTSxHQUFHLGdDQUFvQixFQUFwQixDQUFmO0FBQ0FBLElBQUFBLE1BQU0sQ0FBQ0gsTUFBUCxDQUFjSSxHQUFkLENBQWtCLEVBQWxCO0FBQ0QsR0FIQyxDQUFGO0FBS0FGLEVBQUFBLEVBQUUsQ0FBQyw0QkFBRCxFQUErQixZQUFZO0FBQzNDLFVBQU1DLE1BQU0sR0FBRyxnQ0FBb0I7QUFDakNFLE1BQUFBLFdBQVcsRUFBRSxNQURvQjtBQUVqQ0MsTUFBQUEsY0FBYyxFQUFFLElBRmlCO0FBR2pDQyxNQUFBQSxZQUFZLEVBQUU7QUFIbUIsS0FBcEIsQ0FBZjtBQUtBSixJQUFBQSxNQUFNLENBQUNILE1BQVAsQ0FBY0ksR0FBZCxDQUFrQjtBQUNoQkMsTUFBQUEsV0FBVyxFQUFFLFNBREc7QUFFaEJDLE1BQUFBLGNBQWMsRUFBRSxJQUZBO0FBR2hCQyxNQUFBQSxZQUFZLEVBQUU7QUFIRSxLQUFsQjtBQUtELEdBWEMsQ0FBRjtBQWFBTCxFQUFBQSxFQUFFLENBQUMsK0NBQUQsRUFBa0QsWUFBWTtBQUM5RCxVQUFNQyxNQUFNLEdBQUcsZ0NBQW9CO0FBQ2pDRyxNQUFBQSxjQUFjLEVBQUUsSUFEaUI7QUFFakNFLE1BQUFBLEdBQUcsRUFBRSxJQUY0QjtBQUdqQyxpQkFBVyxNQUhzQjtBQUlqQyxxQkFBZSxLQUprQjtBQUtqQyxvQkFBYztBQUxtQixLQUFwQixDQUFmO0FBT0FMLElBQUFBLE1BQU0sQ0FBQ0gsTUFBUCxDQUFjSSxHQUFkLENBQWtCO0FBQ2hCRSxNQUFBQSxjQUFjLEVBQUUsSUFEQTtBQUVoQixpQkFBVztBQUZLLEtBQWxCO0FBSUQsR0FaQyxDQUFGO0FBYUQsQ0FoQ08sQ0FBUiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGZvcm1hdENhcHNGb3JTZXJ2ZXIgfSBmcm9tICcuLi8uLi9saWIvdXRpbHMnO1xuaW1wb3J0IGNoYWkgZnJvbSAnY2hhaSc7XG5cbmNoYWkuc2hvdWxkKCk7XG5cbmRlc2NyaWJlKCdmb3JtYXRDYXBzRm9yU2VydmVyJywgZnVuY3Rpb24gKCkge1xuICBpdCgnc2hvdWxkIGZvcm1hdCBlbXB0eSBjYXBzJywgZnVuY3Rpb24gKCkge1xuICAgIGNvbnN0IHJlc3VsdCA9IGZvcm1hdENhcHNGb3JTZXJ2ZXIoe30pO1xuICAgIHJlc3VsdC5zaG91bGQuZXFsKHt9KTtcbiAgfSk7XG5cbiAgaXQoJ3Nob3VsZCBhc3NpZ24gZGVmYXVsdCBjYXBzJywgZnVuY3Rpb24gKCkge1xuICAgIGNvbnN0IHJlc3VsdCA9IGZvcm1hdENhcHNGb3JTZXJ2ZXIoe1xuICAgICAgYnJvd3Nlck5hbWU6ICd5b2xvJyxcbiAgICAgIGJyb3dzZXJWZXJzaW9uOiAnNTInLFxuICAgICAgcGxhdGZvcm1OYW1lOiAnTWFjJyxcbiAgICB9KTtcbiAgICByZXN1bHQuc2hvdWxkLmVxbCh7XG4gICAgICBicm93c2VyTmFtZTogJ2ZpcmVmb3gnLFxuICAgICAgYnJvd3NlclZlcnNpb246ICc1MicsXG4gICAgICBwbGF0Zm9ybU5hbWU6ICdtYWMnLFxuICAgIH0pO1xuICB9KTtcblxuICBpdCgnc2hvdWxkIG9ubHkgcGFzcyBjYXBzIHdpdGggc3VwcG9ydGVkIHByZWZpeGVzJywgZnVuY3Rpb24gKCkge1xuICAgIGNvbnN0IHJlc3VsdCA9IGZvcm1hdENhcHNGb3JTZXJ2ZXIoe1xuICAgICAgYnJvd3NlclZlcnNpb246ICc1MicsXG4gICAgICBiYXI6ICc2NycsXG4gICAgICAnbW96OmZvbyc6ICcxMjM0JyxcbiAgICAgICd3ZWJraXQ6eW9sbyc6ICc1NjcnLFxuICAgICAgJ2FwcGl1bTpiYXInOiAnNzg5JyxcbiAgICB9KTtcbiAgICByZXN1bHQuc2hvdWxkLmVxbCh7XG4gICAgICBicm93c2VyVmVyc2lvbjogJzUyJyxcbiAgICAgICdtb3o6Zm9vJzogJzEyMzQnLFxuICAgIH0pO1xuICB9KTtcbn0pO1xuIl0sImZpbGUiOiJ0ZXN0L3VuaXQvdXRpbHMtc3BlY3MuanMiLCJzb3VyY2VSb290IjoiLi4vLi4vLi4ifQ==

package/build/test/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.MOCHA_TIMEOUT = exports.PORT = exports.HOST = void 0;
+exports.PORT = exports.MOCHA_TIMEOUT = exports.HOST = void 0;
 
 require("source-map-support/register");
 

package/gulpfile.js

@@ -1,10 +1,11 @@
 'use strict';
 
 let gulp = require('gulp');
-let boilerplate = require('appium-gulp-plugins').boilerplate.use(gulp);
+let boilerplate = require('@appium/gulp-plugins').boilerplate.use(gulp);
 
 boilerplate({
   build: 'appium-geckodriver',
+  files: ['index.js', 'lib/**/*.js', 'test/**/*.js', '!gulpfile.js'],
   coverage: {
     files: ['./test/unit/**/*-specs.js', '!./test/functional/**'],
     verbose: true

package/index.js

@@ -1,14 +1,17 @@
 import GeckoDriver from './lib/driver';
 import { startServer } from './lib/server';
-import yargs from 'yargs';
 import { asyncify } from 'asyncbox';
 
 const DEFAULT_HOST = 'localhost';
 const DEFAULT_PORT = 4797;
 
 async function main () {
-  let port = yargs.argv.port || yargs.argv.p || DEFAULT_PORT;
-  let host = yargs.argv.host || yargs.argv.h || DEFAULT_HOST;
+  const getArgValue = (argName) => {
+    const argIndex = process.argv.indexOf(argName);
+    return argIndex > 0 ? process.argv[argIndex + 1] : null;
+  };
+  const port = parseInt(getArgValue('--port'), 10) || DEFAULT_PORT;
+  const host = getArgValue('--host') || DEFAULT_HOST;
   return await startServer(port, host);
 }
 

package/lib/commands/find.js

@@ -1,4 +1,4 @@
-import { util } from 'appium-support';
+import { util } from '@appium/support';
 
 
 const commands = {};

package/lib/desired-caps.js

@@ -28,6 +28,9 @@ const desiredCapConstraints = {
   systemPort: {
     isNumber: true
   },
+  marionettePort: {
+    isNumber: true
+  },
   verbosity: {
     isString: true,
     inclusionCaseInsensitive: Object.values(VERBOSITY)

package/lib/driver.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { BaseDriver } from 'appium-base-driver';
+import { BaseDriver } from '@appium/base-driver';
 import log from './logger';
 import GeckoDriverServer from './gecko';
 import { desiredCapConstraints } from './desired-caps';

package/lib/gecko.js

@@ -1,8 +1,8 @@
 import _ from 'lodash';
 import os from 'os';
 import path from 'path';
-import { JWProxy, errors } from 'appium-base-driver';
-import { fs, logger, util, system } from 'appium-support';
+import { JWProxy, errors } from '@appium/base-driver';
+import { fs, logger, util, system } from '@appium/support';
 import { SubProcess } from 'teen_process';
 import { waitForCondition } from 'asyncbox';
 import { findAPortNotInUse } from 'portscanner';
@@ -18,6 +18,14 @@ const GECKO_SERVER_GUARD = util.getLockFileGuard(
   path.resolve(os.tmpdir(), 'gecko_server_guard.lock'),
   {timeout: 5, tryRecovery: true}
 );
+const DEFAULT_MARIONETTE_PORT = 2828;
+const PROCESS_SPECIFIC_OPTION_NAMES_MAP = Object.freeze({
+  noReset: 'noReset',
+  verbosity: 'verbosity',
+  androidStorage: 'androidStorage',
+  marionettePort: 'marionettePort',
+  systemPort: 'port',
+});
 
 
 class GeckoProxy extends JWProxy {
@@ -33,10 +41,9 @@ class GeckoProxy extends JWProxy {
 
 class GeckoDriverProcess {
   constructor (opts = {}) {
-    for (const optName of ['noReset', 'verbosity', 'androidStorage']) {
-      this[optName] = opts[optName];
+    for (const [optName, propName] of _.toPairs(PROCESS_SPECIFIC_OPTION_NAMES_MAP)) {
+      this[propName] = opts[optName];
     }
-    this.port = opts.systemPort;
     this.proc = null;
   }
 
@@ -70,9 +77,8 @@ class GeckoDriverProcess {
       throw new Error(`${GD_BINARY} binary cannot be found in PATH. ` +
         `Please make sure it is present on your system`);
     }
-    const args = [
-      '-p', this.port,
-    ];
+    const args = [];
+    /* #region Options */
     switch (_.toLower(this.verbosity)) {
       case VERBOSITY.DEBUG:
         args.push('-v');
@@ -83,9 +89,20 @@ class GeckoDriverProcess {
     }
     if (this.noReset) {
       args.push('--connect-existing');
+      // https://firefox-source-docs.mozilla.org/testing/geckodriver/Flags.html#code-connect-existing-code
+      if (_.isNil(this.marionettePort)) {
+        log.info(`'marionettePort' capability value is not provided while 'noReset' is enabled`);
+        log.info(`Assigning 'marionettePort' to the default value (${DEFAULT_MARIONETTE_PORT})`);
+      }
+      args.push('--marionette-port', this.marionettePort ?? DEFAULT_MARIONETTE_PORT);
+    } else if (!_.isNil(this.marionettePort)) {
+      args.push('--marionette-port', this.marionettePort);
     }
+    /* #endregion */
+
+    args.push('-p', this.port);
     if (this.androidStorage) {
-      args.push('–-android-storage', this.androidStorage);
+      args.push('--android-storage', this.androidStorage);
     }
     this.proc = new SubProcess(driverBin, args);
     this.proc.on('output', (stdout, stderr) => {

package/lib/logger.js

@@ -1,4 +1,4 @@
-import { logger } from 'appium-support';
+import { logger } from '@appium/support';
 
 const log = logger.getLogger('GeckoDriver');
 

package/lib/server.js

@@ -1,5 +1,7 @@
 import log from './logger';
-import { server as baseServer, routeConfiguringFunction as makeRouter } from 'appium-base-driver';
+import {
+  server as baseServer, routeConfiguringFunction as makeRouter
+} from '@appium/base-driver';
 import GeckoDriver from './driver';
 
 async function startServer (port, address) {

package/lib/utils.js

@@ -23,6 +23,10 @@ function formatCapsForServer (caps) {
       result[name] = value;
     }
   }
+  if (result.platformName) {
+    // Geckodriver only supports lowercase platform names
+    result.platformName = _.toLower(result.platformName);
+  }
   return result;
 }
 

package/package.json

@@ -7,7 +7,7 @@
     "seamonkey",
     "firefox"
   ],
-  "version": "0.3.0",
+  "version": "1.0.0",
   "author": "appium",
   "license": "Apache-2.0",
   "repository": {
@@ -37,16 +37,15 @@
     "lib": "lib"
   },
   "dependencies": {
+    "@appium/base-driver": "^8.2.3",
+    "@appium/support": "^2.55.3",
     "@babel/runtime": "^7.0.0",
-    "appium-base-driver": "^7.1.0",
-    "appium-support": "^2.46.0",
     "asyncbox": "^2.0.2",
     "bluebird": "^3.5.1",
     "lodash": "^4.17.4",
     "portscanner": "2.2.0",
-    "source-map-support": "^0.5.5",
-    "teen_process": "^1.15.0",
-    "yargs": "^16.1.0"
+    "source-map-support": "^0.x",
+    "teen_process": "^1.15.0"
   },
   "scripts": {
     "build": "gulp transpile",
@@ -67,14 +66,20 @@
     "precommit-test"
   ],
   "devDependencies": {
-    "appium-gulp-plugins": "^5.4.0",
+    "@appium/gulp-plugins": "^6.0.0",
+    "@appium/eslint-config-appium": "^5.0.0",
+    "@babel/core": "^7.16.0",
+    "@babel/eslint-parser": "^7.16.3",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
-    "eslint-config-appium": "^4.0.1",
+    "eslint": "^7.32.0",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-mocha": "^9.0.0",
+    "eslint-plugin-promise": "^6.0.0",
     "gulp": "^4.0.0",
-    "mocha": "^8.0.1",
+    "mocha": "^9.0.0",
     "pre-commit": "^1.1.3",
-    "sinon": "^9.0.0",
-    "wd": "^1.5.0"
+    "sinon": "^12.0.0",
+    "webdriverio": "^7.0.0"
   }
 }

package/test/functional/desktop-driver-e2e-specs.js

@@ -1,4 +1,4 @@
-import wd from 'wd';
+import { remote } from 'webdriverio';
 import { startServer } from '../..';
 import chaiAsPromised from 'chai-as-promised';
 import chai from 'chai';
@@ -27,20 +27,23 @@ describe('Desktop Gecko Driver', function () {
     }
   });
   beforeEach(async function () {
-    driver = wd.promiseChainRemote(HOST, PORT);
-    await driver.init(CAPS);
+    driver = await remote({
+      hostname: HOST,
+      port: PORT,
+      capabilities: CAPS,
+    });
   });
   afterEach(async function () {
     if (driver) {
-      await driver.quit();
+      await driver.deleteSession();
       driver = null;
     }
   });
 
   it('should start and stop a session', async function () {
-    await driver.get('https://appium.io/');
-    const button = await driver.elementByCss('#downloadLink');
-    await button.text().should.eventually.eql('Download Appium');
+    await driver.url('https://appium.io/');
+    const button = await driver.$('#downloadLink');
+    await button.getText().should.eventually.eql('Download Appium');
   });
 });
 

package/test/functional/mobile-driver-e2e-specs.js

@@ -1,4 +1,4 @@
-import wd from 'wd';
+import { remote } from 'webdriverio';
 import { startServer } from '../..';
 import chaiAsPromised from 'chai-as-promised';
 import chai from 'chai';
@@ -10,12 +10,14 @@ chai.use(chaiAsPromised);
 const DEVICE_NAME = process.env.DEVICE_NAME || 'emulator-5554';
 // The Firefox binary could be retrieved from https://www.mozilla.org/en-GB/firefox/all/#product-android-release
 const CAPS = {
-  platformName: 'android',
+  platformName: 'linux',
+  // platformName: 'mac',
   verbosity: 'trace',
   'moz:firefoxOptions': {
     androidDeviceSerial: DEVICE_NAME,
     androidPackage: 'org.mozilla.firefox',
   },
+  androidStorage: 'internal',
 };
 
 describe('Mobile GeckoDriver', function () {
@@ -37,20 +39,23 @@ describe('Mobile GeckoDriver', function () {
     }
   });
   beforeEach(async function () {
-    driver = wd.promiseChainRemote(HOST, PORT);
-    await driver.init(CAPS);
+    driver = await remote({
+      hostname: HOST,
+      port: PORT,
+      capabilities: CAPS,
+    });
   });
   afterEach(async function () {
     if (driver) {
-      await driver.quit();
+      await driver.deleteSession();
       driver = null;
     }
   });
 
   it('should start and stop a session', async function () {
-    await driver.get('https://appium.io/');
-    const button = await driver.elementByCss('#downloadLink');
-    await button.text().should.eventually.eql('Download Appium');
+    await driver.url('https://appium.io/');
+    const button = await driver.$('#downloadLink');
+    await button.getText().should.eventually.eql('Download Appium');
   });
 });
 

package/test/unit/utils-specs.js

@@ -13,7 +13,7 @@ describe('formatCapsForServer', function () {
     const result = formatCapsForServer({
       browserName: 'yolo',
       browserVersion: '52',
-      platformName: 'mac',
+      platformName: 'Mac',
     });
     result.should.eql({
       browserName: 'firefox',