appium-uiautomator2-driver 2.32.0 → 2.32.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/build/lib/commands/actions.js +10 -10
- package/build/lib/commands/actions.js.map +1 -1
- package/build/lib/commands/alert.js +3 -3
- package/build/lib/commands/alert.js.map +1 -1
- package/build/lib/commands/app-strings.d.ts.map +1 -1
- package/build/lib/commands/app-strings.js +3 -4
- package/build/lib/commands/app-strings.js.map +1 -1
- package/build/lib/commands/element.js +19 -19
- package/build/lib/commands/element.js.map +1 -1
- package/build/lib/commands/general.d.ts.map +1 -1
- package/build/lib/commands/general.js +17 -19
- package/build/lib/commands/general.js.map +1 -1
- package/build/lib/commands/gestures.js +11 -11
- package/build/lib/commands/gestures.js.map +1 -1
- package/build/lib/commands/touch.js +3 -3
- package/build/lib/commands/touch.js.map +1 -1
- package/build/lib/constraints.d.ts +0 -3
- package/build/lib/constraints.d.ts.map +1 -1
- package/build/lib/constraints.js +0 -3
- package/build/lib/constraints.js.map +1 -1
- package/build/lib/driver.d.ts +2 -4
- package/build/lib/driver.d.ts.map +1 -1
- package/build/lib/driver.js +36 -84
- package/build/lib/driver.js.map +1 -1
- package/build/lib/types.d.ts +7 -9
- package/build/lib/types.d.ts.map +1 -1
- package/build/lib/uiautomator2.d.ts +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/lib/commands/actions.js +10 -10
- package/lib/commands/alert.js +3 -3
- package/lib/commands/app-strings.js +3 -4
- package/lib/commands/element.js +19 -19
- package/lib/commands/general.js +17 -18
- package/lib/commands/gestures.js +11 -11
- package/lib/commands/touch.js +3 -3
- package/lib/constraints.ts +0 -3
- package/lib/driver.ts +44 -99
- package/lib/types.ts +7 -11
- package/npm-shrinkwrap.json +24 -24
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## [2.32.2](https://github.com/appium/appium-uiautomator2-driver/compare/v2.32.1...v2.32.2) (2023-10-18)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Miscellaneous Chores
|
|
5
|
+
|
|
6
|
+
* Remove the obsolete coverage-related stuff ([#677](https://github.com/appium/appium-uiautomator2-driver/issues/677)) ([977816e](https://github.com/appium/appium-uiautomator2-driver/commit/977816e6eaed4780a91225178d0d98aa8fa5c5b5))
|
|
7
|
+
|
|
8
|
+
## [2.32.1](https://github.com/appium/appium-uiautomator2-driver/compare/v2.32.0...v2.32.1) (2023-10-17)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Miscellaneous Chores
|
|
12
|
+
|
|
13
|
+
* Remove obsolete driver options ([#676](https://github.com/appium/appium-uiautomator2-driver/issues/676)) ([2a296dc](https://github.com/appium/appium-uiautomator2-driver/commit/2a296dc7a82e686f7cf811db72fe02bd143fca7b))
|
|
14
|
+
|
|
1
15
|
## [2.32.0](https://github.com/appium/appium-uiautomator2-driver/compare/v2.31.4...v2.32.0) (2023-10-17)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -8,35 +8,35 @@ const mixins_1 = require("./mixins");
|
|
|
8
8
|
*/
|
|
9
9
|
const ActionsMixin = {
|
|
10
10
|
async pressKeyCode(keycode, metastate, flags) {
|
|
11
|
-
await
|
|
11
|
+
await this.uiautomator2.jwproxy.command('/appium/device/press_keycode', 'POST', {
|
|
12
12
|
keycode,
|
|
13
13
|
metastate,
|
|
14
14
|
flags,
|
|
15
15
|
});
|
|
16
16
|
},
|
|
17
17
|
async longPressKeyCode(keycode, metastate, flags) {
|
|
18
|
-
await
|
|
18
|
+
await this.uiautomator2.jwproxy.command('/appium/device/long_press_keycode', 'POST', {
|
|
19
19
|
keycode,
|
|
20
20
|
metastate,
|
|
21
21
|
flags,
|
|
22
22
|
});
|
|
23
23
|
},
|
|
24
24
|
async doSwipe(swipeOpts) {
|
|
25
|
-
await
|
|
25
|
+
await this.uiautomator2.jwproxy.command(`/touch/perform`, 'POST', swipeOpts);
|
|
26
26
|
},
|
|
27
27
|
async doDrag(dragOpts) {
|
|
28
|
-
await
|
|
28
|
+
await this.uiautomator2.jwproxy.command(`/touch/drag`, 'POST', dragOpts);
|
|
29
29
|
},
|
|
30
30
|
async getOrientation() {
|
|
31
|
-
return /** @type {import('@appium/types').Orientation} */ (await
|
|
31
|
+
return /** @type {import('@appium/types').Orientation} */ (await this.uiautomator2.jwproxy.command(`/orientation`, 'GET', {}));
|
|
32
32
|
},
|
|
33
33
|
async setOrientation(orientation) {
|
|
34
34
|
orientation = /** @type {import('@appium/types').Orientation} */ (orientation.toUpperCase());
|
|
35
|
-
await
|
|
35
|
+
await this.uiautomator2.jwproxy.command(`/orientation`, 'POST', { orientation });
|
|
36
36
|
},
|
|
37
37
|
async mobilePressKey(opts) {
|
|
38
38
|
const { keycode, metastate, flags, isLongPress = false } = opts;
|
|
39
|
-
await
|
|
39
|
+
await this.uiautomator2.jwproxy.command(`/appium/device/${isLongPress ? 'long_' : ''}press_keycode`, 'POST', {
|
|
40
40
|
keycode,
|
|
41
41
|
metastate,
|
|
42
42
|
flags,
|
|
@@ -47,19 +47,19 @@ const ActionsMixin = {
|
|
|
47
47
|
* @param {Record<string, any>} opts
|
|
48
48
|
*/
|
|
49
49
|
async mobileScheduleAction(opts = {}) {
|
|
50
|
-
return await
|
|
50
|
+
return await this.uiautomator2.jwproxy.command('/appium/schedule_action', 'POST', opts);
|
|
51
51
|
},
|
|
52
52
|
/**
|
|
53
53
|
* @see https://github.com/appium/appium-uiautomator2-driver/blob/master/docs/scheduled-actions.md#mobile-getactionhistory
|
|
54
54
|
*/
|
|
55
55
|
async mobileGetActionHistory(opts) {
|
|
56
|
-
return /** @type {import('./types').ActionResult} */ (await
|
|
56
|
+
return /** @type {import('./types').ActionResult} */ (await this.uiautomator2.jwproxy.command('/appium/action_history', 'POST', opts ?? {}));
|
|
57
57
|
},
|
|
58
58
|
/**
|
|
59
59
|
* @see https://github.com/appium/appium-uiautomator2-driver/blob/master/docs/scheduled-actions.md#mobile-unscheduleaction
|
|
60
60
|
*/
|
|
61
61
|
async mobileUnscheduleAction(opts) {
|
|
62
|
-
return await
|
|
62
|
+
return await this.uiautomator2.jwproxy.command('/appium/unschedule_action', 'POST', opts ?? {});
|
|
63
63
|
},
|
|
64
64
|
};
|
|
65
65
|
(0, mixins_1.mixin)(ActionsMixin);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../lib/commands/actions.js"],"names":[],"mappings":";AAAA,YAAY;;AAEZ,qCAA+B;AAE/B;;;GAGG;AACH,MAAM,YAAY,GAAG;IACnB,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK;QAC1C,MAAM,
|
|
1
|
+
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../lib/commands/actions.js"],"names":[],"mappings":";AAAA,YAAY;;AAEZ,qCAA+B;AAE/B;;;GAGG;AACH,MAAM,YAAY,GAAG;IACnB,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK;QAC1C,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,8BAA8B,EAC9B,MAAM,EACN;YACE,OAAO;YACP,SAAS;YACT,KAAK;SACN,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK;QAC9C,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,mCAAmC,EACnC,MAAM,EACN;YACE,OAAO;YACP,SAAS;YACT,KAAK;SACN,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,SAAS;QACrB,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,gBAAgB,EAChB,MAAM,EACN,SAAS,CACV,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAAQ;QACnB,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,aAAa,EACb,MAAM,EACN,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,OAAO,kDAAkD,CAAC,CACxD,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,cAAc,EACd,KAAK,EACL,EAAE,CACH,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,WAAW;QAC9B,WAAW,GAAG,kDAAkD,CAAC,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;QAC7F,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,cAAc,EACd,MAAM,EACN,EAAC,WAAW,EAAC,CACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAAI;QACvB,MAAM,EAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,WAAW,GAAG,KAAK,EAAC,GAAG,IAAI,CAAC;QAE9D,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,kBAAkB,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,eAAe,EAC3D,MAAM,EACN;YACE,OAAO;YACP,SAAS;YACT,KAAK;SACN,CACF,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,oBAAoB,CAAC,IAAI,GAAG,EAAE;QAClC,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAC5C,yBAAyB,EACzB,MAAM,EACN,IAAI,CACL,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,sBAAsB,CAAC,IAAI;QAC/B,OAAO,6CAA6C,CAAC,CACnD,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,wBAAwB,EACxB,MAAM,EACN,IAAI,IAAI,EAAE,CACX,CACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,sBAAsB,CAAC,IAAI;QAC/B,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAC5C,2BAA2B,EAC3B,MAAM,EACN,IAAI,IAAI,EAAE,CACX,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,IAAA,cAAK,EAAC,YAAY,CAAC,CAAC;AAEpB;;GAEG"}
|
|
@@ -8,16 +8,16 @@ const mixins_1 = require("./mixins");
|
|
|
8
8
|
*/
|
|
9
9
|
const AlertMixin = {
|
|
10
10
|
async getAlertText() {
|
|
11
|
-
return String(await
|
|
11
|
+
return String(await this.uiautomator2.jwproxy.command('/alert/text', 'GET', {}));
|
|
12
12
|
},
|
|
13
13
|
async mobileAcceptAlert(opts = {}) {
|
|
14
|
-
await
|
|
14
|
+
await this.uiautomator2.jwproxy.command('/alert/accept', 'POST', opts);
|
|
15
15
|
},
|
|
16
16
|
async postAcceptAlert() {
|
|
17
17
|
await this.mobileAcceptAlert();
|
|
18
18
|
},
|
|
19
19
|
async mobileDismissAlert(opts = {}) {
|
|
20
|
-
await
|
|
20
|
+
await this.uiautomator2.jwproxy.command('/alert/dismiss', 'POST', opts);
|
|
21
21
|
},
|
|
22
22
|
async postDismissAlert() {
|
|
23
23
|
await this.mobileDismissAlert();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alert.js","sourceRoot":"","sources":["../../../lib/commands/alert.js"],"names":[],"mappings":";AAAA,YAAY;;AAEZ,qCAA+B;AAE/B;;;GAGG;AACH,MAAM,UAAU,GAAG;IACjB,KAAK,CAAC,YAAY;QAChB,OAAO,MAAM,CACX,MAAM,
|
|
1
|
+
{"version":3,"file":"alert.js","sourceRoot":"","sources":["../../../lib/commands/alert.js"],"names":[],"mappings":";AAAA,YAAY;;AAEZ,qCAA+B;AAE/B;;;GAGG;AACH,MAAM,UAAU,GAAG;IACjB,KAAK,CAAC,YAAY;QAChB,OAAO,MAAM,CACX,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,aAAa,EACb,KAAK,EACL,EAAE,CACH,CACF,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,iBAAiB,CAAC,IAAI,GAAG,EAAE;QAC/B,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,eAAe,EACf,MAAM,EACN,IAAI,CACL,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,eAAe;QACnB,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACjC,CAAC;IACD,KAAK,CAAC,kBAAkB,CAAC,IAAI,GAAG,EAAE;QAChC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,gBAAgB,EAChB,MAAM,EACN,IAAI,CACL,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,gBAAgB;QACpB,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAClC,CAAC;CACF,CAAC;AAEF,IAAA,cAAK,EAAC,UAAU,CAAC,CAAC;AAElB;;GAEG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-strings.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-strings.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"app-strings.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-strings.js"],"names":[],"mappings":"kBA6Fa,OAAO,YAAY,EAAE,GAAG;2BACxB,OAAO,eAAe,EAAE,YAAY"}
|
|
@@ -13,9 +13,8 @@ const support_1 = require("appium/support");
|
|
|
13
13
|
*/
|
|
14
14
|
const AppStringsMixin = {
|
|
15
15
|
async getStrings(language) {
|
|
16
|
-
const adb = /** @type {ADB} */ (this.adb);
|
|
17
16
|
if (!language) {
|
|
18
|
-
language = await adb.getDeviceLanguage();
|
|
17
|
+
language = await this.adb.getDeviceLanguage();
|
|
19
18
|
this.log.info(`No language specified, returning strings for: ${language}`);
|
|
20
19
|
}
|
|
21
20
|
/**
|
|
@@ -44,7 +43,7 @@ const AppStringsMixin = {
|
|
|
44
43
|
try {
|
|
45
44
|
if (!app) {
|
|
46
45
|
try {
|
|
47
|
-
app = await adb.pullApk(/** @type {string} */ (this.opts.appPackage), tmpRoot);
|
|
46
|
+
app = await this.adb.pullApk(/** @type {string} */ (this.opts.appPackage), tmpRoot);
|
|
48
47
|
}
|
|
49
48
|
catch (err) {
|
|
50
49
|
this.log.errorAndThrow(`Failed to pull an apk from '${this.opts.appPackage}'. Original error: ${
|
|
@@ -57,7 +56,7 @@ const AppStringsMixin = {
|
|
|
57
56
|
throw new Error(); // unreachable
|
|
58
57
|
}
|
|
59
58
|
try {
|
|
60
|
-
const { apkStrings } = await adb.extractStringsFromApk(app, language, tmpRoot);
|
|
59
|
+
const { apkStrings } = await this.adb.extractStringsFromApk(app, language, tmpRoot);
|
|
61
60
|
this.apkStrings[language] = apkStrings;
|
|
62
61
|
return preprocessStringsMap(apkStrings);
|
|
63
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-strings.js","sourceRoot":"","sources":["../../../lib/commands/app-strings.js"],"names":[],"mappings":";AAAA,YAAY;;;;;AAEZ,qCAA+B;AAC/B,oDAAuB;AACvB,4CAA2C;AAE3C;;;GAGG;AACH,MAAM,eAAe,GAAG;IACtB,KAAK,CAAC,UAAU,CAAC,QAAQ;QACvB,
|
|
1
|
+
{"version":3,"file":"app-strings.js","sourceRoot":"","sources":["../../../lib/commands/app-strings.js"],"names":[],"mappings":"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"}
|
|
@@ -23,10 +23,10 @@ function toBool(s) {
|
|
|
23
23
|
*/
|
|
24
24
|
const ElementMixin = {
|
|
25
25
|
async active() {
|
|
26
|
-
return /** @type {import('@appium/types').Element} */ (await
|
|
26
|
+
return /** @type {import('@appium/types').Element} */ (await this.uiautomator2.jwproxy.command('/element/active', 'GET'));
|
|
27
27
|
},
|
|
28
28
|
async getAttribute(attribute, elementId) {
|
|
29
|
-
return String(await
|
|
29
|
+
return String(await this.uiautomator2.jwproxy.command(`/element/${elementId}/attribute/${attribute}`, 'GET', {}));
|
|
30
30
|
},
|
|
31
31
|
async elementDisplayed(elementId) {
|
|
32
32
|
return toBool(await this.getAttribute('displayed', elementId));
|
|
@@ -38,48 +38,48 @@ const ElementMixin = {
|
|
|
38
38
|
return toBool(await this.getAttribute('selected', elementId));
|
|
39
39
|
},
|
|
40
40
|
async getName(elementId) {
|
|
41
|
-
return /** @type {string} */ (await
|
|
41
|
+
return /** @type {string} */ (await this.uiautomator2.jwproxy.command(`/element/${elementId}/name`, 'GET', {}));
|
|
42
42
|
},
|
|
43
43
|
async getLocation(elementId) {
|
|
44
|
-
return /** @type {import('@appium/types').Position} */ (await
|
|
44
|
+
return /** @type {import('@appium/types').Position} */ (await this.uiautomator2.jwproxy.command(`/element/${elementId}/location`, 'GET', {}));
|
|
45
45
|
},
|
|
46
46
|
async getSize(elementId) {
|
|
47
|
-
return /** @type {import('@appium/types').Size} */ (await
|
|
47
|
+
return /** @type {import('@appium/types').Size} */ (await this.uiautomator2.jwproxy.command(`/element/${elementId}/size`, 'GET', {}));
|
|
48
48
|
},
|
|
49
49
|
async touchLongClick(element, x, y, duration) {
|
|
50
50
|
let params = { element, x, y, duration };
|
|
51
|
-
await
|
|
51
|
+
await this.uiautomator2.jwproxy.command(`/touch/longclick`, 'POST', { params });
|
|
52
52
|
},
|
|
53
53
|
async touchDown(element, x, y) {
|
|
54
54
|
let params = { element, x, y };
|
|
55
|
-
await
|
|
55
|
+
await this.uiautomator2.jwproxy.command(`/touch/down`, 'POST', { params });
|
|
56
56
|
},
|
|
57
57
|
async touchUp(element, x, y) {
|
|
58
58
|
let params = { element, x, y };
|
|
59
|
-
await
|
|
59
|
+
await this.uiautomator2.jwproxy.command(`/touch/up`, 'POST', { params });
|
|
60
60
|
},
|
|
61
61
|
async touchMove(element, x, y) {
|
|
62
62
|
let params = { element, x, y };
|
|
63
|
-
await
|
|
63
|
+
await this.uiautomator2.jwproxy.command(`/touch/move`, 'POST', { params });
|
|
64
64
|
},
|
|
65
65
|
async doSetElementValue(params) {
|
|
66
|
-
await
|
|
66
|
+
await this.uiautomator2.jwproxy.command(`/element/${params.elementId}/value`, 'POST', params);
|
|
67
67
|
},
|
|
68
68
|
async setValueImmediate(keys, elementId) {
|
|
69
|
-
await
|
|
69
|
+
await this.uiautomator2.jwproxy.command(`/element/${elementId}/value`, 'POST', {
|
|
70
70
|
elementId,
|
|
71
71
|
text: lodash_1.default.isArray(keys) ? keys.join('') : keys,
|
|
72
72
|
replace: false,
|
|
73
73
|
});
|
|
74
74
|
},
|
|
75
75
|
async getText(elementId) {
|
|
76
|
-
return String(await
|
|
76
|
+
return String(await this.uiautomator2.jwproxy.command(`/element/${elementId}/text`, 'GET', {}));
|
|
77
77
|
},
|
|
78
78
|
async click(element) {
|
|
79
|
-
await
|
|
79
|
+
await this.uiautomator2.jwproxy.command(`/element/${element}/click`, 'POST', { element });
|
|
80
80
|
},
|
|
81
81
|
async getElementScreenshot(element) {
|
|
82
|
-
return String(await
|
|
82
|
+
return String(await this.uiautomator2.jwproxy.command(`/element/${element}/screenshot`, 'GET', {}));
|
|
83
83
|
},
|
|
84
84
|
async tap(elementId = null, x = null, y = null, count = 1) {
|
|
85
85
|
const areCoordinatesDefined = support_1.util.hasValue(x) && support_1.util.hasValue(y);
|
|
@@ -90,10 +90,10 @@ const ElementMixin = {
|
|
|
90
90
|
if (support_1.util.hasValue(elementId) && !areCoordinatesDefined) {
|
|
91
91
|
// we are either tapping on the default location of the element
|
|
92
92
|
// or an offset from the top left corner
|
|
93
|
-
await
|
|
93
|
+
await this.uiautomator2.jwproxy.command(`/element/${elementId}/click`, 'POST');
|
|
94
94
|
}
|
|
95
95
|
else {
|
|
96
|
-
await
|
|
96
|
+
await this.uiautomator2.jwproxy.command(`/appium/tap`, 'POST', {
|
|
97
97
|
x,
|
|
98
98
|
y,
|
|
99
99
|
[driver_1.W3C_ELEMENT_KEY]: elementId,
|
|
@@ -102,7 +102,7 @@ const ElementMixin = {
|
|
|
102
102
|
}
|
|
103
103
|
},
|
|
104
104
|
async clear(elementId) {
|
|
105
|
-
await
|
|
105
|
+
await this.uiautomator2.jwproxy.command(`/element/${elementId}/clear`, 'POST', {
|
|
106
106
|
elementId,
|
|
107
107
|
});
|
|
108
108
|
},
|
|
@@ -120,7 +120,7 @@ const ElementMixin = {
|
|
|
120
120
|
}
|
|
121
121
|
return /** @type {import('@appium/types').Rect} */ (await chromedriver.jwproxy.command(`/element/${elementId}/rect`, 'GET'));
|
|
122
122
|
}
|
|
123
|
-
return /** @type {import('@appium/types').Rect} */ (await
|
|
123
|
+
return /** @type {import('@appium/types').Rect} */ (await this.uiautomator2.jwproxy.command(`/element/${elementId}/rect`, 'GET'));
|
|
124
124
|
},
|
|
125
125
|
/**
|
|
126
126
|
* Sends text to the given element by replacing its previous content
|
|
@@ -130,7 +130,7 @@ const ElementMixin = {
|
|
|
130
130
|
*/
|
|
131
131
|
async mobileReplaceElementValue(opts) {
|
|
132
132
|
const { elementId, text } = (0, utils_1.requireArgs)(['elementId', 'text'], opts);
|
|
133
|
-
await
|
|
133
|
+
await this.uiautomator2.jwproxy.command(`/element/${elementId}/value`, 'POST', {
|
|
134
134
|
text,
|
|
135
135
|
replace: true,
|
|
136
136
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"element.js","sourceRoot":"","sources":["../../../lib/commands/element.js"],"names":[],"mappings":";AAAA,YAAY;;;;;AAEZ,wDAAyB;AACzB,oDAAuB;AACvB,4CAAoC;AACpC,0CAAyD;AACzD,oCAAqC;AACrC,qCAA+B;AAE/B;;;GAGG;AACH,SAAS,MAAM,CAAC,CAAC;IACf,OAAO,gBAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED;;;GAGG;AACH,MAAM,YAAY,GAAG;IACnB,KAAK,CAAC,MAAM;QACV,OAAO,8CAA8C,CAAC,CACpD,MAAM,
|
|
1
|
+
{"version":3,"file":"element.js","sourceRoot":"","sources":["../../../lib/commands/element.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":"iCAyRa,OAAO,iBAAiB,EAAE,kBAAkB;kBAC5C,OAAO,YAAY,EAAE,GAAG;oCAKxB,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC"}
|
|
@@ -53,29 +53,28 @@ function toExecuteMethodName(script) {
|
|
|
53
53
|
*/
|
|
54
54
|
const GeneralMixin = {
|
|
55
55
|
async getPageSource() {
|
|
56
|
-
return String(await
|
|
56
|
+
return String(await this.uiautomator2.jwproxy.command('/source', 'GET', {}));
|
|
57
57
|
},
|
|
58
58
|
async getClipboard() {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
: await adb.getClipboard());
|
|
59
|
+
return String((await this.adb.getApiLevel()) < 29
|
|
60
|
+
? await this.uiautomator2.jwproxy.command('/appium/device/get_clipboard', 'POST', {})
|
|
61
|
+
: await this.adb.getClipboard());
|
|
63
62
|
},
|
|
64
63
|
async doSendKeys(params) {
|
|
65
|
-
await
|
|
64
|
+
await this.uiautomator2.jwproxy.command('/keys', 'POST', params);
|
|
66
65
|
},
|
|
67
66
|
async keyevent(keycode, metastate) {
|
|
68
67
|
this.log.debug(`Ignoring metastate ${metastate}`);
|
|
69
|
-
await
|
|
68
|
+
await this.adb.keyevent(keycode);
|
|
70
69
|
},
|
|
71
70
|
async back() {
|
|
72
|
-
await
|
|
71
|
+
await this.adb.keyevent(4);
|
|
73
72
|
},
|
|
74
73
|
async getDisplayDensity() {
|
|
75
|
-
return /** @type {number} */ (await
|
|
74
|
+
return /** @type {number} */ (await this.uiautomator2.jwproxy.command('/appium/device/display_density', 'GET', {}));
|
|
76
75
|
},
|
|
77
76
|
async getWindowSize() {
|
|
78
|
-
return /** @type {import('@appium/types').Size} */ (await
|
|
77
|
+
return /** @type {import('@appium/types').Size} */ (await this.uiautomator2.jwproxy.command('/window/current/size', 'GET', {}));
|
|
79
78
|
},
|
|
80
79
|
// For W3C
|
|
81
80
|
async getWindowRect() {
|
|
@@ -140,24 +139,23 @@ const GeneralMixin = {
|
|
|
140
139
|
return await this.getViewPortRect();
|
|
141
140
|
},
|
|
142
141
|
async setUrl(url) {
|
|
143
|
-
await
|
|
142
|
+
await this.adb.startUri(url, /** @type {string} */ (this.opts.appPackage));
|
|
144
143
|
},
|
|
145
144
|
/**
|
|
146
145
|
* Start URL that take users directly to specific content in the app
|
|
147
146
|
*/
|
|
148
147
|
async mobileDeepLink(opts) {
|
|
149
148
|
const { url, package: pkg, waitForLaunch } = opts;
|
|
150
|
-
return await
|
|
149
|
+
return await this.adb.startUri(url, pkg, { waitForLaunch });
|
|
151
150
|
},
|
|
152
151
|
async openNotifications() {
|
|
153
|
-
await
|
|
152
|
+
await this.uiautomator2.jwproxy.command('/appium/device/open_notifications', 'POST', {});
|
|
154
153
|
},
|
|
155
154
|
// Stop proxying to any Chromedriver and redirect to uiautomator2
|
|
156
155
|
suspendChromedriverProxy() {
|
|
157
156
|
this.chromedriver = undefined;
|
|
158
|
-
this.proxyReqRes =
|
|
159
|
-
this.proxyCommand = /** @type {typeof this.proxyCommand} */ (
|
|
160
|
-
/** @type {UiAutomator2Server} */ (this.uiautomator2).proxyCommand.bind(this.uiautomator2));
|
|
157
|
+
this.proxyReqRes = this.uiautomator2.proxyReqRes.bind(this.uiautomator2);
|
|
158
|
+
this.proxyCommand = /** @type {typeof this.proxyCommand} */ (this.uiautomator2.proxyCommand.bind(this.uiautomator2));
|
|
161
159
|
this.jwpProxyActive = true;
|
|
162
160
|
},
|
|
163
161
|
/**
|
|
@@ -165,7 +163,7 @@ const GeneralMixin = {
|
|
|
165
163
|
* https://github.com/appium/appium-uiautomator2-server/blob/master/app/src/main/java/io/appium/uiautomator2/handler/GetDeviceInfo.java
|
|
166
164
|
*/
|
|
167
165
|
async mobileGetDeviceInfo() {
|
|
168
|
-
return /** @type {StringRecord} */ (await
|
|
166
|
+
return /** @type {StringRecord} */ (await this.uiautomator2.jwproxy.command('/appium/device/info', 'GET'));
|
|
169
167
|
},
|
|
170
168
|
/**
|
|
171
169
|
* Types the given Unicode string.
|
|
@@ -181,7 +179,7 @@ const GeneralMixin = {
|
|
|
181
179
|
this.log.errorAndThrow(`The 'text' argument is mandatory`);
|
|
182
180
|
throw new Error(); // unreachable
|
|
183
181
|
}
|
|
184
|
-
return await
|
|
182
|
+
return await this.adb.typeUnicode(String(text));
|
|
185
183
|
},
|
|
186
184
|
/**
|
|
187
185
|
* Install multiple APKs with `install-multiple` option.
|
|
@@ -193,7 +191,7 @@ const GeneralMixin = {
|
|
|
193
191
|
throw new driver_1.errors.InvalidArgumentError('No apks are given to install');
|
|
194
192
|
}
|
|
195
193
|
const apks = await bluebird_1.default.all(opts.apks.map((app) => this.helpers.configureApp(app, [extensions_1.APK_EXTENSION])));
|
|
196
|
-
await
|
|
194
|
+
await this.adb.installMultipleApks(apks, opts.options);
|
|
197
195
|
},
|
|
198
196
|
/**
|
|
199
197
|
* Puts the app to background and waits the given number of seconds Then restores the app
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"general.js","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":";AAAA,YAAY;;;;;AAEZ,oDAAuB;AACvB,wDAAyB;AACzB,0CAAgD;AAChD,8CAA4C;AAC5C,qCAA+B;AAC/B,sCAAoD;AAEpD,MAAM,yBAAyB,GAAG,SAAS,CAAC;AAE5C;;;;;;;;GAQG;AACH,SAAS,2BAA2B,CAAC,IAAI;IACvC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,IAAI,GAAG,gBAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;KACtB;IACD,MAAM,iBAAiB,GAAG,oCAAoC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAC5E;;;;OAIG;IACH,IAAI,CAAC,CAAC,WAAW,IAAI,iBAAiB,CAAC,IAAI,SAAS,IAAI,iBAAiB,EAAE;QACzE,iBAAiB,CAAC,SAAS,GAAG,iBAAiB,CAAC,OAAO,CAAC;QACxD,OAAO,iBAAiB,CAAC,OAAO,CAAC;KAClC;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED;;;;;GAKG;AACH,SAAS,mBAAmB,CAAC,MAAM;IACjC,OAAO,gBAAC,CAAC,UAAU,CAAC,MAAM,EAAE,yBAAyB,CAAC;QACpD,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,yBAAyB,MAAM,CAAC,EAAE,GAAG,yBAAyB,GAAG,CAAC;QACjG,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED;;;GAGG;AACH,MAAM,YAAY,GAAG;IACnB,KAAK,CAAC,aAAa;QACjB,OAAO,MAAM,CACX,MAAM,
|
|
1
|
+
{"version":3,"file":"general.js","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":";AAAA,YAAY;;;;;AAEZ,oDAAuB;AACvB,wDAAyB;AACzB,0CAAgD;AAChD,8CAA4C;AAC5C,qCAA+B;AAC/B,sCAAoD;AAEpD,MAAM,yBAAyB,GAAG,SAAS,CAAC;AAE5C;;;;;;;;GAQG;AACH,SAAS,2BAA2B,CAAC,IAAI;IACvC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,IAAI,GAAG,gBAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;KACtB;IACD,MAAM,iBAAiB,GAAG,oCAAoC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAC5E;;;;OAIG;IACH,IAAI,CAAC,CAAC,WAAW,IAAI,iBAAiB,CAAC,IAAI,SAAS,IAAI,iBAAiB,EAAE;QACzE,iBAAiB,CAAC,SAAS,GAAG,iBAAiB,CAAC,OAAO,CAAC;QACxD,OAAO,iBAAiB,CAAC,OAAO,CAAC;KAClC;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED;;;;;GAKG;AACH,SAAS,mBAAmB,CAAC,MAAM;IACjC,OAAO,gBAAC,CAAC,UAAU,CAAC,MAAM,EAAE,yBAAyB,CAAC;QACpD,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,yBAAyB,MAAM,CAAC,EAAE,GAAG,yBAAyB,GAAG,CAAC;QACjG,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED;;;GAGG;AACH,MAAM,YAAY,GAAG;IACnB,KAAK,CAAC,aAAa;QACjB,OAAO,MAAM,CACX,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,SAAS,EACT,KAAK,EACL,EAAE,CACH,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,OAAO,MAAM,CACX,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE;YACjC,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,8BAA8B,EAC9B,MAAM,EACN,EAAE,CACH;YACH,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAClC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAM;QACrB,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,OAAO,EACP,MAAM,EACN,MAAM,CACP,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS;QAC/B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,SAAS,EAAE,CAAC,CAAC;QAClD,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,OAAO,qBAAqB,CAAC,CAC3B,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,gCAAgC,EAChC,KAAK,EACL,EAAE,CACH,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,2CAA2C,CAAC,CACjD,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,sBAAsB,EACtB,KAAK,EACL,EAAE,CACH,CACF,CAAC;IACJ,CAAC;IAED,UAAU;IACV,KAAK,CAAC,aAAa;QACjB,MAAM,EAAC,KAAK,EAAE,MAAM,EAAC,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QACnD,OAAO;YACL,KAAK;YACL,MAAM;YACN,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;SACL,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI;QACxB,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACrD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACzC,IAAI,gBAAgB,IAAI,YAAY,IAAI,CAAC,YAAY,EAAE;YACrD,IAAI,gBAAgB,EAAE;gBACpB,MAAM,iBAAiB,GAAG,2BAA2B,CAAC,IAAI,CAAC,CAAC;gBAC5D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,gBAAgB,GAAG,CAAC,CAAC;gBACxD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;aACtE;YACD,gFAAgF;YAChF,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;SAClD;QACD,MAAM,QAAQ;QACZ,yDAAyD,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO;aAClF,kBAAkB,KAAK,kBAAS,CAAC,OAAO;YACzC,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,eAAe,CAAC;QACtB,OAAO,MAAM,yDAAyD,CAAC,CACrE,IAAI,CAAC,YAAY,CAClB,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE;YAClC,MAAM;YACN,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE;QACnC,IAAI,CAAC,CAAC,MAAM,IAAI,kCAAyB,CAAC,gBAAgB,CAAC,EAAE;YAC3D,MAAM,YAAY,GAAG,gBAAC,CAAC,GAAG,CACxB,gBAAC,CAAC,IAAI,CAAC,kCAAyB,CAAC,gBAAgB,CAAC,EAClD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAC1B,CAAC;YACF,MAAM,IAAI,eAAM,CAAC,mBAAmB,CAClC,2BAA2B,MAAM,KAAK;gBACpC,QAAQ,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAC5D,CAAC;SACH;QACD,MAAM,UAAU,GACd,kCAAyB,CAAC,gBAAgB;QACxC,iFAAiF,CAAC,CAAC,MAAM,CAAC,CAC3F,CAAC,OAAO,CAAC;QAEZ,OAAO,MAAM,+CAA+C,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACxF,CAAC;IAED,KAAK,CAAC,wBAAwB;QAC5B,OAAO,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC5C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,kBAAkB;QACtB,OAAO,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAG;QACd,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAAC,IAAI;QACvB,MAAM,EAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC;QAChD,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,EAAC,aAAa,EAAC,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,mCAAmC,EACnC,MAAM,EACN,EAAE,CACH,CAAC;IACJ,CAAC;IAED,iEAAiE;IACjE,wBAAwB;QACtB,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;QAC9B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CACnD,IAAI,CAAC,YAAY,CAClB,CAAC;QACF,IAAI,CAAC,YAAY,GAAG,uCAAuC,CAAC,CAC1D,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CACvD,CAAC;QACF,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC7B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,mBAAmB;QACvB,OAAO,2BAA2B,CAAC,CACjC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CACrC,qBAAqB,EACrB,KAAK,CACN,CACF,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,UAAU,CAAC,IAAI;QACnB,MAAM,EAAC,IAAI,EAAC,GAAG,IAAI,CAAC;QACpB,IAAI,gBAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YACvB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,kCAAkC,CAAC,CAAC;YAC3D,MAAM,IAAI,KAAK,EAAE,CAAC,CAAC,cAAc;SAClC;QACD,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,yBAAyB,CAAC,IAAI;QAClC,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACjD,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,8BAA8B,CAAC,CAAC;SACvE;QACD,MAAM,IAAI,GAAG,MAAM,kBAAC,CAAC,GAAG,CACtB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,0BAAa,CAAC,CAAC,CAAC,CACxE,CAAC;QACF,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,mBAAmB,CAAC,IAAI,GAAG,EAAE;QACjC,MAAM,EAAC,OAAO,GAAG,CAAC,CAAC,EAAC,GAAG,IAAI,CAAC;QAC5B,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;CACF,CAAC;AAEF,IAAA,cAAK,EAAC,YAAY,CAAC,CAAC;AAEpB;;;GAGG;AAEH;;;GAGG"}
|
|
@@ -50,7 +50,7 @@ const GesturesMixin = {
|
|
|
50
50
|
*/
|
|
51
51
|
async mobileClickGesture(opts = {}) {
|
|
52
52
|
const { elementId, x, y } = opts;
|
|
53
|
-
await
|
|
53
|
+
await this.uiautomator2.jwproxy.command('/appium/gestures/click', 'POST', {
|
|
54
54
|
origin: toOrigin(elementId),
|
|
55
55
|
offset: toPoint(x, y),
|
|
56
56
|
});
|
|
@@ -62,7 +62,7 @@ const GesturesMixin = {
|
|
|
62
62
|
*/
|
|
63
63
|
async mobileLongClickGesture(opts = {}) {
|
|
64
64
|
const { elementId, x, y, duration } = opts;
|
|
65
|
-
await
|
|
65
|
+
await this.uiautomator2.jwproxy.command('/appium/gestures/long_click', 'POST', {
|
|
66
66
|
origin: toOrigin(elementId),
|
|
67
67
|
offset: toPoint(x, y),
|
|
68
68
|
duration,
|
|
@@ -75,7 +75,7 @@ const GesturesMixin = {
|
|
|
75
75
|
*/
|
|
76
76
|
async mobileDoubleClickGesture(opts = {}) {
|
|
77
77
|
const { elementId, x, y } = opts;
|
|
78
|
-
await
|
|
78
|
+
await this.uiautomator2.jwproxy.command('/appium/gestures/double_click', 'POST', {
|
|
79
79
|
origin: toOrigin(elementId),
|
|
80
80
|
offset: toPoint(x, y),
|
|
81
81
|
});
|
|
@@ -87,7 +87,7 @@ const GesturesMixin = {
|
|
|
87
87
|
*/
|
|
88
88
|
async mobileDragGesture(opts) {
|
|
89
89
|
const { elementId, startX, startY, endX, endY, speed } = opts;
|
|
90
|
-
await
|
|
90
|
+
await this.uiautomator2.jwproxy.command('/appium/gestures/drag', 'POST', {
|
|
91
91
|
origin: toOrigin(elementId),
|
|
92
92
|
start: toPoint(startX, startY),
|
|
93
93
|
end: toPoint(endX, endY),
|
|
@@ -102,7 +102,7 @@ const GesturesMixin = {
|
|
|
102
102
|
*/
|
|
103
103
|
async mobileFlingGesture(opts) {
|
|
104
104
|
const { elementId, left, top, width, height, direction, speed } = opts;
|
|
105
|
-
return /** @type {boolean} */ (await
|
|
105
|
+
return /** @type {boolean} */ (await this.uiautomator2.jwproxy.command('/appium/gestures/fling', 'POST', {
|
|
106
106
|
origin: toOrigin(elementId),
|
|
107
107
|
area: toRect(left, top, width, height),
|
|
108
108
|
direction,
|
|
@@ -116,7 +116,7 @@ const GesturesMixin = {
|
|
|
116
116
|
*/
|
|
117
117
|
async mobilePinchCloseGesture(opts) {
|
|
118
118
|
const { elementId, left, top, width, height, percent, speed } = opts;
|
|
119
|
-
await
|
|
119
|
+
await this.uiautomator2.jwproxy.command('/appium/gestures/pinch_close', 'POST', {
|
|
120
120
|
origin: toOrigin(elementId),
|
|
121
121
|
area: toRect(left, top, width, height),
|
|
122
122
|
percent,
|
|
@@ -130,7 +130,7 @@ const GesturesMixin = {
|
|
|
130
130
|
*/
|
|
131
131
|
async mobilePinchOpenGesture(opts) {
|
|
132
132
|
const { elementId, left, top, width, height, percent, speed } = opts;
|
|
133
|
-
await
|
|
133
|
+
await this.uiautomator2.jwproxy.command('/appium/gestures/pinch_open', 'POST', {
|
|
134
134
|
origin: toOrigin(elementId),
|
|
135
135
|
area: toRect(left, top, width, height),
|
|
136
136
|
percent,
|
|
@@ -144,7 +144,7 @@ const GesturesMixin = {
|
|
|
144
144
|
*/
|
|
145
145
|
async mobileSwipeGesture(opts) {
|
|
146
146
|
const { elementId, left, top, width, height, direction, percent, speed } = opts;
|
|
147
|
-
await
|
|
147
|
+
await this.uiautomator2.jwproxy.command('/appium/gestures/swipe', 'POST', {
|
|
148
148
|
origin: toOrigin(elementId),
|
|
149
149
|
area: toRect(left, top, width, height),
|
|
150
150
|
direction,
|
|
@@ -160,7 +160,7 @@ const GesturesMixin = {
|
|
|
160
160
|
*/
|
|
161
161
|
async mobileScrollGesture(opts) {
|
|
162
162
|
const { elementId, left, top, width, height, direction, percent, speed } = opts;
|
|
163
|
-
return /** @type {boolean} */ (await
|
|
163
|
+
return /** @type {boolean} */ (await this.uiautomator2.jwproxy.command('/appium/gestures/scroll', 'POST', {
|
|
164
164
|
origin: toOrigin(elementId),
|
|
165
165
|
area: toRect(left, top, width, height),
|
|
166
166
|
direction,
|
|
@@ -183,7 +183,7 @@ const GesturesMixin = {
|
|
|
183
183
|
if (!elementId || !elementToId) {
|
|
184
184
|
throw new driver_1.errors.InvalidArgumentError(`Both elementId and elementToId arguments must be provided`);
|
|
185
185
|
}
|
|
186
|
-
await
|
|
186
|
+
await this.uiautomator2.jwproxy.command(`/appium/element/${support_1.util.unwrapElement(elementId)}/scroll_to/${support_1.util.unwrapElement(elementToId)}`, 'POST', {});
|
|
187
187
|
},
|
|
188
188
|
/**
|
|
189
189
|
* Scrolls the given scrollable element until the element identified
|
|
@@ -201,7 +201,7 @@ const GesturesMixin = {
|
|
|
201
201
|
if (!strategy || !selector) {
|
|
202
202
|
throw new driver_1.errors.InvalidArgumentError(`Both strategy and selector arguments must be provided`);
|
|
203
203
|
}
|
|
204
|
-
await
|
|
204
|
+
await this.uiautomator2.jwproxy.command('/touch/scroll', 'POST', {
|
|
205
205
|
origin: toOrigin(elementId || element),
|
|
206
206
|
params: { strategy, selector, maxSwipes },
|
|
207
207
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gestures.js","sourceRoot":"","sources":["../../../lib/commands/gestures.js"],"names":[],"mappings":";;;;;AAAA,YAAY;AACZ,qCAA+B;AAC/B,4CAAoC;AACpC,oDAAuB;AACvB,0CAAqC;AAErC;;;;GAIG;AACH,SAAS,QAAQ,CAAC,OAAO;IACvB,OAAO,OAAO,CAAC,CAAC,CAAC,cAAI,CAAC,WAAW,CAAC,cAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7E,CAAC;AAED;;;;;GAKG;AACH,SAAS,OAAO,CAAC,CAAC,EAAE,CAAC;IACnB,OAAO,gBAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,gBAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM;IACtC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,gBAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAC,CAAC;AACjC,CAAC;AAED;;;GAGG;AACH,MAAM,aAAa,GAAG;IACpB;;;;OAIG;IACH,KAAK,CAAC,kBAAkB,CAAC,IAAI,GAAG,EAAE;QAChC,MAAM,EAAC,SAAS,EAAE,CAAC,EAAE,CAAC,EAAC,GAAG,IAAI,CAAC;QAC/B,MAAM,
|
|
1
|
+
{"version":3,"file":"gestures.js","sourceRoot":"","sources":["../../../lib/commands/gestures.js"],"names":[],"mappings":"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"}
|
|
@@ -14,13 +14,13 @@ const TouchMixin = {
|
|
|
14
14
|
elementId,
|
|
15
15
|
actions: states,
|
|
16
16
|
};
|
|
17
|
-
await
|
|
17
|
+
await this.uiautomator2.jwproxy.command('/touch/multi/perform', 'POST', opts);
|
|
18
18
|
}
|
|
19
19
|
else {
|
|
20
20
|
opts = {
|
|
21
21
|
actions: states,
|
|
22
22
|
};
|
|
23
|
-
await
|
|
23
|
+
await this.uiautomator2.jwproxy.command('/touch/multi/perform', 'POST', opts);
|
|
24
24
|
}
|
|
25
25
|
},
|
|
26
26
|
async performActions(actions) {
|
|
@@ -34,7 +34,7 @@ const TouchMixin = {
|
|
|
34
34
|
}
|
|
35
35
|
: {}));
|
|
36
36
|
this.log.debug(`Preprocessed actions: ${JSON.stringify(preprocessedActions, null, ' ')}`);
|
|
37
|
-
await
|
|
37
|
+
await this.uiautomator2.jwproxy.command('/actions', 'POST', {
|
|
38
38
|
actions: preprocessedActions,
|
|
39
39
|
});
|
|
40
40
|
},
|