appium-espresso-driver 2.13.0 → 2.13.2

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetClipboard.kt

@@ -48,7 +48,7 @@ class GetClipboard : RequestHandler<GetClipboardParams, String?> {
     }
 
     private fun toBase64String(s: String): String {
-        return Base64.encodeToString(s.toByteArray(StandardCharsets.UTF_8), Base64.DEFAULT)
+        return Base64.encodeToString(s.toByteArray(StandardCharsets.UTF_8), Base64.NO_WRAP)
     }
 
     private inner class GetClipboardRunnable internal constructor(private val contentType: ClipboardDataType) : Runnable {

package/espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/SetClipboard.kt

@@ -45,7 +45,7 @@ class SetClipboard : RequestHandler<SetClipboardParams, Void?> {
     }
 
     private fun fromBase64String(s: String?): String {
-        return String(Base64.decode(s, Base64.DEFAULT), StandardCharsets.UTF_8)
+        return String(Base64.decode(s, Base64.NO_WRAP), StandardCharsets.UTF_8)
     }
 
     // Clip feature should run with main thread

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

@@ -54,6 +54,6 @@ class ScreenshotsHelper @JvmOverloads constructor(private val view: View? = null
             }
             val outputStream = ByteArrayOutputStream()
             bitmapScreenCap.compress(Bitmap.CompressFormat.PNG, 100, outputStream)
-            return Base64.encodeToString(outputStream.toByteArray(), Base64.DEFAULT)
+            return Base64.encodeToString(outputStream.toByteArray(), Base64.NO_WRAP)
         }
 }

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.0",
+  "version": "2.13.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-espresso-driver",
-      "version": "2.13.0",
+      "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.4",
+      "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.2",
+      "version": "18.11.7",
       "license": "MIT"
     },
     "node_modules/@types/normalize-package-data": {
@@ -1206,7 +1206,7 @@
       "license": "MIT"
     },
     "node_modules/appium-adb": {
-      "version": "9.10.12",
+      "version": "9.10.14",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/support": "^2.60.0",
@@ -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": {
@@ -1412,6 +1412,10 @@
         "node": ">= 6"
       }
     },
+    "node_modules/archiver-utils/node_modules/isarray": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
     "node_modules/archiver-utils/node_modules/readable-stream": {
       "version": "2.3.7",
       "license": "MIT",
@@ -2751,7 +2755,7 @@
       }
     },
     "node_modules/io.appium.settings": {
-      "version": "4.2.1",
+      "version": "4.2.2",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=14",
@@ -2961,10 +2965,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "license": "MIT"
-    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "license": "ISC"
@@ -3119,6 +3119,10 @@
         "node": ">= 0.6.3"
       }
     },
+    "node_modules/lazystream/node_modules/isarray": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
     "node_modules/lazystream/node_modules/readable-stream": {
       "version": "2.3.7",
       "license": "MIT",
@@ -5076,7 +5080,7 @@
       "license": "ISC"
     },
     "node_modules/ws": {
-      "version": "8.9.0",
+      "version": "8.10.0",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -5379,13 +5383,13 @@
       }
     },
     "@babel/parser": {
-      "version": "7.19.4",
+      "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": {
@@ -5859,7 +5863,7 @@
       }
     },
     "@types/node": {
-      "version": "18.11.2"
+      "version": "18.11.7"
     },
     "@types/normalize-package-data": {
       "version": "2.4.1"
@@ -6001,7 +6005,7 @@
       "version": "1.1.0"
     },
     "appium-adb": {
-      "version": "9.10.12",
+      "version": "9.10.14",
       "requires": {
         "@appium/support": "^2.60.0",
         "@babel/runtime": "^7.0.0",
@@ -6035,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",
@@ -6083,7 +6087,7 @@
       }
     },
     "appium-chromedriver": {
-      "version": "5.2.4",
+      "version": "5.2.5",
       "requires": {
         "@babel/runtime": "^7.0.0",
         "@xmldom/xmldom": "^0.x",
@@ -6151,6 +6155,9 @@
         "readable-stream": "^2.0.0"
       },
       "dependencies": {
+        "isarray": {
+          "version": "1.0.0"
+        },
         "readable-stream": {
           "version": "2.3.7",
           "requires": {
@@ -7028,7 +7035,7 @@
       }
     },
     "io.appium.settings": {
-      "version": "4.2.1"
+      "version": "4.2.2"
     },
     "ipaddr.js": {
       "version": "1.9.1",
@@ -7136,9 +7143,6 @@
         "call-bind": "^1.0.2"
       }
     },
-    "isarray": {
-      "version": "1.0.0"
-    },
     "isexe": {
       "version": "2.0.0"
     },
@@ -7257,6 +7261,9 @@
         "readable-stream": "^2.0.5"
       },
       "dependencies": {
+        "isarray": {
+          "version": "1.0.0"
+        },
         "readable-stream": {
           "version": "2.3.7",
           "requires": {
@@ -8547,7 +8554,7 @@
       "version": "1.0.2"
     },
     "ws": {
-      "version": "8.9.0",
+      "version": "8.10.0",
       "requires": {}
     },
     "xhr": {

package/package.json

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