Fix native tap with instance

leancodepl · Jan 21, 2025 · 22d48fa · 22d48fa
1 parent a2bc620
commit 22d48fa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/packages/patrol/CHANGELOG.md b/packages/patrol/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Unreleased
+
+- Fix `$.native.tap()` not working with `Selector` having `instance` set.
+
 ## 3.14.0
 
 - Remove `exception` from `StepEntry`. When it was too long, it caused crash because of badly formed JSON. (#2481)

diff --git a/packages/patrol/android/src/main/kotlin/pl/leancode/patrol/AutomatorServer.kt b/packages/patrol/android/src/main/kotlin/pl/leancode/patrol/AutomatorServer.kt
@@ -168,16 +168,24 @@ class AutomatorServer(private val automation: Automator) : NativeAutomatorServer
 
     override fun tap(request: TapRequest) {
         if (request.selector != null) {
+            /// Remove instance before creating bySelector
+            var selector2 = request.selector.copy(instance = null)
+            val bySelector = selector2.toBySelector()
+
             automation.tap(
                 uiSelector = request.selector.toUiSelector(),
-                bySelector = request.selector.toBySelector(),
+                bySelector = bySelector,
                 index = request.selector.instance?.toInt() ?: 0,
                 timeout = request.timeoutMillis
             )
         } else if (request.androidSelector != null) {
+            /// Remove instance before creating bySelector
+            var androidSelector2 = request.androidSelector.copy(instance = null)
+            val bySelector = androidSelector2.toBySelector()
+
             automation.tap(
                 uiSelector = request.androidSelector.toUiSelector(),
-                bySelector = request.androidSelector.toBySelector(),
+                bySelector = bySelector,
                 index = request.androidSelector.instance?.toInt() ?: 0,
                 timeout = request.timeoutMillis
             )