From 540ece5a407904886606705ea4b9bf374f4ebd56 Mon Sep 17 00:00:00 2001
From: ifernandezdiaz <ifernandez+github@bitwarden.com>
Date: Tue, 29 Oct 2024 20:21:08 -0300
Subject: [PATCH] QA-954: Add testtags to Send screen elements (#4162)

---
 .../platform/components/stepper/BitwardenStepper.kt | 13 +++----------
 .../ui/tools/feature/generator/GeneratorScreen.kt   |  6 ------
 .../ui/tools/feature/send/addsend/AddSendContent.kt |  5 +++--
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/stepper/BitwardenStepper.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/stepper/BitwardenStepper.kt
index 101513d90..58681d6f7 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/stepper/BitwardenStepper.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/stepper/BitwardenStepper.kt
@@ -2,8 +2,7 @@ package com.x8bit.bitwarden.ui.platform.components.stepper
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.semantics.testTag
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.input.KeyboardType
 import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.ui.platform.base.util.ZERO_WIDTH_CHARACTER
@@ -38,8 +37,6 @@ fun BitwardenStepper(
     isDecrementEnabled: Boolean = true,
     textFieldReadOnly: Boolean = true,
     stepperActionsTestTag: String? = null,
-    increaseButtonTestTag: String? = null,
-    decreaseButtonTestTag: String? = null,
 ) {
     val clampedValue = value?.coerceIn(range)
     if (clampedValue != value && clampedValue != null) {
@@ -64,9 +61,7 @@ fun BitwardenStepper(
                     }
                 },
                 isEnabled = isDecrementEnabled && !isAtRangeMinimum,
-                modifier = Modifier.semantics {
-                    decreaseButtonTestTag?.let { testTag = it }
-                },
+                modifier = Modifier.testTag("DecrementValue"),
             )
             BitwardenTonalIconButton(
                 vectorIconRes = R.drawable.ic_plus,
@@ -78,9 +73,7 @@ fun BitwardenStepper(
                     }
                 },
                 isEnabled = isIncrementEnabled && !isAtRangeMaximum,
-                modifier = Modifier.semantics {
-                    increaseButtonTestTag?.let { testTag = it }
-                },
+                modifier = Modifier.testTag("IncrementValue"),
             )
         },
         readOnly = textFieldReadOnly,
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt
index 7b2ec1347..456047e52 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt
@@ -613,8 +613,6 @@ private fun PasswordMinNumbersCounterItem(
         value = minNumbers.coerceIn(minValue, maxValue),
         range = minValue..maxValue,
         onValueChange = onPasswordMinNumbersCounterChange,
-        increaseButtonTestTag = "MinNumberIncreaseButton",
-        decreaseButtonTestTag = "MinNumberDecreaseButton",
         modifier = Modifier
             .testTag("MinNumberValueLabel")
             .padding(horizontal = 16.dp),
@@ -633,8 +631,6 @@ private fun PasswordMinSpecialCharactersCounterItem(
         value = minSpecial.coerceIn(minValue, maxValue),
         range = minValue..maxValue,
         onValueChange = onPasswordMinSpecialCharactersChange,
-        increaseButtonTestTag = "MinSpecialIncreaseButton",
-        decreaseButtonTestTag = "MinSpecialDecreaseButton",
         modifier = Modifier
             .testTag("MinSpecialValueLabel")
             .padding(horizontal = 16.dp),
@@ -720,8 +716,6 @@ private fun PassphraseNumWordsCounterItem(
         range = minValue..maxValue,
         onValueChange = onPassphraseNumWordsCounterChange,
         stepperActionsTestTag = "NumberOfWordsStepper",
-        increaseButtonTestTag = "NumberOfWordsIncreaseButton",
-        decreaseButtonTestTag = "NumberOfWordsDecreaseButton",
         modifier = Modifier
             .testTag("NumberOfWordsLabel")
             .padding(horizontal = 16.dp),
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendContent.kt
index 188caf4ee..5835e29bb 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendContent.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendContent.kt
@@ -104,7 +104,8 @@ fun AddSendContent(
                     text = stringResource(id = R.string.send_disabled_warning),
                     modifier = Modifier
                         .padding(horizontal = 16.dp)
-                        .fillMaxWidth(),
+                        .fillMaxWidth()
+                        .testTag("SendPolicyInEffectLabel"),
                 )
                 Spacer(modifier = Modifier.height(16.dp))
             }
@@ -113,7 +114,7 @@ fun AddSendContent(
                 BitwardenInfoCalloutCard(
                     text = stringResource(id = R.string.send_options_policy_in_effect),
                     modifier = Modifier
-                        .testTag(tag = "SendOptionsPolicyInEffectLabel")
+                        .testTag(tag = "SendPolicyInEffectLabel")
                         .padding(horizontal = 16.dp)
                         .fillMaxWidth(),
                 )