Skip to content

Commit 54e74e9

Browse files
ifernandezdiazifernandezdiaz
authored
QA-1702: Adding missing testTags for TestHarness app (#6763)
1 parent 61955d7 commit 54e74e9

7 files changed

Lines changed: 82 additions & 31 deletions

File tree

‎testharness/src/main/kotlin/com/bitwarden/testharness/ui/platform/feature/createpasskey/CreatePasskeyScreen.kt‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import androidx.compose.runtime.Composable
1818
import androidx.compose.runtime.getValue
1919
import androidx.compose.ui.Modifier
2020
import androidx.compose.ui.input.nestedscroll.nestedScroll
21+
import androidx.compose.ui.platform.testTag
2122
import androidx.compose.ui.res.stringResource
2223
import androidx.compose.ui.tooling.preview.Preview
2324
import androidx.compose.ui.unit.dp
@@ -107,7 +108,9 @@ private fun CreatePasskeyScreenContent(
107108
value = state.username,
108109
onValueChange = onUsernameChange,
109110
cardStyle = null,
110-
modifier = Modifier.fillMaxWidth(),
111+
modifier = Modifier
112+
.fillMaxWidth()
113+
.testTag("PasskeyUsernameField"),
111114
)
112115

113116
Spacer(modifier = Modifier.height(16.dp))
@@ -118,7 +121,9 @@ private fun CreatePasskeyScreenContent(
118121
onValueChange = onRpIdChange,
119122
placeholder = stringResource(R.string.rp_id_hint),
120123
cardStyle = null,
121-
modifier = Modifier.fillMaxWidth(),
124+
modifier = Modifier
125+
.fillMaxWidth()
126+
.testTag("PasskeyRelyingPartyIdField"),
122127
)
123128

124129
Spacer(modifier = Modifier.height(16.dp))
@@ -129,7 +134,9 @@ private fun CreatePasskeyScreenContent(
129134
onValueChange = onOriginChange,
130135
placeholder = stringResource(R.string.origin_hint),
131136
cardStyle = null,
132-
modifier = Modifier.fillMaxWidth(),
137+
modifier = Modifier
138+
.fillMaxWidth()
139+
.testTag("PasskeyOriginField"),
133140
)
134141

135142
Spacer(modifier = Modifier.height(16.dp))
@@ -138,7 +145,9 @@ private fun CreatePasskeyScreenContent(
138145
label = stringResource(R.string.execute),
139146
onClick = onExecuteClick,
140147
isEnabled = !state.isLoading,
141-
modifier = Modifier.fillMaxWidth(),
148+
modifier = Modifier
149+
.fillMaxWidth()
150+
.testTag("PasskeyExecuteButton"),
142151
)
143152

144153
Spacer(modifier = Modifier.height(12.dp))
@@ -147,7 +156,9 @@ private fun CreatePasskeyScreenContent(
147156
label = stringResource(BitwardenString.clear),
148157
onClick = onClearResultClick,
149158
isEnabled = !state.isLoading,
150-
modifier = Modifier.fillMaxWidth(),
159+
modifier = Modifier
160+
.fillMaxWidth()
161+
.testTag("PasskeyClearButton"),
151162
)
152163

153164
Spacer(modifier = Modifier.height(16.dp))
@@ -159,7 +170,9 @@ private fun CreatePasskeyScreenContent(
159170
cardStyle = null,
160171
readOnly = true,
161172
singleLine = false,
162-
modifier = Modifier.fillMaxWidth(),
173+
modifier = Modifier
174+
.fillMaxWidth()
175+
.testTag("PasskeyResultTextField"),
163176
)
164177

165178
Spacer(modifier = Modifier.height(16.dp))

‎testharness/src/main/kotlin/com/bitwarden/testharness/ui/platform/feature/createpassword/CreatePasswordScreen.kt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import androidx.compose.runtime.Composable
1616
import androidx.compose.runtime.getValue
1717
import androidx.compose.ui.Modifier
1818
import androidx.compose.ui.input.nestedscroll.nestedScroll
19+
import androidx.compose.ui.platform.testTag
1920
import androidx.compose.ui.res.stringResource
2021
import androidx.compose.ui.unit.dp
2122
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
@@ -86,7 +87,8 @@ fun CreatePasswordScreen(
8687
cardStyle = null,
8788
modifier = Modifier
8889
.fillMaxWidth()
89-
.standardHorizontalMargin(),
90+
.standardHorizontalMargin()
91+
.testTag("PasswordUsernameField"),
9092
)
9193

9294
Spacer(modifier = Modifier.height(16.dp))
@@ -100,7 +102,8 @@ fun CreatePasswordScreen(
100102
cardStyle = null,
101103
modifier = Modifier
102104
.fillMaxWidth()
103-
.standardHorizontalMargin(),
105+
.standardHorizontalMargin()
106+
.testTag("PasswordField"),
104107
)
105108

106109
Spacer(modifier = Modifier.height(16.dp))
@@ -111,7 +114,8 @@ fun CreatePasswordScreen(
111114
isEnabled = !state.isLoading,
112115
modifier = Modifier
113116
.fillMaxWidth()
114-
.standardHorizontalMargin(),
117+
.standardHorizontalMargin()
118+
.testTag("PasswordExecuteButton"),
115119
)
116120

117121
Spacer(modifier = Modifier.height(12.dp))
@@ -122,7 +126,8 @@ fun CreatePasswordScreen(
122126
isEnabled = !state.isLoading,
123127
modifier = Modifier
124128
.fillMaxWidth()
125-
.standardHorizontalMargin(),
129+
.standardHorizontalMargin()
130+
.testTag("PasswordClearButton"),
126131
)
127132

128133
Spacer(modifier = Modifier.height(16.dp))
@@ -136,7 +141,8 @@ fun CreatePasswordScreen(
136141
singleLine = false,
137142
modifier = Modifier
138143
.fillMaxWidth()
139-
.standardHorizontalMargin(),
144+
.standardHorizontalMargin()
145+
.testTag("PasswordResultTextField"),
140146
)
141147

142148
Spacer(modifier = Modifier.height(16.dp))

‎testharness/src/main/kotlin/com/bitwarden/testharness/ui/platform/feature/credentialmanager/CredentialManagerListScreen.kt‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import androidx.compose.material3.TopAppBarDefaults
1313
import androidx.compose.runtime.Composable
1414
import androidx.compose.ui.Modifier
1515
import androidx.compose.ui.input.nestedscroll.nestedScroll
16+
import androidx.compose.ui.platform.testTag
1617
import androidx.compose.ui.res.stringResource
1718
import androidx.compose.ui.unit.dp
1819
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
@@ -109,7 +110,9 @@ fun CredentialManagerListScreen(
109110
text = stringResource(id = R.string.get_password),
110111
onClick = { viewModel.trySendAction(CredentialManagerListAction.GetPasswordClick) },
111112
cardStyle = CardStyle.Top(),
112-
modifier = Modifier.standardHorizontalMargin(),
113+
modifier = Modifier
114+
.standardHorizontalMargin()
115+
.testTag("GetPasswordRow"),
113116
)
114117

115118
BitwardenPushRow(
@@ -118,14 +121,18 @@ fun CredentialManagerListScreen(
118121
viewModel.trySendAction(CredentialManagerListAction.CreatePasswordClick)
119122
},
120123
cardStyle = CardStyle.Middle(),
121-
modifier = Modifier.standardHorizontalMargin(),
124+
modifier = Modifier
125+
.standardHorizontalMargin()
126+
.testTag("CreatePasswordRow"),
122127
)
123128

124129
BitwardenPushRow(
125130
text = stringResource(id = R.string.get_passkey),
126131
onClick = { viewModel.trySendAction(CredentialManagerListAction.GetPasskeyClick) },
127132
cardStyle = CardStyle.Middle(),
128-
modifier = Modifier.standardHorizontalMargin(),
133+
modifier = Modifier
134+
.standardHorizontalMargin()
135+
.testTag("GetPasskeyRow"),
129136
)
130137

131138
BitwardenPushRow(
@@ -134,7 +141,9 @@ fun CredentialManagerListScreen(
134141
viewModel.trySendAction(CredentialManagerListAction.CreatePasskeyClick)
135142
},
136143
cardStyle = CardStyle.Middle(),
137-
modifier = Modifier.standardHorizontalMargin(),
144+
modifier = Modifier
145+
.standardHorizontalMargin()
146+
.testTag("CreatePasskeyRow"),
138147
)
139148

140149
BitwardenPushRow(
@@ -143,7 +152,9 @@ fun CredentialManagerListScreen(
143152
viewModel.trySendAction(CredentialManagerListAction.GetPasswordOrPasskeyClick)
144153
},
145154
cardStyle = CardStyle.Bottom,
146-
modifier = Modifier.standardHorizontalMargin(),
155+
modifier = Modifier
156+
.standardHorizontalMargin()
157+
.testTag("GetPasswordOrPasskeyRow"),
147158
)
148159

149160
Spacer(Modifier.height(16.dp))

‎testharness/src/main/kotlin/com/bitwarden/testharness/ui/platform/feature/getpasskey/GetPasskeyScreen.kt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import androidx.compose.runtime.Composable
1616
import androidx.compose.runtime.getValue
1717
import androidx.compose.ui.Modifier
1818
import androidx.compose.ui.input.nestedscroll.nestedScroll
19+
import androidx.compose.ui.platform.testTag
1920
import androidx.compose.ui.res.stringResource
2021
import androidx.compose.ui.unit.dp
2122
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
@@ -83,7 +84,8 @@ fun GetPasskeyScreen(
8384
cardStyle = null,
8485
modifier = Modifier
8586
.fillMaxWidth()
86-
.standardHorizontalMargin(),
87+
.standardHorizontalMargin()
88+
.testTag("PasskeyRelyingPartyIdField"),
8789
)
8890

8991
Spacer(modifier = Modifier.height(16.dp))
@@ -96,7 +98,8 @@ fun GetPasskeyScreen(
9698
cardStyle = null,
9799
modifier = Modifier
98100
.fillMaxWidth()
99-
.standardHorizontalMargin(),
101+
.standardHorizontalMargin()
102+
.testTag("PasskeyOriginField"),
100103
)
101104

102105
Spacer(modifier = Modifier.height(16.dp))
@@ -107,7 +110,8 @@ fun GetPasskeyScreen(
107110
isEnabled = !state.isLoading,
108111
modifier = Modifier
109112
.fillMaxWidth()
110-
.standardHorizontalMargin(),
113+
.standardHorizontalMargin()
114+
.testTag("GetPasskeyExecuteButton"),
111115
)
112116

113117
Spacer(modifier = Modifier.height(12.dp))
@@ -118,7 +122,8 @@ fun GetPasskeyScreen(
118122
isEnabled = !state.isLoading,
119123
modifier = Modifier
120124
.fillMaxWidth()
121-
.standardHorizontalMargin(),
125+
.standardHorizontalMargin()
126+
.testTag("GetPasskeyClearButton"),
122127
)
123128

124129
Spacer(modifier = Modifier.height(16.dp))
@@ -132,7 +137,8 @@ fun GetPasskeyScreen(
132137
singleLine = false,
133138
modifier = Modifier
134139
.fillMaxWidth()
135-
.standardHorizontalMargin(),
140+
.standardHorizontalMargin()
141+
.testTag("GetPasskeyResultTextField"),
136142
)
137143

138144
Spacer(modifier = Modifier.height(16.dp))

‎testharness/src/main/kotlin/com/bitwarden/testharness/ui/platform/feature/getpassword/GetPasswordScreen.kt‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import androidx.compose.runtime.Composable
1717
import androidx.compose.runtime.getValue
1818
import androidx.compose.ui.Modifier
1919
import androidx.compose.ui.input.nestedscroll.nestedScroll
20+
import androidx.compose.ui.platform.testTag
2021
import androidx.compose.ui.res.stringResource
2122
import androidx.compose.ui.unit.dp
2223
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
@@ -96,7 +97,8 @@ fun GetPasswordScreen(
9697
isEnabled = !state.isLoading,
9798
modifier = Modifier
9899
.fillMaxWidth()
99-
.standardHorizontalMargin(),
100+
.standardHorizontalMargin()
101+
.testTag("GetPaswordExecuteButton"),
100102
)
101103

102104
Spacer(modifier = Modifier.height(12.dp))
@@ -107,7 +109,8 @@ fun GetPasswordScreen(
107109
isEnabled = !state.isLoading,
108110
modifier = Modifier
109111
.fillMaxWidth()
110-
.standardHorizontalMargin(),
112+
.standardHorizontalMargin()
113+
.testTag("GetPasswordClearButton"),
111114
)
112115

113116
Spacer(modifier = Modifier.height(16.dp))
@@ -121,7 +124,8 @@ fun GetPasswordScreen(
121124
singleLine = false,
122125
modifier = Modifier
123126
.fillMaxWidth()
124-
.standardHorizontalMargin(),
127+
.standardHorizontalMargin()
128+
.testTag("GetPasswordResultTextField"),
125129
)
126130

127131
Spacer(modifier = Modifier.height(16.dp))

‎testharness/src/main/kotlin/com/bitwarden/testharness/ui/platform/feature/getpasswordorpasskey/GetPasswordOrPasskeyScreen.kt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import androidx.compose.runtime.Composable
1616
import androidx.compose.runtime.getValue
1717
import androidx.compose.ui.Modifier
1818
import androidx.compose.ui.input.nestedscroll.nestedScroll
19+
import androidx.compose.ui.platform.testTag
1920
import androidx.compose.ui.res.stringResource
2021
import androidx.compose.ui.unit.dp
2122
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
@@ -92,7 +93,8 @@ fun GetPasswordOrPasskeyScreen(
9293
cardStyle = null,
9394
modifier = Modifier
9495
.fillMaxWidth()
95-
.standardHorizontalMargin(),
96+
.standardHorizontalMargin()
97+
.testTag("GetPasswordOrPasskeyRelyingPartyIdField"),
9698
)
9799

98100
Spacer(modifier = Modifier.height(16.dp))
@@ -107,7 +109,8 @@ fun GetPasswordOrPasskeyScreen(
107109
cardStyle = null,
108110
modifier = Modifier
109111
.fillMaxWidth()
110-
.standardHorizontalMargin(),
112+
.standardHorizontalMargin()
113+
.testTag("GetPasswordOrPasskeyOriginField"),
111114
)
112115

113116
Spacer(modifier = Modifier.height(16.dp))
@@ -118,7 +121,8 @@ fun GetPasswordOrPasskeyScreen(
118121
isEnabled = !state.isLoading,
119122
modifier = Modifier
120123
.fillMaxWidth()
121-
.standardHorizontalMargin(),
124+
.standardHorizontalMargin()
125+
.testTag("GetPasswordOrPasskeyExecuteButton"),
122126
)
123127

124128
Spacer(modifier = Modifier.height(12.dp))
@@ -129,7 +133,8 @@ fun GetPasswordOrPasskeyScreen(
129133
isEnabled = !state.isLoading,
130134
modifier = Modifier
131135
.fillMaxWidth()
132-
.standardHorizontalMargin(),
136+
.standardHorizontalMargin()
137+
.testTag("GetPasswordOrPasskeyClearButton"),
133138
)
134139

135140
Spacer(modifier = Modifier.height(16.dp))
@@ -143,7 +148,8 @@ fun GetPasswordOrPasskeyScreen(
143148
singleLine = false,
144149
modifier = Modifier
145150
.fillMaxWidth()
146-
.standardHorizontalMargin(),
151+
.standardHorizontalMargin()
152+
.testTag("GetPasswordOrPasskeyResultField"),
147153
)
148154

149155
Spacer(modifier = Modifier.height(16.dp))

‎testharness/src/main/kotlin/com/bitwarden/testharness/ui/platform/feature/landing/LandingScreen.kt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.compose.material3.rememberTopAppBarState
1515
import androidx.compose.runtime.Composable
1616
import androidx.compose.ui.Modifier
1717
import androidx.compose.ui.input.nestedscroll.nestedScroll
18+
import androidx.compose.ui.platform.testTag
1819
import androidx.compose.ui.res.stringResource
1920
import androidx.compose.ui.tooling.preview.Preview
2021
import androidx.compose.ui.unit.dp
@@ -96,14 +97,18 @@ private fun LandingScreenContent(
9697
text = stringResource(id = R.string.autofill),
9798
onClick = onAutofillClick,
9899
cardStyle = CardStyle.Top(),
99-
modifier = Modifier.standardHorizontalMargin(),
100+
modifier = Modifier
101+
.standardHorizontalMargin()
102+
.testTag("AutofillCategory"),
100103
)
101104

102105
BitwardenPushRow(
103106
text = stringResource(id = R.string.credential_manager),
104107
onClick = onCredentialManagerClick,
105108
cardStyle = CardStyle.Bottom,
106-
modifier = Modifier.standardHorizontalMargin(),
109+
modifier = Modifier
110+
.standardHorizontalMargin()
111+
.testTag("CredentialManagerCategory"),
107112
)
108113

109114
Spacer(modifier = Modifier.height(16.dp))

0 commit comments

Comments
 (0)