diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemCardContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemCardContent.kt index 2f2a4ca508..88be7b0461 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemCardContent.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemCardContent.kt @@ -55,7 +55,7 @@ fun VaultItemCardContent( readOnly = true, singleLine = false, modifier = Modifier - .semantics { testTag = "ItemRow" } + .semantics { testTag = "CardItemNameEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -70,6 +70,7 @@ fun VaultItemCardContent( readOnly = true, singleLine = false, modifier = Modifier + .semantics { testTag = "CardholderNameEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -91,8 +92,11 @@ fun VaultItemCardContent( contentDescription = stringResource(id = R.string.copy_number), ), onClick = vaultCardItemTypeHandlers.onCopyNumberClick, + modifier = Modifier.semantics { testTag = "CardCopyNumberButton" }, ) }, + passwordFieldTestTag = "CardNumberEntry", + showPasswordTestTag = "CardViewNumberButton", modifier = Modifier .fillMaxWidth() .padding(horizontal = 16.dp), @@ -110,6 +114,7 @@ fun VaultItemCardContent( readOnly = true, singleLine = false, modifier = Modifier + .semantics { testTag = "CardBrandEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -126,6 +131,7 @@ fun VaultItemCardContent( readOnly = true, singleLine = false, modifier = Modifier + .semantics { testTag = "CardExpirationEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -150,11 +156,15 @@ fun VaultItemCardContent( ), ), onClick = vaultCardItemTypeHandlers.onCopySecurityCodeClick, + modifier = Modifier + .semantics { testTag = "CardCopySecurityCodeButton" }, ) }, modifier = Modifier .fillMaxWidth() .padding(horizontal = 16.dp), + showPasswordTestTag = "CardViewSecurityCodeButton", + passwordFieldTestTag = "CardSecurityCodeEntry", ) } } @@ -176,6 +186,7 @@ fun VaultItemCardContent( readOnly = true, singleLine = false, modifier = Modifier + .semantics { testTag = "CipherNotesLabel" } .fillMaxWidth() .padding(horizontal = 16.dp), ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt index e628dd44d8..90fed54e09 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt @@ -47,7 +47,7 @@ fun VaultItemIdentityContent( readOnly = true, singleLine = false, modifier = Modifier - .semantics { testTag = "ItemRow" } + .semantics { testTag = "ItemNameEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -62,6 +62,7 @@ fun VaultItemIdentityContent( readOnly = true, singleLine = false, modifier = Modifier + .semantics { testTag = "IdentityNameEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -77,6 +78,7 @@ fun VaultItemIdentityContent( readOnly = true, singleLine = false, modifier = Modifier + .semantics { testTag = "IdentityUsernameEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -92,6 +94,7 @@ fun VaultItemIdentityContent( readOnly = true, singleLine = false, modifier = Modifier + .semantics { testTag = "IdentityCompanyEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -107,6 +110,7 @@ fun VaultItemIdentityContent( readOnly = true, singleLine = false, modifier = Modifier + .semantics { testTag = "IdentitySsnEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -122,6 +126,7 @@ fun VaultItemIdentityContent( readOnly = true, singleLine = false, modifier = Modifier + .semantics { testTag = "IdentityPassportNumberEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -137,6 +142,7 @@ fun VaultItemIdentityContent( readOnly = true, singleLine = false, modifier = Modifier + .semantics { testTag = "IdentityLicenseNumberEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -152,6 +158,7 @@ fun VaultItemIdentityContent( readOnly = true, singleLine = false, modifier = Modifier + .semantics { testTag = "IdentityEmailEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -167,6 +174,7 @@ fun VaultItemIdentityContent( readOnly = true, singleLine = false, modifier = Modifier + .semantics { testTag = "IdentityPhoneEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -182,6 +190,7 @@ fun VaultItemIdentityContent( readOnly = true, singleLine = false, modifier = Modifier + .semantics { testTag = "IdentityAddressEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -205,6 +214,7 @@ fun VaultItemIdentityContent( readOnly = true, singleLine = false, modifier = Modifier + .semantics { testTag = "CipherNotesLabel" } .fillMaxWidth() .padding(horizontal = 16.dp), ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemLoginContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemLoginContent.kt index e57001219a..93d34927c8 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemLoginContent.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemLoginContent.kt @@ -66,7 +66,7 @@ fun VaultItemLoginContent( readOnly = true, singleLine = false, modifier = Modifier - .semantics { testTag = "ItemRow" } + .semantics { testTag = "LoginItemNameEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -120,6 +120,7 @@ fun VaultItemLoginContent( isPremiumUser = loginItemState.isPremiumUser, onCopyTotpClick = vaultLoginItemTypeHandlers.onCopyTotpCodeClick, modifier = Modifier + .semantics { testTag = "LoginTotpEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -143,7 +144,6 @@ fun VaultItemLoginContent( onCopyUriClick = vaultLoginItemTypeHandlers.onCopyUriClick, onLaunchUriClick = vaultLoginItemTypeHandlers.onLaunchUriClick, modifier = Modifier - .semantics { testTag = "UriRow" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -163,6 +163,7 @@ fun VaultItemLoginContent( NotesField( notes = notes, modifier = Modifier + .semantics { testTag = "CipherNotesLabel" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -315,6 +316,7 @@ private fun PasswordField( ), ), onClick = onCheckForBreachClick, + modifier = Modifier.semantics { testTag = "LoginCheckPasswordButton" }, ) BitwardenIconButtonWithResource( iconRes = IconResource( @@ -322,15 +324,19 @@ private fun PasswordField( contentDescription = stringResource(id = R.string.copy_password), ), onClick = onCopyPasswordClick, + modifier = Modifier.semantics { testTag = "LoginCopyPasswordButton" }, ) }, modifier = modifier, + showPasswordTestTag = "LoginViewPasswordButton", + passwordFieldTestTag = "LoginPasswordEntry", ) } else { BitwardenHiddenPasswordField( label = stringResource(id = R.string.password), value = passwordData.password, - modifier = modifier, + modifier = modifier + .semantics { testTag = "LoginPasswordEntry" }, ) } } @@ -386,6 +392,7 @@ private fun TotpField( contentDescription = stringResource(id = R.string.copy_totp), ), onClick = onCopyTotpClick, + modifier = Modifier.semantics { testTag = "LoginCopyTotpButton" }, ) }, modifier = modifier, @@ -425,6 +432,7 @@ private fun UriField( contentDescription = stringResource(id = R.string.launch), ), onClick = { onLaunchUriClick(uriData.uri) }, + modifier = Modifier.semantics { testTag = "LoginLaunchUriButton" }, ) } if (uriData.isCopyable) { @@ -434,10 +442,12 @@ private fun UriField( contentDescription = stringResource(id = R.string.copy), ), onClick = { onCopyUriClick(uriData.uri) }, + modifier = Modifier.semantics { testTag = "LoginCopyUriButton" }, ) } }, modifier = modifier, + textFieldTestTag = "LoginUriEntry", ) } @@ -460,8 +470,10 @@ private fun UsernameField( contentDescription = stringResource(id = R.string.copy_username), ), onClick = onCopyUsernameClick, + modifier = Modifier.semantics { testTag = "LoginCopyUsernameButton" }, ) }, modifier = modifier, + textFieldTestTag = "LoginUsernameEntry", ) } diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemSecureNoteContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemSecureNoteContent.kt index 95fc89317f..8df667017b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemSecureNoteContent.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemSecureNoteContent.kt @@ -51,7 +51,7 @@ fun VaultItemSecureNoteContent( readOnly = true, singleLine = false, modifier = Modifier - .semantics { testTag = "ItemRow" } + .semantics { testTag = "ItemNameEntry" } .fillMaxWidth() .padding(horizontal = 16.dp), ) @@ -74,6 +74,7 @@ fun VaultItemSecureNoteContent( readOnly = true, singleLine = false, modifier = Modifier + .semantics { testTag = "CipherNotesLabel" } .fillMaxWidth() .padding(horizontal = 16.dp), )