From 1bb91bce65b6d5e81b7593eea33775911ad81622 Mon Sep 17 00:00:00 2001
From: M57 <41645758+Hy4ri@users.noreply.github.com>
Date: Thu, 17 Sep 2026 00:54:53 +0300
Subject: [PATCH] fix(kanban): scroll workspace row before instrumented clicks
 (#1137)

---
 .../com/m57/hermescontrol/ui/kanban/KanbanScreenTest.kt     | 4 ++++
 .../ui/kanban/components/KanbanCreateTaskDialog.kt          | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/com/m57/hermescontrol/ui/kanban/KanbanScreenTest.kt b/app/src/androidTest/java/com/m57/hermescontrol/ui/kanban/KanbanScreenTest.kt
index 4d7ef777..52c65fde 100644
--- a/app/src/androidTest/java/com/m57/hermescontrol/ui/kanban/KanbanScreenTest.kt
+++ b/app/src/androidTest/java/com/m57/hermescontrol/ui/kanban/KanbanScreenTest.kt
@@ -1,6 +1,7 @@
 package com.m57.hermescontrol.ui.kanban
 
 import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsSelected
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
@@ -74,10 +75,13 @@ class KanbanScreenTest {
         composeTestRule.onNodeWithTag("kanban_workspace_path").assertDoesNotExist()
 
         // Select Worktree
+        composeTestRule.onNodeWithTag("kanban_workspace_kinds").performScrollTo()
         composeTestRule.onNodeWithTag("kanban_workspace_kind_worktree").performClick()
+        composeTestRule.onNodeWithTag("kanban_workspace_kind_worktree").assertIsSelected()
         composeTestRule.onNodeWithTag("kanban_workspace_path").performScrollTo().assertIsDisplayed()
 
         // Select Scratch again
+        composeTestRule.onNodeWithTag("kanban_workspace_kinds").performScrollTo()
         composeTestRule.onNodeWithTag("kanban_workspace_kind_scratch").performClick()
         composeTestRule.onNodeWithTag("kanban_workspace_path").assertDoesNotExist()
     }
diff --git a/app/src/main/java/com/m57/hermescontrol/ui/kanban/components/KanbanCreateTaskDialog.kt b/app/src/main/java/com/m57/hermescontrol/ui/kanban/components/KanbanCreateTaskDialog.kt
index dbbc28e2..bc2ff92d 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/kanban/components/KanbanCreateTaskDialog.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/kanban/components/KanbanCreateTaskDialog.kt
@@ -414,7 +414,11 @@ fun KanbanCreateTaskDialog(
                         Spacer(modifier = Modifier.height(4.dp))
                         Row(
                             horizontalArrangement = Arrangement.spacedBy(6.dp),
-                            modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()),
+                            modifier =
+                                Modifier
+                                    .fillMaxWidth()
+                                    .horizontalScroll(rememberScrollState())
+                                    .testTag("kanban_workspace_kinds"),
                         ) {
                             listOf(
                                 "scratch" to stringResource(R.string.kanban_workspace_scratch),