Fix instrumented tests

Author: fibelatti

app/src/androidTest/kotlin/com/fibelatti/pinboard/LinkdingEndToEndTests.kt

@@ -18,7 +18,6 @@ import dagger.hilt.android.testing.HiltAndroidTest
 import javax.inject.Inject
 import org.junit.After
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
@@ -91,15 +90,14 @@ class LinkdingEndToEndTests {
                 timeoutMillis = DEFAULT_TIMEOUT,
             )
             onNodeWithText("Google").assertIsDisplayed()
-            onNodeWithText("Private").assertIsDisplayed()
-            onNodeWithText("Read later").assertIsDisplayed()
+            onNodeWithTag("private-flag").assertIsDisplayed()
+            onNodeWithTag("read-later-flag").assertIsDisplayed()
             onNodeWithText("kotlin").assertIsDisplayed()
             onNodeWithText("dev").assertIsDisplayed()
         }
     }
 
     @Test
-    @Ignore("Currently flaky on CI — Needs investigation")
     fun userCanLoginAndAddBookmarks() {
         val context = composeRule.activity
 
@@ -167,8 +165,8 @@ class LinkdingEndToEndTests {
                 timeoutMillis = DEFAULT_TIMEOUT,
             )
             onNodeWithText("Google").assertIsDisplayed()
-            onNodeWithText("Private").assertIsDisplayed()
-            onNodeWithText("Read later").assertIsDisplayed()
+            onNodeWithTag("private-flag").assertIsDisplayed()
+            onNodeWithTag("read-later-flag").assertIsDisplayed()
             onNodeWithText("kotlin").assertIsDisplayed()
             onNodeWithText("dev").assertIsDisplayed()
         }

app/src/androidTest/kotlin/com/fibelatti/pinboard/PinboardEndToEndTests.kt

@@ -106,8 +106,8 @@ class PinboardEndToEndTests {
                 timeoutMillis = DEFAULT_TIMEOUT,
             )
             onNodeWithText("Google").assertIsDisplayed()
-            onNodeWithText("Private").assertIsDisplayed()
-            onNodeWithText("Read later").assertIsDisplayed()
+            onNodeWithTag("private-flag").assertIsDisplayed()
+            onNodeWithTag("read-later-flag").assertIsDisplayed()
             onNodeWithText("android").assertIsDisplayed()
             onNodeWithText("dev").assertIsDisplayed()
         }
@@ -177,8 +177,8 @@ class PinboardEndToEndTests {
                 timeoutMillis = DEFAULT_TIMEOUT,
             )
             onNodeWithText("Google").assertIsDisplayed()
-            onNodeWithText("Private").assertIsDisplayed()
-            onNodeWithText("Read later").assertIsDisplayed()
+            onNodeWithTag("private-flag").assertIsDisplayed()
+            onNodeWithTag("read-later-flag").assertIsDisplayed()
             onNodeWithText("android").assertIsDisplayed()
             onNodeWithText("dev").assertIsDisplayed()
         }

app/src/main/kotlin/com/fibelatti/pinboard/features/posts/presentation/BookmarkListScreen.kt

@@ -53,6 +53,7 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
@@ -853,7 +854,8 @@ private fun BookmarkFlags(
                         color = MaterialTheme.colorScheme.surfaceVariant,
                     )
                     .clickable(onClick = onPrivateClicked)
-                    .padding(all = 8.dp),
+                    .padding(all = 8.dp)
+                    .testTag("private-flag"),
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_private),
@@ -873,7 +875,8 @@ private fun BookmarkFlags(
                         color = MaterialTheme.colorScheme.surfaceVariant,
                     )
                     .clickable(onClick = onReadLaterClicked)
-                    .padding(all = 8.dp),
+                    .padding(all = 8.dp)
+                    .testTag("read-later-flag"),
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_read_later),