fix: force cast breaking deserialization of copyText

mobile-dev-inc · Sep 22, 2023 · 0f056d1 · 0f056d1
1 parent 8ef91cc
commit 0f056d1
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 6 deletions.
diff --git a/maestro-orchestra/src/main/java/maestro/orchestra/yaml/YamlFluentCommand.kt b/maestro-orchestra/src/main/java/maestro/orchestra/yaml/YamlFluentCommand.kt
@@ -526,12 +526,20 @@ data class YamlFluentCommand(
     private fun copyTextFromCommand(
         copyText: YamlElementSelectorUnion
     ): MaestroCommand {
-        return MaestroCommand(
-            CopyTextFromCommand(
-                selector = toElementSelector(copyText),
-                label = (copyText as YamlElementSelector).label
+        return if (copyText is StringElementSelector) {
+            MaestroCommand(
+                CopyTextFromCommand(
+                    selector = toElementSelector(copyText)
+                )
             )
-        )
+        } else {
+            MaestroCommand(
+                CopyTextFromCommand(
+                    selector = toElementSelector(copyText),
+                    label = (copyText as? YamlElementSelector)?.label
+                )
+            )
+        }
     }
 
     private fun scrollUntilVisibleCommand(yaml: YamlScrollUntilVisible): MaestroCommand {

diff --git a/maestro-orchestra/src/test/java/maestro/orchestra/yaml/YamlCommandReaderTest.kt b/maestro-orchestra/src/test/java/maestro/orchestra/yaml/YamlCommandReaderTest.kt
@@ -566,7 +566,34 @@ internal class YamlCommandReaderTest {
             ),
             EvalScriptCommand(
                 scriptString = "false == false"
-            )
+            ),
+            TapOnElementCommand(
+                ElementSelector(
+                    textRegex = "Hello",
+                ),
+                retryIfNoChange = true,
+                waitUntilVisible = false,
+                longPress = false
+            ),
+            TapOnElementCommand(
+                selector = ElementSelector(textRegex = "Hello"),
+                repeat = TapRepeat(2, TapOnElementCommand.DEFAULT_REPEAT_DELAY),
+                retryIfNoChange = true,
+                waitUntilVisible = false,
+                longPress = false
+            ),
+            TapOnElementCommand(
+                selector = ElementSelector(textRegex = "Hello"),
+                longPress = true,
+                retryIfNoChange = true,
+                waitUntilVisible = false
+            ),
+            AssertConditionCommand(
+                condition = Condition(
+                    visible = ElementSelector(textRegex = "Hello"),
+                ),
+            ),
+            CopyTextFromCommand(ElementSelector(textRegex = "Hello"))
         )
     }
 

diff --git a/...ro-orchestra/src/test/resources/YamlCommandReaderTest/024_string_non_string_commands.yaml b/...ro-orchestra/src/test/resources/YamlCommandReaderTest/024_string_non_string_commands.yaml
@@ -12,3 +12,8 @@ appId: com.example.app
 - evalScript: 2 + 1
 - evalScript: 2
 - evalScript: false == false
+- tapOn: "Hello"
+- doubleTapOn: "Hello"
+- longPressOn: "Hello"
+- assertVisible: "Hello"
+- copyTextFrom: "Hello"