Skip to content

Commit

Permalink
Compose UI tests for MBL-1468 MBL-1471 MBL-1470 MBL-1469 (#2055)
Browse files Browse the repository at this point in the history 
* Compose UI tests for MBL-1468 MBL-1471 MBL-1470 MBL-1469

* Lint

---------

Co-authored-by: Isabel Martin <[email protected]>
Co-authored-by: mtgriego <[email protected]>
  • Loading branch information
@ycheng-kickstarter @Arkariang @mtgriego
3 people authored Jun 11, 2024
1 parent 9cccf09 commit 4a2e8ab
Show file tree
Hide file tree
Showing 3 changed files with 301 additions and 66 deletions.
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
android:theme="@style/KSTheme"
tools:replace="android:supportsRtl">
<!-- ACTIVITIES -->
<activity android:name="androidx.activity.ComponentActivity" /> <!-- Workaround for https://github.com/robolectric/robolectric/pull/4736 -->
<activity
android:name=".ui.activities.AccountActivity"
android:theme="@style/SettingsActivity" />
Expand Down
115 changes: 49 additions & 66 deletions app/src/main/java/com/kickstarter/features/pledgedprojectsoverview/ui/PPOCardView.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import androidx.compose.ui.graphics.painter.ColorPainter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.style.TextOverflow
Expand Down Expand Up @@ -57,7 +58,7 @@ fun PPOCardPreview() {
) {
item {
PPOCardView(
viewType = PPOCardViewType.ADDRESS_CONFIRMED,
viewType = PPOCardViewType.CONFIRM_ADDRESS,
onCardClick = {},
projectName = "Sugardew Island - Your cozy farm shop let’s pretend this is a longer title let’s pretend this is a longer title",
pledgeAmount = "$50.00",
Expand Down Expand Up @@ -188,6 +189,11 @@ enum class PPOCardViewType {
SURVEY_SUBMITTED
}

enum class PPOCardViewTestTag {
SHIPPING_ADDRESS_VIEW,
CONFIRM_ADDRESS_BUTTONS_VIEW
}

@Composable
fun PPOCardView(
viewType: PPOCardViewType,
Expand Down Expand Up @@ -259,7 +265,7 @@ fun PPOCardView(
PPOCardViewType.FIX_PAYMENT -> FixPaymentButtonView(onActionButtonClicked)
PPOCardViewType.PAYMENT_FIXED -> PaymentFixedButtonView()
PPOCardViewType.AUTHENTICATE_CARD -> AuthenticateCardButtonView(onActionButtonClicked)
PPOCardViewType.CARD_AUTHENTICATED -> CardAuthenticatedButtonView { }
PPOCardViewType.CARD_AUTHENTICATED -> CardAuthenticatedButtonView()
PPOCardViewType.TAKE_SURVEY -> TakeSurveyButtonView(onActionButtonClicked)
PPOCardViewType.SURVEY_SUBMITTED -> SurveySubmittedButtonView()
}
Expand Down Expand Up @@ -396,6 +402,7 @@ fun ShippingAddressView(
modifier = Modifier
.fillMaxWidth()
.padding(dimensions.paddingSmall)
.testTag(PPOCardViewTestTag.SHIPPING_ADDRESS_VIEW.name),
) {
Text(
text = "Shipping address",
Expand Down Expand Up @@ -440,8 +447,9 @@ fun ConfirmAddressButtonsView(onEditAddressClicked: () -> Unit, onConfirmAddress
modifier = Modifier
.fillMaxWidth()
.padding(dimensions.paddingSmall)
.testTag(PPOCardViewTestTag.CONFIRM_ADDRESS_BUTTONS_VIEW.name)
) {
// TODO: Replace with translated string
// TODO: Replace with translated strings
KSPrimaryBlackButton(
modifier = Modifier
.weight(0.5f),
Expand Down Expand Up @@ -508,23 +516,7 @@ fun FixPaymentAlertsView(daysRemaining: Int = -1) {

if (daysRemaining > 0) {
Spacer(modifier = Modifier.height(dimensions.paddingSmall))

KSCoralBadge(
leadingIcon = {
// TODO: Replace with translated string
Image(
modifier = Modifier
.padding(end = dimensions.paddingXSmall)
.size(dimensions.alertIconSize),
imageVector = ImageVector.vectorResource(id = R.drawable.ic_clock),
contentDescription = "Pledge will be dropped in $daysRemaining days",
colorFilter = ColorFilter.tint(colors.textAccentRedBold)
)
},
// TODO: Replace with translated string
text = "Pledge will be dropped in $daysRemaining days",
textColor = colors.textAccentRedBold
)
PledgeWillBeDroppedAlert(daysRemaining)
}
}
}
Expand Down Expand Up @@ -565,23 +557,7 @@ fun AuthenticateCardAlertsView(daysRemaining: Int = -1) {

if (daysRemaining > 0) {
Spacer(modifier = Modifier.height(dimensions.paddingSmall))

KSCoralBadge(
leadingIcon = {
// TODO: Replace with translated string
Image(
modifier = Modifier
.padding(end = dimensions.paddingXSmall)
.size(dimensions.alertIconSize),
imageVector = ImageVector.vectorResource(id = R.drawable.ic_clock),
contentDescription = "Pledge will be dropped in $daysRemaining days",
colorFilter = ColorFilter.tint(colors.textAccentRedBold)
)
},
// TODO: Replace with translated string
text = "Pledge will be dropped in $daysRemaining days",
textColor = colors.textAccentRedBold
)
PledgeWillBeDroppedAlert(daysRemaining)
}
}
}
Expand Down Expand Up @@ -621,7 +597,7 @@ fun AuthenticateCardButtonView(onAuthenticateCardClicked: () -> Unit) {
}

@Composable
fun CardAuthenticatedButtonView(onFixPaymentClicked: () -> Unit) {
fun CardAuthenticatedButtonView() {
// TODO: Replace with translated string
KSSecondaryRedButton(
modifier = Modifier.padding(dimensions.paddingMediumSmall),
Expand Down Expand Up @@ -665,22 +641,7 @@ fun TakeSurveyAlertsView(hoursRemaining: Int = -1) {

if (hoursRemaining > 0) {
Spacer(modifier = Modifier.height(dimensions.paddingSmall))

KSCoralBadge(
leadingIcon = {
// TODO: Replace with translated string
Image(
modifier = Modifier
.padding(end = dimensions.paddingXSmall)
.size(dimensions.alertIconSize),
imageVector = ImageVector.vectorResource(id = R.drawable.ic_clock),
contentDescription = "Address locks in $hoursRemaining hours",
colorFilter = ColorFilter.tint(colors.textSecondary)
)
},
// TODO: Replace with translated string
text = "Address locks in $hoursRemaining hours",
)
AddressLocksAlertView(hoursRemaining)
}
}
}
Expand Down Expand Up @@ -711,6 +672,30 @@ fun SurveySubmittedAlertsView(hoursRemaining: Int = -1) {
}
}
}

@Composable
fun SurveySubmittedButtonView() {
// TODO: Replace with translated string
KSPrimaryGreenButton(
modifier = Modifier
.padding(dimensions.paddingMediumSmall),
leadingIcon = {
Image(
modifier = Modifier
.padding(end = dimensions.paddingXSmall)
.size(dimensions.paddingMedium),
imageVector = ImageVector.vectorResource(id = R.drawable.icon__check),
contentDescription = "x",
colorFilter = ColorFilter.tint(color = colors.textSecondary)
)
},
onClickAction = { },
text = "Survey Submitted",
isEnabled = false,
textStyle = typography.buttonText
)
}

@Composable
fun AddressLocksAlertView(hoursRemaining: Int = -1) {
KSCoralBadge(
Expand All @@ -730,23 +715,21 @@ fun AddressLocksAlertView(hoursRemaining: Int = -1) {
)
}
@Composable
fun SurveySubmittedButtonView() {
// TODO: Replace with translated string
KSPrimaryGreenButton(
modifier = Modifier.padding(dimensions.paddingMediumSmall),
fun PledgeWillBeDroppedAlert(daysRemaining: Int = -1) {
KSCoralBadge(
leadingIcon = {
// TODO: Replace with translated string
Image(
modifier = Modifier
.padding(end = dimensions.paddingXSmall)
.size(dimensions.paddingMedium),
imageVector = ImageVector.vectorResource(id = R.drawable.icon__check),
contentDescription = "Survey Submitted",
colorFilter = ColorFilter.tint(color = colors.textSecondary)
.size(dimensions.alertIconSize),
imageVector = ImageVector.vectorResource(id = R.drawable.ic_clock),
contentDescription = "Pledge will be dropped in $daysRemaining days",
colorFilter = ColorFilter.tint(colors.textAccentRedBold)
)
},
onClickAction = { },
text = "Survey Submitted",
isEnabled = false,
textStyle = typography.buttonText
// TODO: Replace with translated string
text = "Pledge will be dropped in $daysRemaining days",
textColor = colors.textAccentRedBold
)
}
Loading

0 comments on commit 4a2e8ab

Please sign in to comment.