appium-uiautomator2-driver 1.62.0 → 1.65.0

package/lib/commands/general.js

@@ -1,7 +1,9 @@
 import _ from 'lodash';
 import log from '../logger';
+import B from 'bluebird';
 import { errors, BASEDRIVER_HANDLED_SETTINGS } from 'appium-base-driver';
 import { fs, tempDir } from 'appium-support';
+import { APK_EXTENSION } from '../extensions';
 
 let extensions = {},
     commands = {},
@@ -109,6 +111,7 @@ extensions.executeMobile = async function (mobileCommand, opts = {}) {
 
     dragGesture: 'mobileDragGesture',
     flingGesture: 'mobileFlingGesture',
+    doubleClickGesture: 'mobileDoubleClickGesture',
     longClickGesture: 'mobileLongClickGesture',
     pinchCloseGesture: 'mobilePinchCloseGesture',
     pinchOpenGesture: 'mobilePinchOpenGesture',
@@ -154,6 +157,8 @@ extensions.executeMobile = async function (mobileCommand, opts = {}) {
     stopService: 'mobileStopService',
 
     getContexts: 'mobileGetContexts',
+
+    installMultipleApks: 'mobileInstallMultipleApks',
   };
 
   if (!_.has(mobileCommandsMapping, mobileCommand)) {
@@ -296,6 +301,46 @@ commands.mobileType = async function mobileType (opts = {}) {
   return await this.adb.typeUnicode(text);
 };
 
+
+/**
+ * @typedef {Object} InstallOptions
+ * @property {boolean} allowTestPackages [false] - Set to true in order to allow test
+ *                                                 packages installation.
+ * @property {boolean} useSdcard [false] - Set to true to install the app on sdcard
+ *                                         instead of the device memory.
+ * @property {boolean} grantPermissions [false] - Set to true in order to grant all the
+ *                                                permissions requested in the application's manifest
+ *                                                automatically after the installation is completed
+ *                                                under Android 6+.
+ * @property {boolean} replace [true] - Set it to false if you don't want
+ *                                      the application to be upgraded/reinstalled
+ *                                      if it is already present on the device.
+ * @property {boolean} partialInstall [false] - Install apks partially. It is used for 'install-multiple'.
+ *                                             https://android.stackexchange.com/questions/111064/what-is-a-partial-application-install-via-adb
+ */
+
+/**
+ * @typedef {Object} InstallMultipleApksOptions
+ * @property {Array<string>} apks - The list of APKs to install. Each APK should be a path to a apk
+ *                                  or downloadable URL as HTTP/HTTPS.
+ * @property {InstallOptions} options
+ */
+
+/**
+ * Install multiple APKs with `install-multiple` option.
+ *
+ * @param {InstallMultipleApksOptions} opts
+ * @throws {Error} if an error occured while installing the given APKs.
+ */
+commands.mobileInstallMultipleApks = async function (opts = {}) {
+  if (!_.isArray(opts.apks) || _.isEmpty(opts.apks)) {
+    throw new errors.InvalidArgumentError('No apks are given to install');
+  }
+  const apks = await B.all(opts.apks
+    .map((app) => this.helpers.configureApp(app, [APK_EXTENSION])));
+  await this.adb.installMultipleApks(apks, opts.options);
+};
+
 Object.assign(extensions, commands, helpers);
 
 export default extensions;

package/lib/commands/gestures.js

@@ -52,6 +52,33 @@ commands.mobileLongClickGesture = async function mobileLongClickGesture (opts =
   });
 };
 
+/**
+ * @typedef {Object} DoubleClickOptions
+ * @property {?string} elementId - The id of the element to be double clicked.
+ * If the element is missing then both click offset coordinates must be provided.
+ * If both the element id and offset are provided then the coordinates
+ * are parsed as relative offsets from the top left corner of the element.
+ * @property {?number} x - The x coordinate to double click on
+ * @property {?number} y - The y coordinate to double click on
+ */
+
+/**
+ * Performs a click that lasts for the given duration
+ *
+ * @param {?DoubleClickOptions} opts
+ * @throws {Error} if provided options are not valid
+ */
+commands.mobileDoubleClickGesture = async function mobileDoubleClickGesture (opts = {}) {
+  const {
+    elementId,
+    x, y,
+  } = opts;
+  return await this.uiautomator2.jwproxy.command('/appium/gestures/double_click', 'POST', {
+    origin: toOrigin(elementId),
+    offset: toPoint(x, y),
+  });
+};
+
 /**
  * @typedef {Object} DragOptions
  * @property {?string} elementId - The id of the element to be dragged.

package/lib/css-converter.js

@@ -11,6 +11,7 @@ parser.registerAttrEqualityMods('^', '$', '*', '~');
 parser.enableSubstitutes();
 
 const RESOURCE_ID = 'resource-id';
+const ID_LOCATOR_PATTERN = /^[a-zA-Z_][a-zA-Z0-9._]*:id\/[\S]+$/;
 
 const BOOLEAN_ATTRS = [
   'checkable', 'checked', 'clickable', 'enabled', 'focusable',
@@ -115,11 +116,11 @@ function getWordMatcherRegex (word) {
 /**
  * Add android:id/ to beginning of string if it's not there already
  *
- * @param {string} str
+ * @param {string} locator The initial locator
  * @returns {string} String with `android:id/` prepended (if it wasn't already)
  */
-function prependAndroidId (str) {
-  return str.startsWith('android:id/') ? str : `android:id/${str}`;
+function formatIdLocator (locator) {
+  return ID_LOCATOR_PATTERN.test(locator) ? locator : `android:id/${locator}`;
 }
 
 /**
@@ -157,7 +158,7 @@ function parseAttr (cssAttr) {
   // Otherwise parse as string
   let value = cssAttr.value || '';
   if (attrName === RESOURCE_ID) {
-    value = prependAndroidId(value);
+    value = formatIdLocator(value);
   }
   if (value === '') {
     return `.${methodName}Matches("")`;
@@ -254,7 +255,7 @@ function parseCssRule (cssRule) {
     uiAutomatorSelector += `.classNameMatches("${cssRule.classNames.join('\\.')}")`;
   }
   if (cssRule.id) {
-    uiAutomatorSelector += `.resourceId("${prependAndroidId(cssRule.id)}")`;
+    uiAutomatorSelector += `.resourceId("${formatIdLocator(cssRule.id)}")`;
   }
   if (cssRule.attrs) {
     for (const attr of cssRule.attrs) {

package/lib/driver.js

@@ -13,6 +13,7 @@ import desiredCapConstraints from './desired-caps';
 import { findAPortNotInUse } from 'portscanner';
 import os from 'os';
 import path from 'path';
+import { APK_EXTENSION, APKS_EXTENSION } from './extensions';
 
 
 const helpers = Object.assign({}, uiautomator2Helpers, androidHelpers);
@@ -121,8 +122,6 @@ const CHROME_NO_PROXY = [
   ['POST', new RegExp('^/session/[^/]+/execute$')],
   ['POST', new RegExp('^/session/[^/]+/execute/sync')],
 ];
-const APK_EXTENSION = '.apk';
-const APKS_EXTENSION = '.apks';
 
 const MEMOIZED_FUNCTIONS = [
   'getStatusBarHeight',

package/lib/extensions.js

@@ -0,0 +1,4 @@
+const APK_EXTENSION = '.apk';
+const APKS_EXTENSION = '.apks';
+
+export { APK_EXTENSION, APKS_EXTENSION };

package/lib/uiautomator2.js

@@ -265,6 +265,8 @@ class UiAutomator2Server {
     if (_.isBoolean(this.disableSuppressAccessibilityService)) {
       cmd.push('-e', 'DISABLE_SUPPRESS_ACCESSIBILITY_SERVICES', this.disableSuppressAccessibilityService);
     }
+    // Disable Google analytics to prevent possible fatal exception
+    cmd.push('-e', 'disableAnalytics', true);
     cmd.push(INSTRUMENTATION_TARGET);
     const instrumentationProcess = this.adb.createSubProcess(['shell', ...cmd]);
     instrumentationProcess.on('output', (stdout, stderr) => {

package/package.json

@@ -7,7 +7,7 @@
     "automated testing",
     "android"
   ],
-  "version": "1.62.0",
+  "version": "1.65.0",
   "author": "appium",
   "license": "Apache-2.0",
   "repository": {
@@ -41,14 +41,14 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "appium-adb": "^8.9.0",
+    "appium-adb": "^8.10.0",
     "appium-android-driver": "^4.40.0",
     "appium-base-driver": "^7.0.0",
     "appium-chromedriver": "^4.23.1",
     "appium-support": "^2.49.0",
-    "appium-uiautomator2-server": "^4.17.4",
+    "appium-uiautomator2-server": "^4.20.0",
     "asyncbox": "^2.3.1",
-    "axios": "^0.21.0",
+    "axios": "^0.x",
     "bluebird": "^3.5.1",
     "css-selector-parser": "^1.4.1",
     "lodash": "^4.17.4",
@@ -90,16 +90,16 @@
     "eslint-config-appium": "^4.0.1",
     "gps-demo-app": "^2.1.1",
     "gulp": "^4.0.0",
-    "mocha": "~8.2.1",
+    "mocha": "^8.2.1",
     "mocha-junit-reporter": "^2.0.0",
     "mocha-multi-reporters": "^1.1.7",
     "pngjs": "^6.0.0",
     "pre-commit": "^1.2.2",
     "rimraf": "^3.0.0",
-    "sinon": "^9.0.0",
+    "sinon": "^10.0.0",
     "unzipper": "^0.10.0",
     "wd": "^1.10.3",
-    "xmldom": "^0.4.0",
-    "xpath": "^0.0.32"
+    "xmldom": "^0.x",
+    "xpath": "^0.x"
   }
 }