appium-espresso-driver 9.3.4 → 9.3.6
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/driver.d.ts +1 -1
- package/build/lib/driver.d.ts.map +1 -1
- package/build/lib/driver.js +27 -4
- package/build/lib/driver.js.map +1 -1
- package/espresso-server/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk +0 -0
- package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.bin +0 -0
- package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.lock +0 -0
- package/espresso-server/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/espresso-server/buildSrc/.gradle/buildOutputCleanup/cache.properties +2 -2
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin +0 -0
- package/espresso-server/gradle/libs.versions.toml +2 -2
- package/espresso-server/gradle/wrapper/gradle-wrapper.jar +0 -0
- package/espresso-server/gradle/wrapper/gradle-wrapper.properties +1 -1
- package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt +1 -1
- package/lib/driver.ts +28 -4
- package/node_modules/appium-chromedriver/CHANGELOG.md +12 -0
- package/node_modules/appium-chromedriver/config/mapping.json +2 -0
- package/node_modules/appium-chromedriver/package.json +1 -1
- package/package.json +1 -1
- package/espresso-server/buildSrc/.gradle/9.6.1/executionHistory/executionHistory.bin +0 -0
- package/espresso-server/buildSrc/.gradle/9.6.1/executionHistory/executionHistory.lock +0 -0
- package/espresso-server/buildSrc/.gradle/file-system.probe +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## [9.3.6](https://github.com/appium/appium-espresso-driver/compare/v9.3.5...v9.3.6) (2026-09-21)
|
|
2
|
+
|
|
3
|
+
### Bug Fixes
|
|
4
|
+
|
|
5
|
+
* use correct locatorStrategies ([#1227](https://github.com/appium/appium-espresso-driver/issues/1227)) ([4f66f0c](https://github.com/appium/appium-espresso-driver/commit/4f66f0cdc1c107cd6d025c8262bbf78037bc052e))
|
|
6
|
+
|
|
7
|
+
## [9.3.5](https://github.com/appium/appium-espresso-driver/compare/v9.3.4...v9.3.5) (2026-09-21)
|
|
8
|
+
|
|
9
|
+
### Miscellaneous Chores
|
|
10
|
+
|
|
11
|
+
* **deps:** bump androidGradlePlugin in /espresso-server ([#1225](https://github.com/appium/appium-espresso-driver/issues/1225)) ([5aebf43](https://github.com/appium/appium-espresso-driver/commit/5aebf4320a60c31d2dafe10b97ce308c01081eef))
|
|
12
|
+
* **deps:** bump gradle-wrapper from 9.6.1 to 9.7.1 in /espresso-server ([#1224](https://github.com/appium/appium-espresso-driver/issues/1224)) ([f1c46a9](https://github.com/appium/appium-espresso-driver/commit/f1c46a9f94a01d28880524b2f1a2b4c646c21c0d))
|
|
13
|
+
* **deps:** bump org.robolectric:robolectric in /espresso-server ([#1226](https://github.com/appium/appium-espresso-driver/issues/1226)) ([905447a](https://github.com/appium/appium-espresso-driver/commit/905447a70effd16952551f20cb17bce45cd9c5fd))
|
|
14
|
+
|
|
1
15
|
## [9.3.4](https://github.com/appium/appium-espresso-driver/compare/v9.3.3...v9.3.4) (2026-09-18)
|
|
2
16
|
|
|
3
17
|
### Miscellaneous Chores
|
package/build/lib/driver.d.ts
CHANGED
|
@@ -486,7 +486,7 @@ export declare class EspressoDriver extends AndroidDriver<EspressoConstraints> i
|
|
|
486
486
|
setWindowAnimationState(isEnabled: boolean): Promise<void>;
|
|
487
487
|
initWebview(): Promise<void>;
|
|
488
488
|
addDeviceInfoToCaps(): Promise<void>;
|
|
489
|
-
onSettingsUpdate(): Promise<void>;
|
|
489
|
+
onSettingsUpdate(key: string, value: any): Promise<void>;
|
|
490
490
|
proxyActive(sessionId?: string | null): boolean;
|
|
491
491
|
canProxy(sessionId?: string | null): boolean;
|
|
492
492
|
getProxyAvoidList(sessionId?: string | null): RouteMatcher[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,UAAU,EACV,cAAc,EACd,WAAW,EACX,YAAY,EACZ,YAAY,EACb,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAMpD,OAAO,KAAK,cAAc,MAAM,2BAA2B,CAAC;AAC5D,OAAO,KAAK,iBAAiB,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,aAAa,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,WAAW,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,WAAW,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,mBAAmB,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,QAAQ,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,cAAc,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAE/D,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AAI1D,OAAO,KAAK,EAAC,kBAAkB,EAAE,kBAAkB,EAAE,qBAAqB,EAAC,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
|
package/build/lib/driver.js
CHANGED
|
@@ -109,6 +109,25 @@ const CHROME_NO_PROXY = [
|
|
|
109
109
|
// For Selenium v4 (W3C does not have this route)
|
|
110
110
|
['POST', new RegExp('^/session/[^/]+/se/log')],
|
|
111
111
|
];
|
|
112
|
+
const LOCATOR_STRATEGIES_ESPRESSO_CONTEXT = [
|
|
113
|
+
'id',
|
|
114
|
+
'class name',
|
|
115
|
+
'accessibility id',
|
|
116
|
+
'text',
|
|
117
|
+
'-android viewtag',
|
|
118
|
+
'tag name',
|
|
119
|
+
'-android datamatcher',
|
|
120
|
+
'-android viewmatcher',
|
|
121
|
+
'xpath',
|
|
122
|
+
];
|
|
123
|
+
const LOCATOR_STRATEGIES_COMPOSE_CONTEXT = [
|
|
124
|
+
'accessibility id',
|
|
125
|
+
'text',
|
|
126
|
+
'-android viewtag',
|
|
127
|
+
'tag name',
|
|
128
|
+
'link text',
|
|
129
|
+
'xpath',
|
|
130
|
+
];
|
|
112
131
|
export class EspressoDriver extends AndroidDriver {
|
|
113
132
|
static newMethodMap = newMethodMap;
|
|
114
133
|
static executeMethodMap = executeMethodMap;
|
|
@@ -165,7 +184,7 @@ export class EspressoDriver extends AndroidDriver {
|
|
|
165
184
|
delete opts.shell;
|
|
166
185
|
}
|
|
167
186
|
super(opts, shouldValidateCaps);
|
|
168
|
-
this.locatorStrategies =
|
|
187
|
+
this.locatorStrategies = LOCATOR_STRATEGIES_ESPRESSO_CONTEXT;
|
|
169
188
|
this.desiredCapConstraints = ESPRESSO_CONSTRAINTS;
|
|
170
189
|
this.jwpProxyAvoid = NO_PROXY;
|
|
171
190
|
this._originalIme = null;
|
|
@@ -357,9 +376,13 @@ export class EspressoDriver extends AndroidDriver {
|
|
|
357
376
|
this.caps.deviceModel = model;
|
|
358
377
|
this.caps.deviceManufacturer = manufacturer;
|
|
359
378
|
}
|
|
360
|
-
async onSettingsUpdate() {
|
|
361
|
-
|
|
362
|
-
|
|
379
|
+
async onSettingsUpdate(key, value) {
|
|
380
|
+
if (key === 'driver') {
|
|
381
|
+
this.locatorStrategies =
|
|
382
|
+
String(value).toLowerCase() === 'compose'
|
|
383
|
+
? LOCATOR_STRATEGIES_COMPOSE_CONTEXT
|
|
384
|
+
: LOCATOR_STRATEGIES_ESPRESSO_CONTEXT;
|
|
385
|
+
}
|
|
363
386
|
}
|
|
364
387
|
proxyActive(sessionId) {
|
|
365
388
|
void sessionId;
|
package/build/lib/driver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
#
|
|
2
|
-
gradle.version=9.
|
|
1
|
+
#Mon Sep 21 16:05:14 UTC 2026
|
|
2
|
+
gradle.version=9.7.1
|
|
Binary file
|
|
Binary file
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
[versions]
|
|
2
|
-
androidGradlePlugin = "9.
|
|
2
|
+
androidGradlePlugin = "9.4.1"
|
|
3
3
|
kotlin = "2.4.20"
|
|
4
4
|
androidxTest = "1.7.0"
|
|
5
5
|
annotation = "1.10.0"
|
|
@@ -7,7 +7,7 @@ composeUiTest = "1.11.4"
|
|
|
7
7
|
gson = "2.14.0"
|
|
8
8
|
espresso = "3.7.0"
|
|
9
9
|
nanohttpd = "2.3.1"
|
|
10
|
-
robolectric = "4.
|
|
10
|
+
robolectric = "4.17"
|
|
11
11
|
junit = "4.13.2"
|
|
12
12
|
uiautomator = "2.4.0"
|
|
13
13
|
|
|
Binary file
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
distributionBase=GRADLE_USER_HOME
|
|
2
2
|
distributionPath=wrapper/dists
|
|
3
|
-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.
|
|
3
|
+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
|
|
4
4
|
networkTimeout=10000
|
|
5
5
|
retries=0
|
|
6
6
|
retryBackOffMs=500
|
package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt
CHANGED
|
@@ -2,6 +2,6 @@ package io.appium.espressoserver.lib.helpers
|
|
|
2
2
|
|
|
3
3
|
// This value is updated automatically by the NPM versioning script
|
|
4
4
|
// It should be in sync with the NPM module version from package.json
|
|
5
|
-
private const val VERSION = "9.3.
|
|
5
|
+
private const val VERSION = "9.3.6"
|
|
6
6
|
|
|
7
7
|
fun getEspressoServerVersion() = VERSION
|
package/lib/driver.ts
CHANGED
|
@@ -129,6 +129,26 @@ const CHROME_NO_PROXY: RouteMatcher[] = [
|
|
|
129
129
|
['POST', new RegExp('^/session/[^/]+/se/log')],
|
|
130
130
|
];
|
|
131
131
|
|
|
132
|
+
const LOCATOR_STRATEGIES_ESPRESSO_CONTEXT = [
|
|
133
|
+
'id',
|
|
134
|
+
'class name',
|
|
135
|
+
'accessibility id',
|
|
136
|
+
'text',
|
|
137
|
+
'-android viewtag',
|
|
138
|
+
'tag name',
|
|
139
|
+
'-android datamatcher',
|
|
140
|
+
'-android viewmatcher',
|
|
141
|
+
'xpath',
|
|
142
|
+
];
|
|
143
|
+
const LOCATOR_STRATEGIES_COMPOSE_CONTEXT = [
|
|
144
|
+
'accessibility id',
|
|
145
|
+
'text',
|
|
146
|
+
'-android viewtag',
|
|
147
|
+
'tag name',
|
|
148
|
+
'link text',
|
|
149
|
+
'xpath',
|
|
150
|
+
];
|
|
151
|
+
|
|
132
152
|
export class EspressoDriver
|
|
133
153
|
extends AndroidDriver<EspressoConstraints>
|
|
134
154
|
implements ExternalDriver<EspressoConstraints, string, StringRecord>
|
|
@@ -207,7 +227,7 @@ export class EspressoDriver
|
|
|
207
227
|
}
|
|
208
228
|
|
|
209
229
|
super(opts, shouldValidateCaps);
|
|
210
|
-
this.locatorStrategies =
|
|
230
|
+
this.locatorStrategies = LOCATOR_STRATEGIES_ESPRESSO_CONTEXT;
|
|
211
231
|
this.desiredCapConstraints = ESPRESSO_CONSTRAINTS;
|
|
212
232
|
this.jwpProxyAvoid = NO_PROXY;
|
|
213
233
|
this._originalIme = null;
|
|
@@ -439,9 +459,13 @@ export class EspressoDriver
|
|
|
439
459
|
this.caps.deviceManufacturer = manufacturer;
|
|
440
460
|
}
|
|
441
461
|
|
|
442
|
-
async onSettingsUpdate() {
|
|
443
|
-
|
|
444
|
-
|
|
462
|
+
async onSettingsUpdate(key: string, value: any) {
|
|
463
|
+
if (key === 'driver') {
|
|
464
|
+
this.locatorStrategies =
|
|
465
|
+
String(value).toLowerCase() === 'compose'
|
|
466
|
+
? LOCATOR_STRATEGIES_COMPOSE_CONTEXT
|
|
467
|
+
: LOCATOR_STRATEGIES_ESPRESSO_CONTEXT;
|
|
468
|
+
}
|
|
445
469
|
}
|
|
446
470
|
|
|
447
471
|
override proxyActive(sessionId?: string | null) {
|
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## [9.0.20](https://github.com/appium/appium-chromedriver/compare/v9.0.19...v9.0.20) (2026-09-19)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous Chores
|
|
4
|
+
|
|
5
|
+
* ChromeDriver Bump to v153.0.8010.52 ([#628](https://github.com/appium/appium-chromedriver/issues/628)) ([918550d](https://github.com/appium/appium-chromedriver/commit/918550df867c882201803729ac2c160e333cf11b))
|
|
6
|
+
|
|
7
|
+
## [9.0.19](https://github.com/appium/appium-chromedriver/compare/v9.0.18...v9.0.19) (2026-09-18)
|
|
8
|
+
|
|
9
|
+
### Miscellaneous Chores
|
|
10
|
+
|
|
11
|
+
* ChromeDriver Bump to v153.0.8010.47 ([#627](https://github.com/appium/appium-chromedriver/issues/627)) ([c90ca1f](https://github.com/appium/appium-chromedriver/commit/c90ca1f7a5bbbcad768655ce9e40859195673199))
|
|
12
|
+
|
|
1
13
|
## [9.0.18](https://github.com/appium/appium-chromedriver/compare/v9.0.17...v9.0.18) (2026-09-09)
|
|
2
14
|
|
|
3
15
|
### Miscellaneous Chores
|
package/package.json
CHANGED
|
Binary file
|
|
Binary file
|
|
Binary file
|