chore: reorganize maestro tests into helpers and subflows; add full login/logout and pulling out a bill

bmc08gt · bmc08gt · commit b06ed5c79fd4 · 2026-02-26T10:42:21.000-05:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/apps/flipcash/features/scanner/src/main/kotlin/com/flipcash/app/scanner/internal/bills/BillContainerView.kt b/apps/flipcash/features/scanner/src/main/kotlin/com/flipcash/app/scanner/internal/bills/BillContainerView.kt
@@ -33,6 +33,7 @@ import androidx.compose.ui.Alignment.Companion.BottomCenter
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import cafe.adriel.voyager.navigator.currentOrThrow
@@ -119,6 +120,7 @@ internal fun BillContainer(
         modifier = Modifier
             .fillMaxSize()
             .then(modifier)
+            .testTag("scanner_view")
     ) {
         val availableUpdate by LocalAppUpdater.current.availableUpdate.collectAsStateWithLifecycle()
 
diff --git a/apps/flipcash/features/scanner/src/main/kotlin/com/flipcash/app/scanner/internal/ui/components/DecorView.kt b/apps/flipcash/features/scanner/src/main/kotlin/com/flipcash/app/scanner/internal/ui/components/DecorView.kt
@@ -31,6 +31,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -74,7 +75,7 @@ internal fun DecorView(
                         indication = null
                     ) {
                         onAction(ScannerDecorItem.Logo)
-                    },
+                    }.testTag("flipcash_logo"),
                 painter = painterResource(R.drawable.ic_flipcash_logo_w_name),
                 contentDescription = "Tap to share the app",
             )
@@ -93,7 +94,7 @@ internal fun DecorView(
                         .clip(CircleShape)
                         .unboundedClickable {
                             onAction(ScannerDecorItem.Menu)
-                        },
+                        }.testTag("menu_button"),
                     painter = painterResource(R.drawable.ic_home_options),
                     contentDescription = "",
                 )
diff --git a/apps/flipcash/shared/bills/src/main/kotlin/com/flipcash/app/bills/CashBill.kt b/apps/flipcash/shared/bills/src/main/kotlin/com/flipcash/app/bills/CashBill.kt
@@ -62,6 +62,7 @@ import androidx.compose.ui.graphics.lerp
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalResources
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.imageResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
@@ -310,6 +311,7 @@ internal fun CashBill(
                 .fillMaxHeight()
                 .fillMaxWidth(0.95f)
                 .clipToBounds()
+                .testTag("cash_bill")
         ) {
             val geometry = remember(maxWidth, maxHeight) {
                 CashBillGeometry(maxWidth, maxHeight)
diff --git a/libs/messaging/src/main/kotlin/com/getcode/manager/BottomBarManager.kt b/libs/messaging/src/main/kotlin/com/getcode/manager/BottomBarManager.kt
@@ -159,12 +159,7 @@ object BottomBarManager {
         title: String,
         message: String,
         additionalInfo: Map<String, Any?> = emptyMap(),
-        actions: List<BottomBarAction> = listOf(
-            BottomBarAction(
-                text = "OK",
-                style = BottomBarButtonStyle.Filled
-            )
-        ),
+        actions: List<BottomBarAction> = listOf(BottomBarAction.Ok),
         showCancel: Boolean = false,
         onDismiss: (fromAction: Boolean) -> Unit = { },
     ) {
diff --git a/maestro/helpers/launch_app.yaml b/maestro/helpers/launch_app.yaml
@@ -0,0 +1,6 @@
+appId: com.flipcash.app.android.dev
+---
+- launchApp:
+    clearState: true
+    arguments:
+      isUiTest: true
diff --git a/maestro/login.yaml b/maestro/login.yaml
@@ -1,23 +1,4 @@
-# maestro/login.yaml
 appId: com.flipcash.app.android.dev
 ---
-- launchApp:
-    clearState: true
-    arguments:
-      isUiTest: true
-- extendedWaitUntil:
-      visible:
-          id: "login_screen"
-- tapOn:
-    id: "login_button"
-- extendedWaitUntil:
-      visible:
-          id: seed_input_screen
-- tapOn: 
-    id: "seed_input_field"
-- inputText: ${SEED_PHRASE}
-- tapOn: 
-    id: "login_confirm_button"
-- extendedWaitUntil:
-      visible:
-          id: "scanner_screen"
+- runFlow: helpers/launch_app.yaml
+- runFlow: subflows/login.yaml
diff --git a/maestro/login_logout.yaml b/maestro/login_logout.yaml
@@ -0,0 +1,5 @@
+appId: com.flipcash.app.android.dev
+---
+- runFlow: helpers/launch_app.yaml
+- runFlow: subflows/login.yaml
+- runFlow: subflows/logout.yaml
diff --git a/maestro/show_bill_and_put_back_in_wallet.yaml b/maestro/show_bill_and_put_back_in_wallet.yaml
@@ -0,0 +1,9 @@
+appId: com.flipcash.app.android.dev
+---
+- runFlow: helpers/launch_app.yaml
+- runFlow: subflows/login.yaml
+- runFlow: subflows/pull_out_bill.yaml
+- tapOn: Cancel
+- extendedWaitUntil:
+      visible:
+          id: "scanner_screen"
diff --git a/maestro/subflows/login.yaml b/maestro/subflows/login.yaml
@@ -0,0 +1,14 @@
+# Login
+appId: com.flipcash.app.android.dev
+---
+- tapOn: Log in
+- extendedWaitUntil:
+      visible:
+          id: seed_input_screen
+- tapOn: 
+    id: "seed_input_field"
+- inputText: ${SEED_PHRASE}
+- tapOn: Log in
+- extendedWaitUntil:
+      visible:
+          id: "scanner_screen"
diff --git a/maestro/subflows/logout.yaml b/maestro/subflows/logout.yaml
@@ -0,0 +1,20 @@
+# Reusable Logout flow
+appId: com.flipcash.app.android.dev
+---
+- tapOn:
+    id: scanner_view
+- extendedWaitUntil:
+      visible:
+          id: scanner_screen
+- tapOn:
+    id: menu_button
+- extendedWaitUntil:
+      visible:
+          id: menu_screen
+- tapOn: Log Out
+- assertVisible: Log Out
+- assertVisible: Cancel
+- tapOn: Log Out
+- extendedWaitUntil:
+      visible:
+          id: login_screen
diff --git a/maestro/subflows/pull_out_bill.yaml b/maestro/subflows/pull_out_bill.yaml
@@ -0,0 +1,21 @@
+appId: com.flipcash.app.android.dev
+---
+- tapOn: Give
+- extendedWaitUntil:
+      visible: Float
+- extendedWaitUntil:
+      visible:
+        id: "keypad_dot"
+- tapOn: 
+    id: "keypad_dot"
+- tapOn: 
+    id: "keypad_1"
+- tapOn: 
+    id: "keypad_0"
+- assertVisible:
+    text: "Next"
+    enabled: true
+- tapOn: Next
+- extendedWaitUntil:
+      visible:
+        id: cash_bill
diff --git a/ui/components/src/main/kotlin/com/getcode/ui/components/TitleBar.kt b/ui/components/src/main/kotlin/com/getcode/ui/components/TitleBar.kt
@@ -21,6 +21,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.SubcomposeLayout
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextOverflow
@@ -46,6 +47,7 @@ object AppBarDefaults {
             modifier = modifier
                 .requiredSize(24.dp)
                 .unboundedClickable { onClick() }
+                .testTag("action_back")
         )
     }
 
@@ -58,6 +60,7 @@ object AppBarDefaults {
             modifier = modifier
                 .requiredSize(24.dp)
                 .unboundedClickable { onClick() }
+                .testTag("action_close")
         )
     }
 
@@ -70,6 +73,7 @@ object AppBarDefaults {
             modifier = modifier
                 .requiredSize(24.dp)
                 .unboundedClickable { onClick() }
+                .testTag("action_share")
         )
     }
 
diff --git a/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeButton.kt b/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeButton.kt
@@ -1,10 +1,7 @@
 package com.getcode.ui.theme
 
-import android.graphics.RenderEffect
 import android.graphics.RuntimeShader
-import android.graphics.Shader
 import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
@@ -46,31 +43,17 @@ import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
-import androidx.compose.ui.draw.blur
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.drawWithCache
 import androidx.compose.ui.draw.drawWithContent
-import androidx.compose.ui.draw.innerShadow
 import androidx.compose.ui.draw.shadow
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.geometry.Rect
-import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.BlendMode
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Paint
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.ShaderBrush
 import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.graphics.asComposeRenderEffect
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.graphics.takeOrElse
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.isSpecified
@@ -86,7 +69,6 @@ import com.getcode.ui.components.R
 import com.getcode.ui.core.addIf
 import com.getcode.ui.core.measured
 import com.getcode.ui.utils.plus
-import com.getcode.ui.utils.toPx
 
 enum class ButtonState {
     Bordered,
diff --git a/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeKeyPad.kt b/ui/components/src/main/kotlin/com/getcode/ui/theme/CodeKeyPad.kt
@@ -32,6 +32,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInteropFilter
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.getcode.theme.CodeTheme
@@ -77,6 +78,7 @@ fun CodeKeyPad(
                                     KeyBoardButton(
                                         modifier = Modifier.weight(1f),
                                         text = DecimalFormatSymbols.getInstance().decimalSeparator.toString(),
+                                        testTag = "keypad_dot",
                                     ) { onDecimal() }
                                 } else {
                                     Spacer(modifier = Modifier.weight(1f),)
@@ -112,6 +114,7 @@ private fun NumberButton(
 private fun KeyBoardButton(
     modifier: Modifier = Modifier,
     text: String? = null,
+    testTag: String = "keypad_$text",
     resId: Int? = null,
     onClick: () -> Unit
 ) {
@@ -174,7 +177,7 @@ private fun KeyBoardButton(
                                 .graphicsLayer(
                                     scaleX = scale,
                                     scaleY = scale
-                                )
+                                ).testTag(testTag)
                         )
                     }
                 }
diff --git a/ui/scanner/src/main/kotlin/com/getcode/ui/scanner/CodeScanner.kt b/ui/scanner/src/main/kotlin/com/getcode/ui/scanner/CodeScanner.kt
@@ -27,6 +27,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
