appium-xcuitest-driver 4.33.1 → 4.34.0
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/general.d.ts.map +1 -1
- package/build/lib/commands/general.js +2 -1
- package/build/lib/commands/general.js.map +1 -1
- package/build/lib/commands/gesture.d.ts +1 -1
- package/build/lib/commands/gesture.d.ts.map +1 -1
- package/build/lib/commands/gesture.js +17 -11
- package/build/lib/commands/gesture.js.map +1 -1
- package/build/lib/commands/log.d.ts.map +1 -1
- package/build/lib/commands/log.js +1 -2
- package/build/lib/commands/log.js.map +1 -1
- package/build/lib/commands/web.d.ts.map +1 -1
- package/build/lib/commands/web.js +4 -7
- package/build/lib/commands/web.js.map +1 -1
- package/build/lib/driver.d.ts +1 -1
- package/lib/commands/general.js +6 -5
- package/lib/commands/gesture.js +38 -31
- package/lib/commands/log.js +1 -2
- package/lib/commands/web.js +49 -50
- package/package.json +3 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## [4.34.0](https://github.com/appium/appium-xcuitest-driver/compare/v4.33.2...v4.34.0) (2023-08-16)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* use new selenium atoms from remote debugger ([2707c01](https://github.com/appium/appium-xcuitest-driver/commit/2707c015a8990f0d666b35fefcfe15b368f9c605))
|
|
7
|
+
|
|
8
|
+
## [4.33.2](https://github.com/appium/appium-xcuitest-driver/compare/v4.33.1...v4.33.2) (2023-08-04)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* Args sequence for mobileTapWithNumberOfTaps ([4cb7430](https://github.com/appium/appium-xcuitest-driver/commit/4cb7430afae40307601711907fee89afb459ee48))
|
|
14
|
+
|
|
1
15
|
## [4.33.1](https://github.com/appium/appium-xcuitest-driver/compare/v4.33.0...v4.33.1) (2023-08-04)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":";IASE;;OAEG;IACH,iEAKC;IAED;;;;;OAKG;IACH,oFAEC;IACD;;;;;;OAMG;IACH,oGAEC;IACD;;;;OAIG;IACH,+FAYC;IAED;;;;;;OAMG;IACH,4FAsCC;IAED;;;;;;OAMG;IACH,kGAEC;IAED;;;OAGG;IACH;;;;;OAQC;IACD;;OAEG;IACH,uFAEC;IACD;;;;;OAKG;IACH,qEAaC;IACD;;;;OAIG;IACH,oEAaC;IACD;;OAEG;IACH,4EAiBC;IACD;;;;;;OAMG;IACH,iGAcC;IAED;;;;;;OAMG;IACH,iGAEC;IACD;;OAEG;IACH,gFAGC;IAED;;;OAGG;IACH,iFAGC;IAED;;;;;;;;;;;;;OAaG;IACH,u91BAQC;IACD;;;;;;;;OAQG;IACH,2FAKC;IAID;;OAEG;IACH,
|
|
1
|
+
{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":";IASE;;OAEG;IACH,iEAKC;IAED;;;;;OAKG;IACH,oFAEC;IACD;;;;;;OAMG;IACH,oGAEC;IACD;;;;OAIG;IACH,+FAYC;IAED;;;;;;OAMG;IACH,4FAsCC;IAED;;;;;;OAMG;IACH,kGAEC;IAED;;;OAGG;IACH;;;;;OAQC;IACD;;OAEG;IACH,uFAEC;IACD;;;;;OAKG;IACH,qEAaC;IACD;;;;OAIG;IACH,oEAaC;IACD;;OAEG;IACH,4EAiBC;IACD;;;;;;OAMG;IACH,iGAcC;IAED;;;;;;OAMG;IACH,iGAEC;IACD;;OAEG;IACH,gFAGC;IAED;;;OAGG;IACH,iFAGC;IAED;;;;;;;;;;;;;OAaG;IACH,u91BAQC;IACD;;;;;;;;OAQG;IACH,2FAKC;IAID;;OAEG;IACH,2EAGC;IACD;;OAEG;IACH,kFAEC;;;;;;;UAOW,MAAM;;;;;;6BAKP,OAAO,WAAW,EAAE,cAAc;yBAClC,OAAO,SAAS,EAAE,UAAU"}
|
|
@@ -273,7 +273,8 @@ const helpers = {
|
|
|
273
273
|
* @this {XCUITestDriver}
|
|
274
274
|
*/
|
|
275
275
|
async getWindowSizeWeb() {
|
|
276
|
-
return
|
|
276
|
+
const script = 'return {width: window.innerWidth, height: window.innerHeight}';
|
|
277
|
+
return await this.executeAtom('execute_script', [script]);
|
|
277
278
|
},
|
|
278
279
|
/**
|
|
279
280
|
* @this {XCUITestDriver}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"general.js","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"general.js","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":"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"}
|
|
@@ -244,7 +244,7 @@ declare namespace _default {
|
|
|
244
244
|
* @driver.execute_script 'mobile: tapWithNumberOfTaps', {element: e.ref, numberOfTaps: 2, numberOfTouches: 1}
|
|
245
245
|
* ```
|
|
246
246
|
*/
|
|
247
|
-
function mobileTapWithNumberOfTaps(this: import("../driver").default, elementId: string | import("@appium/types").Element<string>,
|
|
247
|
+
function mobileTapWithNumberOfTaps(this: import("../driver").default, elementId: string | import("@appium/types").Element<string>, numberOfTouches: number, numberOfTaps: number): Promise<void>;
|
|
248
248
|
/**
|
|
249
249
|
* Performs a "force press" on the given element or coordinates.
|
|
250
250
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gesture.d.ts","sourceRoot":"","sources":["../../../lib/commands/gesture.js"],"names":[],"mappings":"AAyEA;;;;;GAKG;AACH,gDAJW,GAAG,EAAE,kBACL,MAAM,EAAE,GAAC,IAAI,GACX,MAAM,CAmBlB;;IAGC;;;;;;;;OAQG;IACH,
|
|
1
|
+
{"version":3,"file":"gesture.d.ts","sourceRoot":"","sources":["../../../lib/commands/gesture.js"],"names":[],"mappings":"AAyEA;;;;;GAKG;AACH,gDAJW,GAAG,EAAE,kBACL,MAAM,EAAE,GAAC,IAAI,GACX,MAAM,CAmBlB;;IAGC;;;;;;;;OAQG;IACH,4JA2BC;IACD;;;;OAIG;IACH,uEAMC;IACD;;OAEG;IACH,yEA2BC;IACD;;OAEG;IAEH,0EAEC;IACD;;;;OAIG;IACH,6HA4BC;IACD;;;;;;OAMG;IACH,4FAcC;IACD;;;;;;;OAOG;IACH,iGAiBC;IACD;;;;OAIG;IACH,gIAIC;IAED;;;;;;;;;;;;;OAaG;IACH,8IAKC;IAID;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,wUAuCC;IACD;;;;;OAKG;IACH,2NAYC;IACD;;;;;;;;;;;;;;OAcG;IACH,kLAOC;IACD;;;;;;;;;;;;;OAaG;IACH,qMAWC;IACD;;;;;;;;;;;;;OAaG;IACH,wJAGC;IACD;;;;;;;;;;;;;;;;OAgBG;IACH,6NAYC;IACD;;;;;;;;OAQG;IACH,qKAMC;IACD;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,2OAcC;IACD;;;;;;;;;;;;;;;;OAgBG;IACH,6ZAoCC;IACD;;;;;;;;;;;;;;;;OAgBG;IACH,iMAWC;IACD;;;;;;;;;;;OAWG;IACH,oQAIC;IACD;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,sRAwBC;IACD;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,gLAYC;IACD;;OAEG;IACH;;;;OA2CC;IACD;;OAEG;IACH,kHASC;;;6BAMU,OAAO,WAAW,EAAE,cAAc;sBAClC,OAAO,eAAe,EAAE,OAAO"}
|
|
@@ -98,15 +98,8 @@ const commands = {
|
|
|
98
98
|
async moveTo(el, xoffset = 0, yoffset = 0) {
|
|
99
99
|
el = support_1.util.unwrapElement(el);
|
|
100
100
|
if (this.isWebContext()) {
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
x: x + xoffset,
|
|
104
|
-
y: y + yoffset,
|
|
105
|
-
};
|
|
106
|
-
this.curWebCoords = coords;
|
|
107
|
-
let atomsElement = this.getAtomsElement(el);
|
|
108
|
-
let relCoords = { x: xoffset, y: yoffset };
|
|
109
|
-
await this.executeAtom('move_mouse', [atomsElement, relCoords]);
|
|
101
|
+
throw new driver_1.errors.UnknownMethodError('The moveTo command is not available in the web context. Use the Actions API in the ' +
|
|
102
|
+
'native context instead');
|
|
110
103
|
}
|
|
111
104
|
else {
|
|
112
105
|
if (lodash_1.default.isNil(el)) {
|
|
@@ -156,7 +149,20 @@ const commands = {
|
|
|
156
149
|
}
|
|
157
150
|
else {
|
|
158
151
|
const atomsElement = this.getAtomsElement(el);
|
|
159
|
-
|
|
152
|
+
// clicking can cause an alert to pop up and freeze the event loop, meaning the click atom
|
|
153
|
+
// itself never returns. we have alert handling in `waitForAtom` but with click, we create
|
|
154
|
+
// a special case where if a click results in an unexpected alert error, we just return
|
|
155
|
+
// control to the client. they will encounter the error on their next command, which mirrors
|
|
156
|
+
// the behaviour of selenium.
|
|
157
|
+
try {
|
|
158
|
+
return await this.executeAtom('click', [atomsElement]);
|
|
159
|
+
}
|
|
160
|
+
catch (err) {
|
|
161
|
+
if (err.error === driver_1.errors.UnexpectedAlertOpenError.error()) {
|
|
162
|
+
return;
|
|
163
|
+
}
|
|
164
|
+
throw err;
|
|
165
|
+
}
|
|
160
166
|
}
|
|
161
167
|
},
|
|
162
168
|
/**
|
|
@@ -561,7 +567,7 @@ const helpers = {
|
|
|
561
567
|
* @driver.execute_script 'mobile: tapWithNumberOfTaps', {element: e.ref, numberOfTaps: 2, numberOfTouches: 1}
|
|
562
568
|
* ```
|
|
563
569
|
*/
|
|
564
|
-
async mobileTapWithNumberOfTaps(elementId,
|
|
570
|
+
async mobileTapWithNumberOfTaps(elementId, numberOfTouches, numberOfTaps) {
|
|
565
571
|
if (!elementId) {
|
|
566
572
|
throw new driver_1.errors.InvalidArgumentError('Element id is expected to be set for tapWithNumberOfTaps method');
|
|
567
573
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gesture.js","sourceRoot":"","sources":["../../../lib/commands/gesture.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"gesture.js","sourceRoot":"","sources":["../../../lib/commands/gesture.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../lib/commands/log.js"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../lib/commands/log.js"],"names":[],"mappings":";;IAuEE;;;;;OAKG;IACH;;mCAcC;IAED;;OAEG;IACH,qFAyCC;IAED;;;;;;;;;;;OAWG;IACH,2FA2DC;IAED;;;;;OAKG;IACH,0FAQC;;;;;;;eAlKW,MAAM;WACN,KAAK;aACL,MAAM;;6BAoKP,OAAO,WAAW,EAAE,cAAc;qCAIlC,MAAM,0BAA0B;2BAIhC,OAAO,eAAe,EAAE,YAAY;AA1NjD;;;GAGG;AACH,mCAHU,OAAO,eAAe,EAAE,YAAY,CAsC5C"}
|
|
@@ -12,7 +12,6 @@ const logger_1 = __importDefault(require("../logger"));
|
|
|
12
12
|
const ws_1 = __importDefault(require("ws"));
|
|
13
13
|
const safari_console_log_1 = __importDefault(require("../device-log/safari-console-log"));
|
|
14
14
|
const safari_network_log_1 = __importDefault(require("../device-log/safari-network-log"));
|
|
15
|
-
const types_1 = require("@appium/types");
|
|
16
15
|
/**
|
|
17
16
|
* Determines the websocket endpoint based on the `sessionId`
|
|
18
17
|
* @param {string} sessionId
|
|
@@ -191,7 +190,7 @@ exports.default = {
|
|
|
191
190
|
});
|
|
192
191
|
});
|
|
193
192
|
await /** @type {AppiumServer} */ (this.server).addWebSocketHandler(pathname,
|
|
194
|
-
/** @type {WSServer} */ (wss));
|
|
193
|
+
/** @type {import('@appium/types').WSServer} */ (wss));
|
|
195
194
|
},
|
|
196
195
|
/**
|
|
197
196
|
* Stops the syslog broadcasting wesocket server previously started by `mobile: startLogsBroadcast`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../lib/commands/log.js"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AACvB,0CAAyD;AACzD,+DAAwD;AACxD,uEAAgE;AAChE,iEAA0D;AAC1D,uDAA4B;AAC5B,4CAA2B;AAC3B,0FAAgE;AAChE,0FAAgE;
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../lib/commands/log.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../../lib/commands/web.js"],"names":[],"mappings":";IAkHE;;;OAGG;IACH,gFAyBC;IACD;;;OAGG;IACH,qGAOC;IACD;;;;;;OAMG;IACH,wHAOC;IACD;;;OAGG;IACH,mEAMC;IACD;;;OAGG;IACH,iEAMC;IACD;;;OAGG;IACH,gEAMC;IACD;;;OAGG;IACH,qEAuBC;IACD;;;OAGG;IACH,kFAuBC;IACD;;;OAGG;IACH,yFAaC;IACD;;;OAGG;IACH,yEAOC;IAoHD;;OAEG;IACH,
|
|
1
|
+
{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../../lib/commands/web.js"],"names":[],"mappings":";IAkHE;;;OAGG;IACH,gFAyBC;IACD;;;OAGG;IACH,qGAOC;IACD;;;;;;OAMG;IACH,wHAOC;IACD;;;OAGG;IACH,mEAMC;IACD;;;OAGG;IACH,iEAMC;IACD;;;OAGG;IACH,gEAMC;IACD;;;OAGG;IACH,qEAuBC;IACD;;;OAGG;IACH,kFAuBC;IACD;;;OAGG;IACH,yFAaC;IACD;;;OAGG;IACH,yEAOC;IAoHD;;OAEG;IACH,sIA0BC;IACD;;OAEG;IACH,0EAGC;IACD;;OAEG;IACH,gFAYC;IACD;;OAEG;IACH;;;OAWC;IACD;;OAEG;IACH,iFAmBC;IACD;;OAEG;IACH,uHA4FC;IACD;;OAEG;IACH,8HAqBC;IACD;;OAEG;IACH,iFAiCC;IACD;;OAEG;IACH,oFAOC;IACD;;OAEG;IACH;;;mBAiEC;IACD;;OAEG;IACH,4EAEC;IAED;;;OAGG;IACH,6FA4EC;IAED;;;OAGG;IACH,yFAOC;IAED;;;;;;;;;;;;OAYG;IAEH;;;;;;;;;;;;;;;;OAgBG;IACH,iJAWC;IAzkBD;;OAEG;IACH,qFAGC;IACD;;OAEG;IACH,0EAaC;IACD;;OAEG;IACH,iFAaC;IACD;;;;;;OAMG;IACH,mIAIC;IACD;;OAEG;IACH,mHAOC;IACD;;;;;OAKG;IACH,iKAMC;IACD;;;OAGG;IACH,4GAcC;IACD,yCAEC;IACD;;;OAGG;IACH,wFAKC;;;6BAmeU,OAAO,WAAW,EAAE,cAAc;mBAClC,OAAO,eAAe,EAAE,IAAI;iDAK5B,OAAO,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC"}
|
|
@@ -162,7 +162,7 @@ const commands = {
|
|
|
162
162
|
if (!this.isWebContext()) {
|
|
163
163
|
throw new driver_1.errors.NotImplementedError();
|
|
164
164
|
}
|
|
165
|
-
await this.
|
|
165
|
+
await this.remote.execute('window.location.reload()');
|
|
166
166
|
},
|
|
167
167
|
/**
|
|
168
168
|
* @this {XCUITestDriver}
|
|
@@ -182,7 +182,7 @@ const commands = {
|
|
|
182
182
|
if (!this.isWebContext()) {
|
|
183
183
|
throw new driver_1.errors.NotImplementedError();
|
|
184
184
|
}
|
|
185
|
-
return await this.
|
|
185
|
+
return await this.remote.execute('window.document.title');
|
|
186
186
|
},
|
|
187
187
|
/**
|
|
188
188
|
* @this {XCUITestDriver}
|
|
@@ -378,13 +378,10 @@ const extensions = {
|
|
|
378
378
|
*/
|
|
379
379
|
async findWebElementOrElements(strategy, selector, many, ctx) {
|
|
380
380
|
const contextElement = lodash_1.default.isNil(ctx) ? null : this.getAtomsElement(ctx);
|
|
381
|
+
const atomName = many ? 'find_elements' : 'find_element_fragment';
|
|
381
382
|
let element;
|
|
382
383
|
let doFind = async () => {
|
|
383
|
-
element = await this.executeAtom(
|
|
384
|
-
strategy,
|
|
385
|
-
selector,
|
|
386
|
-
contextElement,
|
|
387
|
-
]);
|
|
384
|
+
element = await this.executeAtom(atomName, [strategy, selector, contextElement]);
|
|
388
385
|
return !lodash_1.default.isNull(element);
|
|
389
386
|
};
|
|
390
387
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../../lib/commands/web.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../../lib/commands/web.js"],"names":[],"mappings":"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"}
|
package/build/lib/driver.d.ts
CHANGED
|
@@ -2430,7 +2430,7 @@ export class XCUITestDriver extends BaseDriver<{
|
|
|
2430
2430
|
mobileTap: (this: XCUITestDriver, x: number, y: number, elementId?: string | import("@appium/types").Element<string> | undefined) => Promise<void>;
|
|
2431
2431
|
mobileDragFromToForDuration: (this: XCUITestDriver, duration: number, fromX: number, fromY: number, toX: number, toY: number, elementId?: string | import("@appium/types").Element<string> | undefined) => Promise<void>;
|
|
2432
2432
|
mobileDragFromToWithVelocity: (this: XCUITestDriver, pressDuration: number, holdDuration: number, velocity: number, fromElementId?: string | import("@appium/types").Element<string> | undefined, toElementId?: string | import("@appium/types").Element<string> | undefined, fromX?: number | undefined, fromY?: number | undefined, toX?: number | undefined, toY?: number | undefined) => Promise<void>;
|
|
2433
|
-
mobileTapWithNumberOfTaps: (this: XCUITestDriver, elementId: string | import("@appium/types").Element<string>,
|
|
2433
|
+
mobileTapWithNumberOfTaps: (this: XCUITestDriver, elementId: string | import("@appium/types").Element<string>, numberOfTouches: number, numberOfTaps: number) => Promise<void>;
|
|
2434
2434
|
mobileForcePress: (this: XCUITestDriver, x?: number | undefined, y?: number | undefined, duration?: number | undefined, pressure?: number | undefined, elementId?: string | import("@appium/types").Element<string> | undefined) => Promise<void>;
|
|
2435
2435
|
mobileSelectPickerWheelValue: (this: XCUITestDriver, elementId: string | import("@appium/types").Element<string>, order: "next" | "previous", offset?: number | undefined, value?: string | null | undefined, maxAttempts?: number | undefined) => Promise<unknown>;
|
|
2436
2436
|
mobileRotateElement: (this: XCUITestDriver, elementId: string | import("@appium/types").Element<string>, rotation: number, velocity: number) => Promise<void>;
|
package/lib/commands/general.js
CHANGED
|
@@ -44,7 +44,7 @@ const commands = {
|
|
|
44
44
|
async getWindowSize(windowHandle = 'current') {
|
|
45
45
|
if (windowHandle !== 'current') {
|
|
46
46
|
throw new errors.NotYetImplementedError(
|
|
47
|
-
'Currently only getting current window size is supported.'
|
|
47
|
+
'Currently only getting current window size is supported.',
|
|
48
48
|
);
|
|
49
49
|
}
|
|
50
50
|
|
|
@@ -74,7 +74,7 @@ const commands = {
|
|
|
74
74
|
const parsedTimestamp = moment.utc(stdout, inputFormat);
|
|
75
75
|
if (!parsedTimestamp.isValid()) {
|
|
76
76
|
this.log.warn(
|
|
77
|
-
`Cannot parse the timestamp '${stdout}' returned by '${cmd}' command. Returning it as is
|
|
77
|
+
`Cannot parse the timestamp '${stdout}' returned by '${cmd}' command. Returning it as is`,
|
|
78
78
|
);
|
|
79
79
|
return stdout;
|
|
80
80
|
}
|
|
@@ -141,7 +141,7 @@ const commands = {
|
|
|
141
141
|
async launchApp() {
|
|
142
142
|
this.log.warn(
|
|
143
143
|
'launchApp is deprecated. Please use activateApp, ' +
|
|
144
|
-
'mobile:launchApp or create a new session instead.'
|
|
144
|
+
'mobile:launchApp or create a new session instead.',
|
|
145
145
|
);
|
|
146
146
|
const appName = this.opts.app || this.opts.bundleId;
|
|
147
147
|
try {
|
|
@@ -160,7 +160,7 @@ const commands = {
|
|
|
160
160
|
async closeApp() {
|
|
161
161
|
this.log.warn(
|
|
162
162
|
'closeApp is deprecated. Please use terminateApp, ' +
|
|
163
|
-
'mobile:terminateApp, mobile:killApp or quit the session instead.'
|
|
163
|
+
'mobile:terminateApp, mobile:killApp or quit the session instead.',
|
|
164
164
|
);
|
|
165
165
|
const appName = this.opts.app || this.opts.bundleId;
|
|
166
166
|
try {
|
|
@@ -287,7 +287,8 @@ const helpers = {
|
|
|
287
287
|
* @this {XCUITestDriver}
|
|
288
288
|
*/
|
|
289
289
|
async getWindowSizeWeb() {
|
|
290
|
-
return
|
|
290
|
+
const script = 'return {width: window.innerWidth, height: window.innerHeight}';
|
|
291
|
+
return await this.executeAtom('execute_script', [script]);
|
|
291
292
|
},
|
|
292
293
|
/**
|
|
293
294
|
* @this {XCUITestDriver}
|
package/lib/commands/gesture.js
CHANGED
|
@@ -31,7 +31,7 @@ async function toElementOrApplicationId(driver, elementId) {
|
|
|
31
31
|
return util.unwrapElement(elementId);
|
|
32
32
|
}
|
|
33
33
|
return util.unwrapElement(
|
|
34
|
-
await driver.findNativeElementOrElements(`class name`, `XCUIElementTypeApplication`, false)
|
|
34
|
+
await driver.findNativeElementOrElements(`class name`, `XCUIElementTypeApplication`, false),
|
|
35
35
|
);
|
|
36
36
|
}
|
|
37
37
|
|
|
@@ -47,7 +47,7 @@ function asFloat(value, paramName) {
|
|
|
47
47
|
const num = parseFloat(String(value));
|
|
48
48
|
if (Number.isNaN(num)) {
|
|
49
49
|
throw new errors.InvalidArgumentError(
|
|
50
|
-
`"${paramName}" parameter should be a valid number. "${value}" is given instead
|
|
50
|
+
`"${paramName}" parameter should be a valid number. "${value}" is given instead`,
|
|
51
51
|
);
|
|
52
52
|
}
|
|
53
53
|
return num;
|
|
@@ -65,7 +65,7 @@ function asInt(value, paramName) {
|
|
|
65
65
|
const num = parseInt(String(value), 10);
|
|
66
66
|
if (Number.isNaN(num)) {
|
|
67
67
|
throw new errors.InvalidArgumentError(
|
|
68
|
-
`"${paramName}" parameter should be a valid integer. "${value}" is given instead
|
|
68
|
+
`"${paramName}" parameter should be a valid integer. "${value}" is given instead`,
|
|
69
69
|
);
|
|
70
70
|
}
|
|
71
71
|
return num;
|
|
@@ -87,7 +87,7 @@ export function gesturesChainToString(gestures, keysToInclude = ['options']) {
|
|
|
87
87
|
`${item.action}` +
|
|
88
88
|
`(${_.map(
|
|
89
89
|
otherKeys,
|
|
90
|
-
(x) => x + '=' + (_.isPlainObject(item[x]) ? JSON.stringify(item[x]) : item[x])
|
|
90
|
+
(x) => x + '=' + (_.isPlainObject(item[x]) ? JSON.stringify(item[x]) : item[x]),
|
|
91
91
|
).join(', ')})`
|
|
92
92
|
);
|
|
93
93
|
}
|
|
@@ -110,20 +110,15 @@ const commands = {
|
|
|
110
110
|
el = util.unwrapElement(el);
|
|
111
111
|
|
|
112
112
|
if (this.isWebContext()) {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
};
|
|
118
|
-
this.curWebCoords = coords;
|
|
119
|
-
let atomsElement = this.getAtomsElement(el);
|
|
120
|
-
let relCoords = {x: xoffset, y: yoffset};
|
|
121
|
-
await this.executeAtom('move_mouse', [atomsElement, relCoords]);
|
|
113
|
+
throw new errors.UnknownMethodError(
|
|
114
|
+
'The moveTo command is not available in the web context. Use the Actions API in the ' +
|
|
115
|
+
'native context instead',
|
|
116
|
+
);
|
|
122
117
|
} else {
|
|
123
118
|
if (_.isNil(el)) {
|
|
124
119
|
if (!this.curCoords) {
|
|
125
120
|
throw new errors.UnknownError(
|
|
126
|
-
'Current cursor position unknown, please use moveTo with an element the first time.'
|
|
121
|
+
'Current cursor position unknown, please use moveTo with an element the first time.',
|
|
127
122
|
);
|
|
128
123
|
}
|
|
129
124
|
this.curCoords = {
|
|
@@ -167,7 +162,19 @@ const commands = {
|
|
|
167
162
|
await this.nativeWebTap(el);
|
|
168
163
|
} else {
|
|
169
164
|
const atomsElement = this.getAtomsElement(el);
|
|
170
|
-
|
|
165
|
+
// clicking can cause an alert to pop up and freeze the event loop, meaning the click atom
|
|
166
|
+
// itself never returns. we have alert handling in `waitForAtom` but with click, we create
|
|
167
|
+
// a special case where if a click results in an unexpected alert error, we just return
|
|
168
|
+
// control to the client. they will encounter the error on their next command, which mirrors
|
|
169
|
+
// the behaviour of selenium.
|
|
170
|
+
try {
|
|
171
|
+
return await this.executeAtom('click', [atomsElement]);
|
|
172
|
+
} catch (err) {
|
|
173
|
+
if (err.error === errors.UnexpectedAlertOpenError.error()) {
|
|
174
|
+
return;
|
|
175
|
+
}
|
|
176
|
+
throw err;
|
|
177
|
+
}
|
|
171
178
|
}
|
|
172
179
|
},
|
|
173
180
|
/**
|
|
@@ -197,14 +204,14 @@ const commands = {
|
|
|
197
204
|
pointerType: 'touch',
|
|
198
205
|
},
|
|
199
206
|
}
|
|
200
|
-
: {}
|
|
201
|
-
)
|
|
207
|
+
: {},
|
|
208
|
+
),
|
|
202
209
|
)
|
|
203
210
|
.map((action) => {
|
|
204
211
|
const modifiedAction = _.clone(action) || {};
|
|
205
212
|
// Selenium API unexpectedly inserts zero pauses, which are not supported by WDA
|
|
206
213
|
modifiedAction.actions = (action.actions || []).filter(
|
|
207
|
-
(innerAction) => !(innerAction.type === 'pause' && innerAction.duration === 0)
|
|
214
|
+
(innerAction) => !(innerAction.type === 'pause' && innerAction.duration === 0),
|
|
208
215
|
);
|
|
209
216
|
return modifiedAction;
|
|
210
217
|
});
|
|
@@ -229,7 +236,7 @@ const commands = {
|
|
|
229
236
|
this.log.errorAndThrow(
|
|
230
237
|
'The Touch API is aimed for usage in NATIVE context. ' +
|
|
231
238
|
'Consider using "execute" API with custom events trigger script ' +
|
|
232
|
-
`to emulate touch events being in WEBVIEW context. Original error: ${e.message}
|
|
239
|
+
`to emulate touch events being in WEBVIEW context. Original error: ${e.message}`,
|
|
233
240
|
);
|
|
234
241
|
}
|
|
235
242
|
},
|
|
@@ -255,7 +262,7 @@ const commands = {
|
|
|
255
262
|
this.log.errorAndThrow(
|
|
256
263
|
'The MultiTouch API is aimed for usage in NATIVE context. ' +
|
|
257
264
|
'Consider using "execute" API with custom events trigger script ' +
|
|
258
|
-
`to emulate multitouch events being in WEBVIEW context. Original error: ${e.message}
|
|
265
|
+
`to emulate multitouch events being in WEBVIEW context. Original error: ${e.message}`,
|
|
259
266
|
);
|
|
260
267
|
}
|
|
261
268
|
},
|
|
@@ -338,7 +345,7 @@ const helpers = {
|
|
|
338
345
|
} else if (direction) {
|
|
339
346
|
if (!SUPPORTED_GESTURE_DIRECTIONS.includes(_.toLower(direction))) {
|
|
340
347
|
throw new errors.InvalidArgumentError(
|
|
341
|
-
`'direction' must be one of: ${SUPPORTED_GESTURE_DIRECTIONS}
|
|
348
|
+
`'direction' must be one of: ${SUPPORTED_GESTURE_DIRECTIONS}`,
|
|
342
349
|
);
|
|
343
350
|
}
|
|
344
351
|
params.direction = direction;
|
|
@@ -349,7 +356,7 @@ const helpers = {
|
|
|
349
356
|
} else {
|
|
350
357
|
throw new errors.InvalidArgumentError(
|
|
351
358
|
'Mobile scroll supports the following strategies: name, direction, predicateString, and toVisible. ' +
|
|
352
|
-
'Specify one of these'
|
|
359
|
+
'Specify one of these',
|
|
353
360
|
);
|
|
354
361
|
}
|
|
355
362
|
// we can also optionally pass a distance which appears to be a ratio of
|
|
@@ -369,7 +376,7 @@ const helpers = {
|
|
|
369
376
|
async mobileSwipe(direction, velocity, elementId) {
|
|
370
377
|
if (!SUPPORTED_GESTURE_DIRECTIONS.includes(_.toLower(direction))) {
|
|
371
378
|
throw new errors.InvalidArgumentError(
|
|
372
|
-
`'direction' must be one of: ${SUPPORTED_GESTURE_DIRECTIONS}
|
|
379
|
+
`'direction' must be one of: ${SUPPORTED_GESTURE_DIRECTIONS}`,
|
|
373
380
|
);
|
|
374
381
|
}
|
|
375
382
|
const params = {direction};
|
|
@@ -558,7 +565,7 @@ const helpers = {
|
|
|
558
565
|
fromX,
|
|
559
566
|
fromY,
|
|
560
567
|
toX,
|
|
561
|
-
toY
|
|
568
|
+
toY,
|
|
562
569
|
) {
|
|
563
570
|
const params = {
|
|
564
571
|
pressDuration: asFloat(pressDuration, 'pressDuration'),
|
|
@@ -570,14 +577,14 @@ const helpers = {
|
|
|
570
577
|
toElementId = toElementId ? util.unwrapElement(toElementId) : undefined;
|
|
571
578
|
if (!toElementId) {
|
|
572
579
|
throw new errors.InvalidArgumentError(
|
|
573
|
-
`"toElementId" parameter is mandatory for "dragFromToWithVelocity" call
|
|
580
|
+
`"toElementId" parameter is mandatory for "dragFromToWithVelocity" call`,
|
|
574
581
|
);
|
|
575
582
|
}
|
|
576
583
|
params.toElement = toElementId;
|
|
577
584
|
return await this.proxyCommand(
|
|
578
585
|
`/wda/element/${fromElementId}/pressAndDragWithVelocity`,
|
|
579
586
|
'POST',
|
|
580
|
-
params
|
|
587
|
+
params,
|
|
581
588
|
);
|
|
582
589
|
}
|
|
583
590
|
params.fromX = asFloat(fromX, 'fromX');
|
|
@@ -603,10 +610,10 @@ const helpers = {
|
|
|
603
610
|
* @driver.execute_script 'mobile: tapWithNumberOfTaps', {element: e.ref, numberOfTaps: 2, numberOfTouches: 1}
|
|
604
611
|
* ```
|
|
605
612
|
*/
|
|
606
|
-
async mobileTapWithNumberOfTaps(elementId,
|
|
613
|
+
async mobileTapWithNumberOfTaps(elementId, numberOfTouches, numberOfTaps) {
|
|
607
614
|
if (!elementId) {
|
|
608
615
|
throw new errors.InvalidArgumentError(
|
|
609
|
-
'Element id is expected to be set for tapWithNumberOfTaps method'
|
|
616
|
+
'Element id is expected to be set for tapWithNumberOfTaps method',
|
|
610
617
|
);
|
|
611
618
|
}
|
|
612
619
|
const params = {
|
|
@@ -658,13 +665,13 @@ const helpers = {
|
|
|
658
665
|
elementId = /** @type {string} */ (toElementId(elementId));
|
|
659
666
|
if (!elementId) {
|
|
660
667
|
throw new errors.InvalidArgumentError(
|
|
661
|
-
'elementId is expected to be set for selectPickerWheelValue method'
|
|
668
|
+
'elementId is expected to be set for selectPickerWheelValue method',
|
|
662
669
|
);
|
|
663
670
|
}
|
|
664
671
|
if (!_.isString(order) || !['next', 'previous'].includes(order.toLowerCase())) {
|
|
665
672
|
throw new errors.InvalidArgumentError(
|
|
666
673
|
`The mandatory 'order' parameter is expected to be equal either to 'next' or 'previous'. ` +
|
|
667
|
-
`'${order}' is given instead
|
|
674
|
+
`'${order}' is given instead`,
|
|
668
675
|
);
|
|
669
676
|
}
|
|
670
677
|
const params = {order};
|
|
@@ -704,7 +711,7 @@ const helpers = {
|
|
|
704
711
|
elementId = /** @type {string} */ (toElementId(elementId));
|
|
705
712
|
if (!elementId) {
|
|
706
713
|
throw new errors.InvalidArgumentError(
|
|
707
|
-
'Element id is expected to be set for rotateElement method'
|
|
714
|
+
'Element id is expected to be set for rotateElement method',
|
|
708
715
|
);
|
|
709
716
|
}
|
|
710
717
|
const params = {
|
package/lib/commands/log.js
CHANGED
|
@@ -7,7 +7,6 @@ import log from '../logger';
|
|
|
7
7
|
import WebSocket from 'ws';
|
|
8
8
|
import SafariConsoleLog from '../device-log/safari-console-log';
|
|
9
9
|
import SafariNetworkLog from '../device-log/safari-network-log';
|
|
10
|
-
import {WSServer} from '@appium/types';
|
|
11
10
|
|
|
12
11
|
/**
|
|
13
12
|
* Determines the websocket endpoint based on the `sessionId`
|
|
@@ -207,7 +206,7 @@ export default {
|
|
|
207
206
|
});
|
|
208
207
|
await /** @type {AppiumServer} */ (this.server).addWebSocketHandler(
|
|
209
208
|
pathname,
|
|
210
|
-
/** @type {WSServer} */ (wss)
|
|
209
|
+
/** @type {import('@appium/types').WSServer} */ (wss)
|
|
211
210
|
);
|
|
212
211
|
},
|
|
213
212
|
|
package/lib/commands/web.js
CHANGED
|
@@ -69,7 +69,7 @@ async function tapWebElementNatively(driver, atomsElement) {
|
|
|
69
69
|
const el2 = els[1];
|
|
70
70
|
const rect2 = await driver.proxyCommand(
|
|
71
71
|
`/element/${util.unwrapElement(el2)}/rect`,
|
|
72
|
-
'GET'
|
|
72
|
+
'GET',
|
|
73
73
|
);
|
|
74
74
|
|
|
75
75
|
if (
|
|
@@ -178,7 +178,7 @@ const commands = {
|
|
|
178
178
|
throw new errors.NotImplementedError();
|
|
179
179
|
}
|
|
180
180
|
|
|
181
|
-
await this.
|
|
181
|
+
await this.remote.execute('window.location.reload()');
|
|
182
182
|
},
|
|
183
183
|
/**
|
|
184
184
|
* @this {XCUITestDriver}
|
|
@@ -200,7 +200,7 @@ const commands = {
|
|
|
200
200
|
throw new errors.NotImplementedError();
|
|
201
201
|
}
|
|
202
202
|
|
|
203
|
-
return await this.
|
|
203
|
+
return await this.remote.execute('window.document.title');
|
|
204
204
|
},
|
|
205
205
|
/**
|
|
206
206
|
* @this {XCUITestDriver}
|
|
@@ -212,7 +212,7 @@ const commands = {
|
|
|
212
212
|
}
|
|
213
213
|
|
|
214
214
|
// get the cookies from the remote debugger, or an empty object
|
|
215
|
-
const {
|
|
215
|
+
const {cookies} = await this.remote.getCookies();
|
|
216
216
|
|
|
217
217
|
// the value is URI encoded, so decode it safely
|
|
218
218
|
return cookies.map((cookie) => {
|
|
@@ -221,7 +221,7 @@ const commands = {
|
|
|
221
221
|
cookie.value = decodeURI(cookie.value);
|
|
222
222
|
} catch (error) {
|
|
223
223
|
this.log.debug(
|
|
224
|
-
`Cookie ${cookie.name} was not decoded successfully. Cookie value: ${cookie.value}
|
|
224
|
+
`Cookie ${cookie.name} was not decoded successfully. Cookie value: ${cookie.value}`,
|
|
225
225
|
);
|
|
226
226
|
this.log.warn(error);
|
|
227
227
|
// Keep the original value
|
|
@@ -324,11 +324,11 @@ const helpers = {
|
|
|
324
324
|
if (_.isArray(response)) {
|
|
325
325
|
return response.map(toCached);
|
|
326
326
|
} else if (_.isPlainObject(response)) {
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
327
|
+
const result = {...response, ...this.cacheWebElement(response)};
|
|
328
|
+
return _.toPairs(result).reduce((acc, [key, value]) => {
|
|
329
|
+
acc[key] = toCached(value);
|
|
330
|
+
return acc;
|
|
331
|
+
}, {});
|
|
332
332
|
}
|
|
333
333
|
return response;
|
|
334
334
|
},
|
|
@@ -363,7 +363,7 @@ const helpers = {
|
|
|
363
363
|
*/
|
|
364
364
|
getAtomsElement(elOrId) {
|
|
365
365
|
const elId = util.unwrapElement(elOrId);
|
|
366
|
-
|
|
366
|
+
if (!this.webElementsCache?.has(elId)) {
|
|
367
367
|
throw new errors.StaleElementReferenceError();
|
|
368
368
|
}
|
|
369
369
|
return {ELEMENT: this.webElementsCache.get(elId)};
|
|
@@ -408,13 +408,10 @@ const extensions = {
|
|
|
408
408
|
*/
|
|
409
409
|
async findWebElementOrElements(strategy, selector, many, ctx) {
|
|
410
410
|
const contextElement = _.isNil(ctx) ? null : this.getAtomsElement(ctx);
|
|
411
|
+
const atomName = many ? 'find_elements' : 'find_element_fragment';
|
|
411
412
|
let element;
|
|
412
413
|
let doFind = async () => {
|
|
413
|
-
element = await this.executeAtom(
|
|
414
|
-
strategy,
|
|
415
|
-
selector,
|
|
416
|
-
contextElement,
|
|
417
|
-
]);
|
|
414
|
+
element = await this.executeAtom(atomName, [strategy, selector, contextElement]);
|
|
418
415
|
return !_.isNull(element);
|
|
419
416
|
};
|
|
420
417
|
try {
|
|
@@ -491,7 +488,7 @@ const extensions = {
|
|
|
491
488
|
}
|
|
492
489
|
} catch (err) {
|
|
493
490
|
this.log.warn(
|
|
494
|
-
`Unable to find device type from dimensions. Assuming the device is not notched
|
|
491
|
+
`Unable to find device type from dimensions. Assuming the device is not notched`,
|
|
495
492
|
);
|
|
496
493
|
this.log.debug(`Error: ${err.message}`);
|
|
497
494
|
}
|
|
@@ -511,15 +508,15 @@ const extensions = {
|
|
|
511
508
|
const {
|
|
512
509
|
nativeWebTapTabBarVisibility,
|
|
513
510
|
nativeWebTapSmartAppBannerVisibility,
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
511
|
+
// @ts-expect-error - do not assign arbitrary properties to `this.opts`
|
|
512
|
+
safariTabBarPosition = util.compareVersions(this.opts.platformVersion, '>=', '15.0') &&
|
|
513
|
+
isIphone
|
|
514
|
+
? TAB_BAR_POSITION_BOTTOM
|
|
515
|
+
: TAB_BAR_POSITION_TOP,
|
|
516
|
+
} = this.settings.getSettings();
|
|
517
|
+
let tabBarVisibility = _.lowerCase(String(nativeWebTapTabBarVisibility));
|
|
518
|
+
let bannerVisibility = _.lowerCase(String(nativeWebTapSmartAppBannerVisibility));
|
|
519
|
+
const tabBarPosition = _.lowerCase(String(safariTabBarPosition));
|
|
523
520
|
|
|
524
521
|
if (!VISIBILITIES.includes(tabBarVisibility)) {
|
|
525
522
|
tabBarVisibility = DETECT;
|
|
@@ -530,7 +527,7 @@ const extensions = {
|
|
|
530
527
|
|
|
531
528
|
if (!TAB_BAR_POSSITIONS.includes(tabBarPosition)) {
|
|
532
529
|
throw new errors.InvalidArgumentError(
|
|
533
|
-
`${safariTabBarPosition} is invalid as Safari tab bar position. Available positions are ${TAB_BAR_POSSITIONS}
|
|
530
|
+
`${safariTabBarPosition} is invalid as Safari tab bar position. Available positions are ${TAB_BAR_POSSITIONS}.`,
|
|
534
531
|
);
|
|
535
532
|
}
|
|
536
533
|
|
|
@@ -539,8 +536,8 @@ const extensions = {
|
|
|
539
536
|
const orientation = realDims.h > realDims.w ? 'PORTRAIT' : 'LANDSCAPE';
|
|
540
537
|
|
|
541
538
|
const notchOffset = isNotched
|
|
542
|
-
|
|
543
|
-
|
|
539
|
+
? // @ts-expect-error - do not assign arbitrary properties to `this.opts`
|
|
540
|
+
util.compareVersions(this.opts.platformVersion, '=', '13.0')
|
|
544
541
|
? IPHONE_X_NOTCH_OFFSET_IOS_13
|
|
545
542
|
: IPHONE_X_NOTCH_OFFSET_IOS
|
|
546
543
|
: 0;
|
|
@@ -678,10 +675,10 @@ const extensions = {
|
|
|
678
675
|
try {
|
|
679
676
|
webview = /** @type {import('@appium/types').Element|undefined} */ (
|
|
680
677
|
await retryInterval(
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
678
|
+
5,
|
|
679
|
+
100,
|
|
680
|
+
async () =>
|
|
681
|
+
await this.findNativeElementOrElements('class name', 'XCUIElementTypeWebView', false),
|
|
685
682
|
)
|
|
686
683
|
);
|
|
687
684
|
} catch (ign) {}
|
|
@@ -728,7 +725,9 @@ const extensions = {
|
|
|
728
725
|
this.log.debug(` yRatio: ${JSON.stringify(yRatio)}`);
|
|
729
726
|
|
|
730
727
|
this.log.debug(
|
|
731
|
-
`Converted web coords ${JSON.stringify(coords)} into real coords ${JSON.stringify(
|
|
728
|
+
`Converted web coords ${JSON.stringify(coords)} into real coords ${JSON.stringify(
|
|
729
|
+
newCoords,
|
|
730
|
+
)}`,
|
|
732
731
|
);
|
|
733
732
|
return newCoords;
|
|
734
733
|
}
|
|
@@ -759,7 +758,7 @@ const extensions = {
|
|
|
759
758
|
if (originalError instanceof B.TimeoutError) {
|
|
760
759
|
throw new errors.TimeoutError(
|
|
761
760
|
`Did not get any response for atom execution after ` +
|
|
762
|
-
`${timer.getDuration().asMilliSeconds.toFixed(0)}ms
|
|
761
|
+
`${timer.getDuration().asMilliSeconds.toFixed(0)}ms`,
|
|
763
762
|
);
|
|
764
763
|
}
|
|
765
764
|
throw originalError;
|
|
@@ -794,7 +793,7 @@ const extensions = {
|
|
|
794
793
|
}
|
|
795
794
|
await B.delay(OBSTRUCTING_ALERT_PRESENCE_CHECK_INTERVAL_MS);
|
|
796
795
|
}
|
|
797
|
-
})()
|
|
796
|
+
})(),
|
|
798
797
|
);
|
|
799
798
|
}
|
|
800
799
|
|
|
@@ -812,7 +811,7 @@ const extensions = {
|
|
|
812
811
|
if (onAlertCallback) {
|
|
813
812
|
this._waitingAtoms.alertNotifier.removeListener(
|
|
814
813
|
ON_OBSTRUCTING_ALERT_EVENT,
|
|
815
|
-
onAlertCallback
|
|
814
|
+
onAlertCallback,
|
|
816
815
|
);
|
|
817
816
|
}
|
|
818
817
|
if (onAppCrashCallback) {
|
|
@@ -835,19 +834,19 @@ const extensions = {
|
|
|
835
834
|
}
|
|
836
835
|
},
|
|
837
836
|
|
|
838
|
-
/**
|
|
839
|
-
|
|
840
|
-
|
|
841
|
-
|
|
842
|
-
|
|
843
|
-
|
|
844
|
-
|
|
845
|
-
|
|
846
|
-
|
|
847
|
-
|
|
848
|
-
|
|
849
|
-
|
|
850
|
-
|
|
837
|
+
/**
|
|
838
|
+
* @typedef {Object} SafariOpts
|
|
839
|
+
* @property {object} preferences An object containing Safari settings to be updated.
|
|
840
|
+
* The list of available setting names and their values could be retrieved by
|
|
841
|
+
* changing the corresponding Safari settings in the UI and then inspecting
|
|
842
|
+
* 'Library/Preferences/com.apple.mobilesafari.plist' file inside of
|
|
843
|
+
* com.apple.mobilesafari app container.
|
|
844
|
+
* The full path to the Mobile Safari's container could be retrieved from
|
|
845
|
+
* `xcrun simctl get_app_container <sim_udid> com.apple.mobilesafari data`
|
|
846
|
+
* command output.
|
|
847
|
+
* Use the `xcrun simctl spawn <sim_udid> defaults read <path_to_plist>` command
|
|
848
|
+
* to print the plist content to the Terminal.
|
|
849
|
+
*/
|
|
851
850
|
|
|
852
851
|
/**
|
|
853
852
|
* Updates Mobile Safari preferences on an iOS Simulator
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"xcuitest",
|
|
9
9
|
"xctest"
|
|
10
10
|
],
|
|
11
|
-
"version": "4.
|
|
11
|
+
"version": "4.34.0",
|
|
12
12
|
"author": "Appium Contributors",
|
|
13
13
|
"license": "Apache-2.0",
|
|
14
14
|
"repository": {
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
"appium-idb": "^1.6.13",
|
|
73
73
|
"appium-ios-device": "^2.5.4",
|
|
74
74
|
"appium-ios-simulator": "^5.1.3",
|
|
75
|
-
"appium-remote-debugger": "^
|
|
75
|
+
"appium-remote-debugger": "^10.0.0",
|
|
76
76
|
"appium-webdriveragent": "^5.6.0",
|
|
77
77
|
"appium-xcode": "^5.1.4",
|
|
78
78
|
"async-lock": "^1.4.0",
|
|
@@ -147,7 +147,7 @@
|
|
|
147
147
|
"@types/chai-as-promised": "^7.1.5",
|
|
148
148
|
"@types/lodash": "^4.14.196",
|
|
149
149
|
"@types/mocha": "^10.0.1",
|
|
150
|
-
"@types/node": "^
|
|
150
|
+
"@types/node": "^20.4.7",
|
|
151
151
|
"@types/portscanner": "^2.1.1",
|
|
152
152
|
"@types/sinon": "^10.0.16",
|
|
153
153
|
"@types/sinon-chai": "^3.2.9",
|
|
@@ -166,7 +166,6 @@
|
|
|
166
166
|
"eslint-plugin-import": "^2.28.0",
|
|
167
167
|
"eslint-plugin-mocha": "^10.1.0",
|
|
168
168
|
"eslint-plugin-promise": "^6.1.1",
|
|
169
|
-
"get-port": "^7.0.0",
|
|
170
169
|
"husky": "^8.0.3",
|
|
171
170
|
"lint-staged": "^13.2.3",
|
|
172
171
|
"mocha": "^10.2.0",
|