appium-espresso-driver 2.13.1 → 2.13.2

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/helpers/ViewFinder.kt

@@ -168,8 +168,8 @@ object ViewFinder {
                 // If we're only looking for one item that matches xpath, pass it index 0 or else
                 // Espresso throws an AmbiguousMatcherException
                 return getViews(
-                    if (findOne) withXPath(parent, selector, 0) else withXPath(parent, selector),
-                    true,
+                    withXPath(parent, selector, if (findOne) 0 else null),
+                    findOne,
                     parent
                 ).map { ViewState(it) }
             Strategy.VIEW_TAG ->

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/viewmatcher/WithXPath.kt

@@ -37,10 +37,15 @@ fun fetchIncludedAttributes(xpath: String): Set<AttributesEnum>? {
 }
 
 fun withXPath(root: View?, xpath: String, index: Int? = null): Matcher<View> {
-    // Get a list of the Views that match the provided xpath
-    val matchedXPathViews = SourceDocument(root, fetchIncludedAttributes(xpath)).findViewsByXPath(xpath)
+    val matchedXPathViews = mutableListOf<View>()
     return object : TypeSafeMatcher<View>() {
         override fun matchesSafely(item: View): Boolean {
+            if (matchedXPathViews.isEmpty()) {
+                matchedXPathViews.addAll(
+                    SourceDocument(root ?: item.rootView, fetchIncludedAttributes(xpath)).findViewsByXPath(xpath)
+                )
+            }
+
             return if (index != null) {
                 // If index is not null, match it with the xpath in the list at the provided index
                 index < matchedXPathViews.size && matchedXPathViews[index] == item

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-espresso-driver",
-  "version": "2.13.1",
+  "version": "2.13.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-espresso-driver",
-      "version": "2.13.1",
+      "version": "2.13.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/runtime": "^7.4.3",
@@ -304,7 +304,7 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.19.6",
+      "version": "7.20.0",
       "extraneous": true,
       "license": "MIT",
       "bin": {
@@ -315,10 +315,10 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.19.4",
+      "version": "7.20.0",
       "license": "MIT",
       "dependencies": {
-        "regenerator-runtime": "^0.13.4"
+        "regenerator-runtime": "^0.13.10"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1000,7 +1000,7 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "18.11.5",
+      "version": "18.11.7",
       "license": "MIT"
     },
     "node_modules/@types/normalize-package-data": {
@@ -1252,7 +1252,7 @@
       }
     },
     "node_modules/appium-android-driver": {
-      "version": "5.6.0",
+      "version": "5.7.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
@@ -1316,7 +1316,7 @@
       }
     },
     "node_modules/appium-chromedriver": {
-      "version": "5.2.4",
+      "version": "5.2.5",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2755,7 +2755,7 @@
       }
     },
     "node_modules/io.appium.settings": {
-      "version": "4.2.1",
+      "version": "4.2.2",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=14",
@@ -5383,13 +5383,13 @@
       }
     },
     "@babel/parser": {
-      "version": "7.19.6",
+      "version": "7.20.0",
       "extraneous": true
     },
     "@babel/runtime": {
-      "version": "7.19.4",
+      "version": "7.20.0",
       "requires": {
-        "regenerator-runtime": "^0.13.4"
+        "regenerator-runtime": "^0.13.10"
       }
     },
     "@colors/colors": {
@@ -5863,7 +5863,7 @@
       }
     },
     "@types/node": {
-      "version": "18.11.5"
+      "version": "18.11.7"
     },
     "@types/normalize-package-data": {
       "version": "2.4.1"
@@ -6039,7 +6039,7 @@
       }
     },
     "appium-android-driver": {
-      "version": "5.6.0",
+      "version": "5.7.0",
       "requires": {
         "@babel/runtime": "^7.0.0",
         "appium-adb": "^9.10.9",
@@ -6087,7 +6087,7 @@
       }
     },
     "appium-chromedriver": {
-      "version": "5.2.4",
+      "version": "5.2.5",
       "requires": {
         "@babel/runtime": "^7.0.0",
         "@xmldom/xmldom": "^0.x",
@@ -7035,7 +7035,7 @@
       }
     },
     "io.appium.settings": {
-      "version": "4.2.1"
+      "version": "4.2.2"
     },
     "ipaddr.js": {
       "version": "1.9.1",

package/package.json

@@ -7,7 +7,7 @@
     "automated testing",
     "android"
   ],
-  "version": "2.13.1",
+  "version": "2.13.2",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {