Skip to content

Commit a014bc3

Browse files
committed
feat: e2e test tags wip
1 parent eb8c4cc commit a014bc3

File tree

17 files changed

+147
-111
lines changed

17 files changed

+147
-111
lines changed

app/src/androidTest/java/to/bitkit/ui/components/KeyboardTest.kt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,34 +28,34 @@ class KeyboardTest {
2828
Keyboard(onClick = {}, onClickBackspace = {})
2929
}
3030

31-
composeTestRule.onNodeWithTag("KeyboardButton_1").assertIsDisplayed()
32-
composeTestRule.onNodeWithTag("KeyboardButton_2").assertIsDisplayed()
33-
composeTestRule.onNodeWithTag("KeyboardButton_3").assertIsDisplayed()
34-
composeTestRule.onNodeWithTag("KeyboardButton_4").assertIsDisplayed()
35-
composeTestRule.onNodeWithTag("KeyboardButton_5").assertIsDisplayed()
36-
composeTestRule.onNodeWithTag("KeyboardButton_6").assertIsDisplayed()
37-
composeTestRule.onNodeWithTag("KeyboardButton_7").assertIsDisplayed()
38-
composeTestRule.onNodeWithTag("KeyboardButton_8").assertIsDisplayed()
39-
composeTestRule.onNodeWithTag("KeyboardButton_9").assertIsDisplayed()
40-
composeTestRule.onNodeWithTag("KeyboardButton_.").assertIsDisplayed()
41-
composeTestRule.onNodeWithTag("KeyboardButton_0").assertIsDisplayed()
42-
composeTestRule.onNodeWithTag("KeyboardButton_backspace").assertIsDisplayed()
31+
composeTestRule.onNodeWithTag("N1").assertIsDisplayed()
32+
composeTestRule.onNodeWithTag("N2").assertIsDisplayed()
33+
composeTestRule.onNodeWithTag("N3").assertIsDisplayed()
34+
composeTestRule.onNodeWithTag("N4").assertIsDisplayed()
35+
composeTestRule.onNodeWithTag("N5").assertIsDisplayed()
36+
composeTestRule.onNodeWithTag("N6").assertIsDisplayed()
37+
composeTestRule.onNodeWithTag("N7").assertIsDisplayed()
38+
composeTestRule.onNodeWithTag("N8").assertIsDisplayed()
39+
composeTestRule.onNodeWithTag("N9").assertIsDisplayed()
40+
composeTestRule.onNodeWithTag("N.").assertIsDisplayed()
41+
composeTestRule.onNodeWithTag("N0").assertIsDisplayed()
42+
composeTestRule.onNodeWithTag("NRemove").assertIsDisplayed()
4343
}
4444

4545
@Test
4646
fun keyboard_tripleZero_when_not_decimal() {
4747
composeTestRule.setContent {
4848
Keyboard(onClick = {}, isDecimal = false, onClickBackspace = {})
4949
}
50-
composeTestRule.onNodeWithTag("KeyboardButton_000").assertIsDisplayed()
50+
composeTestRule.onNodeWithTag("N000").assertIsDisplayed()
5151
}
5252

5353
@Test
5454
fun keyboard_decimal_when_decimal() {
5555
composeTestRule.setContent {
5656
Keyboard(onClick = {}, isDecimal = true, onClickBackspace = {})
5757
}
58-
composeTestRule.onNodeWithTag("KeyboardButton_.").assertIsDisplayed()
58+
composeTestRule.onNodeWithTag("N.").assertIsDisplayed()
5959
}
6060

6161
@Test
@@ -65,13 +65,13 @@ class KeyboardTest {
6565
Keyboard(onClick = { clickedValue = it }, onClickBackspace = {})
6666
}
6767

68-
composeTestRule.onNodeWithTag("KeyboardButton_5").performClick()
68+
composeTestRule.onNodeWithTag("N5").performClick()
6969
assert(clickedValue == "5")
7070

71-
composeTestRule.onNodeWithTag("KeyboardButton_.").performClick()
71+
composeTestRule.onNodeWithTag("N.").performClick()
7272
assert(clickedValue == ".")
7373

74-
composeTestRule.onNodeWithTag("KeyboardButton_0").performClick()
74+
composeTestRule.onNodeWithTag("N0").performClick()
7575
assert(clickedValue == "0")
7676

7777
}
@@ -83,7 +83,7 @@ class KeyboardTest {
8383
Keyboard(onClick = { clickedValue = it }, onClickBackspace = {}, isDecimal = false)
8484
}
8585

86-
composeTestRule.onNodeWithTag("KeyboardButton_000").performClick()
86+
composeTestRule.onNodeWithTag("N000").performClick()
8787
assert(clickedValue == "000")
8888
}
8989

app/src/androidTest/java/to/bitkit/ui/settings/quickPay/QuickPaySettingsScreenTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class QuickPaySettingsScreenTest {
3636
}
3737
}
3838

39-
composeTestRule.onNodeWithTag("quickpay_toggle_switch").assertIsDisplayed()
39+
composeTestRule.onNodeWithTag("QuickpayToggle").assertIsDisplayed()
4040
composeTestRule.onNodeWithTag("quickpay_amount_slider").assertIsDisplayed()
4141
}
4242

@@ -58,7 +58,7 @@ class QuickPaySettingsScreenTest {
5858
}
5959
}
6060

61-
composeTestRule.onNodeWithTag("quickpay_toggle_switch")
61+
composeTestRule.onNodeWithTag("QuickpayToggle")
6262
.performClick()
6363

6464
assert(toggleCalled)

app/src/main/java/to/bitkit/models/Suggestion.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ enum class Suggestion(
1818
color = Colors.Brand,
1919
icon = R.drawable.b_emboss
2020
),
21-
SPEND(
21+
LIGHTNING(
2222
title = R.string.cards__lightning__title,
2323
description = R.string.cards__lightning__description,
2424
color = Colors.Purple,

app/src/main/java/to/bitkit/ui/components/BalanceHeaderView.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ fun BalanceHeader(
183183
modifier = Modifier
184184
.size(24.dp)
185185
.clickableAlpha { onToggleHideBalance() }
186+
.testTag("ShowBalance")
186187
)
187188
}
188189
}

app/src/main/java/to/bitkit/ui/components/Keyboard.kt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,22 @@ fun Keyboard(
8080
item { KeyTextButton(text = "7", onClick = onClick, buttonHeight = buttonHeight) }
8181
item { KeyTextButton(text = "8", onClick = onClick, buttonHeight = buttonHeight) }
8282
item { KeyTextButton(text = "9", onClick = onClick, buttonHeight = buttonHeight) }
83-
item { KeyTextButton(text = if (isDecimal) "." else "000", onClick = onClick, buttonHeight = buttonHeight) }
83+
item {
84+
KeyTextButton(
85+
text = if (isDecimal) "." else "000",
86+
onClick = onClick,
87+
buttonHeight = buttonHeight,
88+
testTag = if (isDecimal) "NDecimal" else "N000",
89+
)
90+
}
8491
item { KeyTextButton(text = "0", onClick = onClick, buttonHeight = buttonHeight) }
8592
item {
8693
KeyIconButton(
8794
icon = R.drawable.ic_backspace,
8895
contentDescription = stringResource(R.string.common__delete),
8996
onClick = onClickBackspace,
9097
buttonHeight = buttonHeight,
91-
modifier = Modifier.testTag("KeyboardButton_backspace"),
98+
modifier = Modifier.testTag("NRemove"),
9299
)
93100
}
94101
}
@@ -121,11 +128,12 @@ fun KeyTextButton(
121128
onClick: (String) -> Unit,
122129
buttonHeight: Dp = idealButtonHeight,
123130
modifier: Modifier = Modifier,
131+
testTag: String = "N$text",
124132
) {
125133
KeyButtonBox(
126134
onClick = { onClick(text) },
127135
buttonHeight = buttonHeight,
128-
modifier = modifier.testTag("KeyboardButton_$text"),
136+
modifier = modifier.testTag(testTag)
129137
) {
130138
Text(
131139
text = text,

app/src/main/java/to/bitkit/ui/components/NumberPadSimple.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fun NumberPadSimple(
6868
onClick = { onPress(KEY_DELETE) },
6969
modifier = Modifier
7070
.weight(1f)
71-
.testTag("KeyboardButton_backspace")
71+
.testTag("NRemove")
7272
)
7373
}
7474
}

app/src/main/java/to/bitkit/ui/components/SuggestionCard.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import androidx.compose.ui.Modifier
1717
import androidx.compose.ui.draw.clip
1818
import androidx.compose.ui.graphics.Color
1919
import androidx.compose.ui.layout.ContentScale
20+
import androidx.compose.ui.platform.testTag
2021
import androidx.compose.ui.res.painterResource
2122
import androidx.compose.ui.res.stringResource
2223
import androidx.compose.ui.text.AnnotatedString
@@ -68,7 +69,9 @@ fun SuggestionCard(
6869
onClose?.let {
6970
IconButton(
7071
onClick = it,
71-
modifier = Modifier.size(16.dp)
72+
modifier = Modifier
73+
.size(16.dp)
74+
.testTag("SuggestionDismiss")
7275
) {
7376
Icon(
7477
painter = painterResource(R.drawable.ic_x),

app/src/main/java/to/bitkit/ui/components/Tag.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import androidx.compose.runtime.Composable
1313
import androidx.compose.ui.Alignment
1414
import androidx.compose.ui.Modifier
1515
import androidx.compose.ui.graphics.painter.Painter
16+
import androidx.compose.ui.platform.testTag
1617
import androidx.compose.ui.res.painterResource
1718
import androidx.compose.ui.tooling.preview.Preview
1819
import androidx.compose.ui.unit.dp
@@ -46,14 +47,17 @@ fun TagButton(
4647
BodySSB(
4748
text = text,
4849
color = textColor,
50+
modifier = Modifier.testTag("Tag-$text")
4951
)
5052

5153
if (displayIconClose) {
5254
Icon(
5355
painter = icon,
5456
contentDescription = null,
5557
tint = Colors.White64,
56-
modifier = Modifier.size(16.dp)
58+
modifier = Modifier
59+
.size(16.dp)
60+
.testTag("Tag-$text-delete")
5761
)
5862
}
5963
}

app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalConfirmScreen.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import androidx.compose.ui.Alignment
2626
import androidx.compose.ui.Alignment.Companion.CenterHorizontally
2727
import androidx.compose.ui.Modifier
2828
import androidx.compose.ui.layout.ContentScale
29+
import androidx.compose.ui.platform.testTag
2930
import androidx.compose.ui.res.painterResource
3031
import androidx.compose.ui.res.stringResource
3132
import androidx.compose.ui.tooling.preview.Preview
@@ -113,6 +114,7 @@ private fun Content(
113114
.weight(1f)
114115
.padding(top = 16.dp)
115116
.clickableAlpha(onClick = onNetworkFeeClick)
117+
.testTag("SetCustomFee")
116118
) {
117119
Caption13Up(
118120
text = stringResource(R.string.lightning__spending_confirm__network_fee),

app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ fun HomeScreen(
171171
rootNavController.navigate(Routes.BuyIntro)
172172
}
173173

174-
Suggestion.SPEND -> {
174+
Suggestion.LIGHTNING -> {
175175
if (!hasSeenTransferIntro) {
176176
rootNavController.navigateToTransferIntro()
177177
} else {
@@ -369,10 +369,10 @@ private fun Content(
369369
Text13Up(stringResource(R.string.cards__suggestions), color = Colors.White64)
370370
Spacer(modifier = Modifier.height(16.dp))
371371
LazyRow(
372-
modifier = Modifier.fillMaxWidth(),
373372
horizontalArrangement = Arrangement.spacedBy(16.dp),
374373
state = state,
375-
flingBehavior = snapBehavior
374+
flingBehavior = snapBehavior,
375+
modifier = Modifier.fillMaxWidth().testTag("Suggestions")
376376
) {
377377
items(homeUiState.suggestions, key = { it.name }) { item ->
378378
SuggestionCard(
@@ -382,7 +382,7 @@ private fun Content(
382382
icon = item.icon,
383383
onClose = { onRemoveSuggestion(item) },
384384
onClick = { onClickSuggestion(item) },
385-
modifier = Modifier.testTag("SUGGESTION_${item.name}")
385+
modifier = Modifier.testTag("Suggestion-${item.name.lowercase()}")
386386
)
387387
}
388388
}

0 commit comments

Comments
 (0)