appium-xcuitest-driver 7.8.2 → 7.9.1

package/lib/real-device.js

@@ -5,7 +5,7 @@ import B from 'bluebird';
 import defaultLogger from './logger';
 import _ from 'lodash';
 import {exec} from 'teen_process';
-import {extractBundleId} from './app-utils';
+import {extractBundleId, SAFARI_BUNDLE_ID} from './app-utils';
 import {pushFolder} from './ios-fs-helpers';
 import { Devicectl } from './devicectl';
 
@@ -20,6 +20,13 @@ const APP_INSTALL_STRATEGY = Object.freeze({
   IOS_DEPLOY,
 });
 
+/**
+ * @returns {Promise<string[]>}
+ */
+export async function getConnectedDevices() {
+  return await utilities.getConnectedDevices();
+}
+
 export class RealDevice {
   /**
    * @param {string} udid
@@ -317,6 +324,41 @@ export class RealDevice {
   async getPlatformVersion() {
     return await utilities.getOSVersion(this.udid);
   }
+
+  /**
+   * @param {import('./driver').XCUITestDriverOpts} opts
+   * @returns {Promise<void>}
+   */
+  async reset({bundleId, fullReset, platformVersion}) {
+    if (!bundleId) {
+      return;
+    }
+
+    if (bundleId === SAFARI_BUNDLE_ID) {
+      this.log.debug('Reset requested. About to terminate Safari');
+      await this.terminateApp(bundleId, String(platformVersion));
+      return;
+    }
+
+    if (!fullReset) {
+      return;
+    }
+
+    this.log.debug(`Reset: fullReset requested. Will try to uninstall the app '${bundleId}'.`);
+    if (!(await this.isAppInstalled(bundleId))) {
+      this.log.debug('Reset: app not installed. No need to uninstall');
+      return;
+    }
+
+    try {
+      await this.remove(bundleId);
+    } catch (err) {
+      this.log.error(`Reset: could not remove '${bundleId}' from device: ${err.message}`);
+      throw err;
+    }
+    this.log.debug(`Reset: removed '${bundleId}'`);
+  }
+
 }
 
 export default RealDevice;

package/lib/simulator-management.js

@@ -4,16 +4,9 @@ import {resetTestProcesses} from 'appium-webdriveragent';
 import _ from 'lodash';
 import {util, timing} from 'appium/support';
 import {UDID_AUTO, normalizePlatformName} from './utils';
+import {buildSafariPreferences} from './app-utils';
 
 const APPIUM_SIM_PREFIX = 'appiumTest';
-const SAFARI_OPTS_ALIASES_MAP = /** @type {const} */ ({
-  safariAllowPopups: [
-    ['WebKitJavaScriptCanOpenWindowsAutomatically', 'JavaScriptCanOpenWindowsAutomatically'],
-    (x) => Number(Boolean(x)),
-  ],
-  safariIgnoreFraudWarning: [['WarnAboutFraudulentWebsites'], (x) => Number(!x)],
-  safariOpenLinksInBackground: [['OpenLinksInBackground'], (x) => Number(Boolean(x))],
-});
 
 /**
  * Create a new simulator with `appiumTest-` prefix and return the object.
@@ -290,23 +283,13 @@ export async function shutdownOtherSimulators() {
  * @return {Promise<boolean>} true if any preferences have been updated
  */
 export async function setSafariPrefs() {
-  const safariSettings = _.cloneDeep(this.opts.safariGlobalPreferences ?? {});
-
-  for (const [name, [aliases, valueConverter]] of _.toPairs(SAFARI_OPTS_ALIASES_MAP)) {
-    if (!_.has(this.opts, name)) {
-      continue;
-    }
-
-    for (const alias of aliases) {
-      safariSettings[alias] = valueConverter(this.opts[name]);
-    }
-  }
-  if (_.isEmpty(safariSettings)) {
+  const prefs = buildSafariPreferences(this.opts);
+  if (_.isEmpty(prefs)) {
     return false;
   }
 
-  this.log.debug(`About to update Safari preferences: ${JSON.stringify(safariSettings)}`);
-  await /** @type {import('./driver').Simulator} */ (this.device).updateSafariSettings(safariSettings);
+  this.log.debug(`About to update Safari preferences: ${JSON.stringify(prefs)}`);
+  await /** @type {import('./driver').Simulator} */ (this.device).updateSafariSettings(prefs);
   return true;
 }
 

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-xcuitest-driver",
-  "version": "7.8.2",
+  "version": "7.9.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-xcuitest-driver",
-      "version": "7.8.2",
+      "version": "7.9.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@colors/colors": "^1.6.0",
@@ -14,7 +14,7 @@
         "appium-ios-device": "^2.5.4",
         "appium-ios-simulator": "^6.1.2",
         "appium-remote-debugger": "^11.0.0",
-        "appium-webdriveragent": "^8.3.0",
+        "appium-webdriveragent": "^8.3.1",
         "appium-xcode": "^5.1.4",
         "async-lock": "^1.4.0",
         "asyncbox": "^3.0.0",
@@ -717,9 +717,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.30",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz",
-      "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==",
+      "version": "20.12.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.2.tgz",
+      "integrity": "sha512-zQ0NYO87hyN6Xrclcqp7f8ZbXNbRfoGWNcMvHTPQp9UUrwI0mI7XBz+cu7/W6/VClYo2g63B0cjull/srU7LgQ==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -953,9 +953,9 @@
       }
     },
     "node_modules/appium-webdriveragent": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/appium-webdriveragent/-/appium-webdriveragent-8.3.0.tgz",
-      "integrity": "sha512-g8vEBH7VdLf/fzH3VIXtem2v5GUVSw+ilHzZfqGg9hOVqOZ4oZ2GfjSVo7mM4Jux1/CidG3gczTriIWgmD3WBA==",
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/appium-webdriveragent/-/appium-webdriveragent-8.3.1.tgz",
+      "integrity": "sha512-tofiPgPdutA+A7H380negfUYM5y7EH2zjljtH3+JMrOlsiSYVLTjK2HozWe7A7hkL3LBUinN7dcKPy8wjq1wJg==",
       "dependencies": {
         "@appium/base-driver": "^9.0.0",
         "@appium/strongbox": "^0.x",

package/package.json

@@ -8,7 +8,7 @@
     "xcuitest",
     "xctest"
   ],
-  "version": "7.8.2",
+  "version": "7.9.1",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {
@@ -81,7 +81,7 @@
     "appium-ios-device": "^2.5.4",
     "appium-ios-simulator": "^6.1.2",
     "appium-remote-debugger": "^11.0.0",
-    "appium-webdriveragent": "^8.3.0",
+    "appium-webdriveragent": "^8.3.1",
     "appium-xcode": "^5.1.4",
     "async-lock": "^1.4.0",
     "asyncbox": "^3.0.0",