appium-safari-driver 3.1.3 → 3.2.0

package/lib/driver.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { BaseDriver } from '@appium/base-driver';
+import { BaseDriver } from 'appium/driver';
 import SafariDriverServer from './safari';
 import { desiredCapConstraints } from './desired-caps';
 import commands from './commands/index';

package/lib/logger.js

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

package/lib/safari.js

@@ -1,7 +1,7 @@
 import os from 'os';
 import path from 'path';
-import { JWProxy, errors } from '@appium/base-driver';
-import { fs, logger, util } from '@appium/support';
+import { JWProxy, errors } from 'appium/driver';
+import { fs, logger, util } from 'appium/support';
 import { SubProcess } from 'teen_process';
 import { waitForCondition } from 'asyncbox';
 import { findAPortNotInUse } from 'portscanner';

package/package.json

@@ -5,7 +5,7 @@
     "appium",
     "safari"
   ],
-  "version": "3.1.3",
+  "version": "3.2.0",
   "author": "appium",
   "license": "Apache-2.0",
   "repository": {
@@ -33,8 +33,6 @@
     "lib": "lib"
   },
   "dependencies": {
-    "@appium/base-driver": "^8.3.0",
-    "@appium/support": "^2.46.0",
     "@babel/runtime": "^7.0.0",
     "asyncbox": "^2.0.2",
     "bluebird": "^3.5.1",
@@ -62,12 +60,17 @@
     "precommit-msg",
     "precommit-test"
   ],
+  "peerDependencies": {
+    "appium": "^2.0.0-beta.40"
+  },
   "devDependencies": {
     "@appium/gulp-plugins": "^7.0.0",
     "@appium/eslint-config-appium": "^6.0.0",
     "@babel/core": "^7.16.0",
     "@babel/eslint-parser": "^7.16.3",
     "@semantic-release/git": "^10.0.1",
+    "appium": "^2.0.0-beta.40",
+    "appium-safari-driver": "file:.",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
     "eslint-config-prettier": "^8.5.0",

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

@@ -1,5 +1,5 @@
 import { remote } from 'webdriverio';
-import { startServer } from '../..';
+import { startServer } from '../server';
 import chaiAsPromised from 'chai-as-promised';
 import chai from 'chai';
 import { HOST, PORT, MOCHA_TIMEOUT } from '../utils';
@@ -11,6 +11,7 @@ chai.use(chaiAsPromised);
 const CAPS = {
   browserName: 'AppiumSafari',
   platformName: 'mac',
+  'appium:automationName': 'safari',
 };
 
 describe('Desktop SafariDriver', function () {

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

@@ -1,5 +1,5 @@
 import { remote } from 'webdriverio';
-import { startServer } from '../..';
+import { startServer } from '../server';
 import chaiAsPromised from 'chai-as-promised';
 import chai from 'chai';
 import Simctl from 'node-simctl';
@@ -13,6 +13,7 @@ const DEVICE_NAME = process.env.DEVICE_NAME || 'iPhone 11 Pro Max';
 const CAPS = {
   browserName: 'AppiumSafari',
   platformName: 'ios',
+  'appium:automationName': 'safari',
   'safari:useSimulator': true,
   'safari:platformVersion': PLATFORM_VERSION,
   'safari:deviceName': DEVICE_NAME,

package/test/server.js

@@ -0,0 +1,8 @@
+import { main as startAppium } from 'appium';
+
+async function startServer (port, address, relaxedSecurityEnabled = false) {
+  // https://github.com/appium/appium/blob/2.0/packages/schema/lib/appium-config.schema.json
+  return await startAppium({port, address, relaxedSecurityEnabled});
+}
+
+export { startServer };

package/build/lib/server.js

@@ -1,36 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.startServer = startServer;
-
-require("source-map-support/register");
-
-var _logger = _interopRequireDefault(require("./logger"));
-
-var _baseDriver = require("@appium/base-driver");
-
-var _driver = _interopRequireDefault(require("./driver"));
-
-async function startServer(port, address) {
-  let d = new _driver.default({
-    port,
-    address
-  });
-  let routeConfiguringFunction = (0, _baseDriver.routeConfiguringFunction)(d);
-  let server = await (0, _baseDriver.server)({
-    routeConfiguringFunction,
-    port,
-    hostname: address
-  });
-
-  _logger.default.info(`SafariDriver server listening on http://${address}:${port}`);
-
-  return server;
-}require('source-map-support').install();
-
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGliL3NlcnZlci5qcyIsIm5hbWVzIjpbInN0YXJ0U2VydmVyIiwicG9ydCIsImFkZHJlc3MiLCJkIiwiU2FmYXJpRHJpdmVyIiwicm91dGVDb25maWd1cmluZ0Z1bmN0aW9uIiwic2VydmVyIiwiaG9zdG5hbWUiLCJsb2ciLCJpbmZvIl0sInNvdXJjZVJvb3QiOiIuLi8uLiIsInNvdXJjZXMiOlsibGliL3NlcnZlci5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgbG9nIGZyb20gJy4vbG9nZ2VyJztcbmltcG9ydCB7XG4gIHNlcnZlciBhcyBiYXNlU2VydmVyLCByb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24gYXMgbWFrZVJvdXRlclxufSBmcm9tICdAYXBwaXVtL2Jhc2UtZHJpdmVyJztcbmltcG9ydCBTYWZhcmlEcml2ZXIgZnJvbSAnLi9kcml2ZXInO1xuXG5hc3luYyBmdW5jdGlvbiBzdGFydFNlcnZlciAocG9ydCwgYWRkcmVzcykge1xuICBsZXQgZCA9IG5ldyBTYWZhcmlEcml2ZXIoe3BvcnQsIGFkZHJlc3N9KTtcbiAgbGV0IHJvdXRlQ29uZmlndXJpbmdGdW5jdGlvbiA9IG1ha2VSb3V0ZXIoZCk7XG4gIGxldCBzZXJ2ZXIgPSBhd2FpdCBiYXNlU2VydmVyKHtyb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24sIHBvcnQsIGhvc3RuYW1lOiBhZGRyZXNzfSk7XG4gIGxvZy5pbmZvKGBTYWZhcmlEcml2ZXIgc2VydmVyIGxpc3RlbmluZyBvbiBodHRwOi8vJHthZGRyZXNzfToke3BvcnR9YCk7XG4gIHJldHVybiBzZXJ2ZXI7XG59XG5cbmV4cG9ydCB7IHN0YXJ0U2VydmVyIH07XG4iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUE7O0FBQ0E7O0FBR0E7O0FBRUEsZUFBZUEsV0FBZixDQUE0QkMsSUFBNUIsRUFBa0NDLE9BQWxDLEVBQTJDO0VBQ3pDLElBQUlDLENBQUMsR0FBRyxJQUFJQyxlQUFKLENBQWlCO0lBQUNILElBQUQ7SUFBT0M7RUFBUCxDQUFqQixDQUFSO0VBQ0EsSUFBSUcsd0JBQXdCLEdBQUcsMENBQVdGLENBQVgsQ0FBL0I7RUFDQSxJQUFJRyxNQUFNLEdBQUcsTUFBTSx3QkFBVztJQUFDRCx3QkFBRDtJQUEyQkosSUFBM0I7SUFBaUNNLFFBQVEsRUFBRUw7RUFBM0MsQ0FBWCxDQUFuQjs7RUFDQU0sZ0JBQUlDLElBQUosQ0FBVSwyQ0FBMENQLE9BQVEsSUFBR0QsSUFBSyxFQUFwRTs7RUFDQSxPQUFPSyxNQUFQO0FBQ0QifQ==

package/lib/server.js

@@ -1,15 +0,0 @@
-import log from './logger';
-import {
-  server as baseServer, routeConfiguringFunction as makeRouter
-} from '@appium/base-driver';
-import SafariDriver from './driver';
-
-async function startServer (port, address) {
-  let d = new SafariDriver({port, address});
-  let routeConfiguringFunction = makeRouter(d);
-  let server = await baseServer({routeConfiguringFunction, port, hostname: address});
-  log.info(`SafariDriver server listening on http://${address}:${port}`);
-  return server;
-}
-
-export { startServer };