Skip to content

Commit

Permalink
[WIP] Update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@tillh-stripe
tillh-stripe committed Aug 10, 2023
1 parent 51e3d92 commit 1ad9c49
Show file tree
Hide file tree
Showing 4 changed files with 108 additions and 145 deletions.
8 changes: 2 additions & 6 deletions paymentsheet/api/paymentsheet.api
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1206,23 +1206,19 @@ public final class com/stripe/android/paymentsheet/addresselement/ComposableSing
}

public final class com/stripe/android/paymentsheet/databinding/StripeActivityPaymentOptionsBinding : androidx/viewbinding/ViewBinding {
public final field bottomSheet Landroid/widget/LinearLayout;
public final field content Landroidx/compose/ui/platform/ComposeView;
public final field coordinator Landroidx/coordinatorlayout/widget/CoordinatorLayout;
public static fun bind (Landroid/view/View;)Lcom/stripe/android/paymentsheet/databinding/StripeActivityPaymentOptionsBinding;
public synthetic fun getRoot ()Landroid/view/View;
public fun getRoot ()Landroidx/coordinatorlayout/widget/CoordinatorLayout;
public fun getRoot ()Landroidx/compose/ui/platform/ComposeView;
public static fun inflate (Landroid/view/LayoutInflater;)Lcom/stripe/android/paymentsheet/databinding/StripeActivityPaymentOptionsBinding;
public static fun inflate (Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Z)Lcom/stripe/android/paymentsheet/databinding/StripeActivityPaymentOptionsBinding;
}

public final class com/stripe/android/paymentsheet/databinding/StripeActivityPaymentSheetBinding : androidx/viewbinding/ViewBinding {
public final field bottomSheet Landroid/widget/LinearLayout;
public final field content Landroidx/compose/ui/platform/ComposeView;
public final field coordinator Landroidx/coordinatorlayout/widget/CoordinatorLayout;
public static fun bind (Landroid/view/View;)Lcom/stripe/android/paymentsheet/databinding/StripeActivityPaymentSheetBinding;
public synthetic fun getRoot ()Landroid/view/View;
public fun getRoot ()Landroidx/coordinatorlayout/widget/CoordinatorLayout;
public fun getRoot ()Landroidx/compose/ui/platform/ComposeView;
public static fun inflate (Landroid/view/LayoutInflater;)Lcom/stripe/android/paymentsheet/databinding/StripeActivityPaymentSheetBinding;
public static fun inflate (Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Z)Lcom/stripe/android/paymentsheet/databinding/StripeActivityPaymentSheetBinding;
}
Expand Down
12 changes: 8 additions & 4 deletions paymentsheet/src/main/java/com/stripe/android/common/ui/BottomSheet.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.stripe.android.common.ui

import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.tween
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.imePadding
Expand All @@ -27,12 +27,14 @@ import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshotFlow
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.unit.dp
import com.google.accompanist.systemuicontroller.rememberSystemUiController
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.flow.first

private val MaxBottomSheetWidth = 640.dp
internal val MaxBottomSheetWidth = 640.dp
internal val BottomSheetContentTestTag = "BottomSheetContentTestTag"

@OptIn(ExperimentalMaterialApi::class)
internal class BottomSheetState(
Expand Down Expand Up @@ -109,7 +111,7 @@ internal fun BottomSheet(
modifier: Modifier = Modifier,
onDismissed: () -> Unit,
onShow: () -> Unit = {},
sheetContent: @Composable ColumnScope.() -> Unit,
sheetContent: @Composable () -> Unit,
) {
val systemUiController = rememberSystemUiController()
val scrimColor = ModalBottomSheetDefaults.scrimColor
Expand Down Expand Up @@ -159,7 +161,9 @@ internal fun BottomSheet(
sheetState = state.modalBottomSheetState,
sheetGesturesEnabled = false,
sheetContent = {
sheetContent()
Box(modifier = Modifier.testTag(BottomSheetContentTestTag)) {
sheetContent()
}
Spacer(modifier = Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
},
content = {},
Expand Down
150 changes: 75 additions & 75 deletions paymentsheet/src/test/java/com/stripe/android/paymentsheet/PaymentOptionsActivityTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsNotDisplayed
import androidx.compose.ui.test.junit4.createEmptyComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.onNodeWithText
Expand All @@ -19,10 +20,10 @@ import androidx.test.core.app.ActivityScenario
import androidx.test.core.app.ApplicationProvider
import androidx.test.espresso.Espresso.pressBack
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.common.truth.Truth.assertThat
import com.stripe.android.ApiKeyFixtures
import com.stripe.android.PaymentConfiguration
import com.stripe.android.common.ui.BottomSheetContentTestTag
import com.stripe.android.core.Logger
import com.stripe.android.core.injection.WeakMapInjectorRegistry
import com.stripe.android.link.LinkConfigurationCoordinator
Expand All @@ -35,7 +36,6 @@ import com.stripe.android.paymentsheet.PaymentSheetFixtures.updateState
import com.stripe.android.paymentsheet.analytics.EventReporter
import com.stripe.android.paymentsheet.databinding.StripeActivityPaymentOptionsBinding
import com.stripe.android.paymentsheet.databinding.StripePrimaryButtonBinding
import com.stripe.android.paymentsheet.model.PaymentSelection
import com.stripe.android.paymentsheet.ui.PrimaryButton
import com.stripe.android.paymentsheet.ui.getLabel
import com.stripe.android.ui.core.forms.resources.LpmRepository
Expand Down Expand Up @@ -96,55 +96,55 @@ internal class PaymentOptionsActivityTest {
WeakMapInjectorRegistry.clear()
}

@Test
fun `click outside of bottom sheet before selection should return cancel result without selection`() {
runActivityScenario {
it.onActivity { activity ->
activity.viewBinding.root.performClick()
activity.finish()
}

assertThat(
PaymentOptionResult.fromIntent(it.getResult().resultData)
).isEqualTo(
PaymentOptionResult.Canceled(null, null, listOf())
)
}
}

@Test
fun `click outside of bottom sheet should return cancel result even if there is a selection`() {
val initialSelection = PaymentSelection.Saved(
paymentMethod = PaymentMethodFixtures.createCard(),
)

val usBankAccount = PaymentMethodFixtures.US_BANK_ACCOUNT
val paymentMethods = listOf(initialSelection.paymentMethod, usBankAccount)

val args = PAYMENT_OPTIONS_CONTRACT_ARGS.updateState(
paymentSelection = initialSelection,
paymentMethods = paymentMethods,
)

runActivityScenario(args) {
it.onActivity { activity ->
// We use US Bank Account because they don't dismiss PaymentSheet upon selection
// due to their mandate requirement.
val usBankAccountLabel = usBankAccount.getLabel(context.resources)
composeTestRule
.onNodeWithTag("${PAYMENT_OPTION_CARD_TEST_TAG}_$usBankAccountLabel")
.performClick()

activity.viewBinding.root.performClick()
activity.finish()
}

val result = PaymentOptionResult.fromIntent(it.getResult().resultData)
assertThat(result).isEqualTo(
PaymentOptionResult.Canceled(null, initialSelection, paymentMethods)
)
}
}
// @Test
// fun `click outside of bottom sheet before selection should return cancel result without selection`() {
// runActivityScenario {
// it.onActivity { activity ->
// activity.viewBinding.root.performClick()
// activity.finish()
// }
//
// assertThat(
// PaymentOptionResult.fromIntent(it.getResult().resultData)
// ).isEqualTo(
// PaymentOptionResult.Canceled(null, null, listOf())
// )
// }
// }

// @Test
// fun `click outside of bottom sheet should return cancel result even if there is a selection`() {
// val initialSelection = PaymentSelection.Saved(
// paymentMethod = PaymentMethodFixtures.createCard(),
// )
//
// val usBankAccount = PaymentMethodFixtures.US_BANK_ACCOUNT
// val paymentMethods = listOf(initialSelection.paymentMethod, usBankAccount)
//
// val args = PAYMENT_OPTIONS_CONTRACT_ARGS.updateState(
// paymentSelection = initialSelection,
// paymentMethods = paymentMethods,
// )
//
// runActivityScenario(args) {
// it.onActivity { activity ->
// // We use US Bank Account because they don't dismiss PaymentSheet upon selection
// // due to their mandate requirement.
// val usBankAccountLabel = usBankAccount.getLabel(context.resources)
// composeTestRule
// .onNodeWithTag("${PAYMENT_OPTION_CARD_TEST_TAG}_$usBankAccountLabel")
// .performClick()
//
// activity.viewBinding.root.performClick()
// activity.finish()
// }
//
// val result = PaymentOptionResult.fromIntent(it.getResult().resultData)
// assertThat(result).isEqualTo(
// PaymentOptionResult.Canceled(null, initialSelection, paymentMethods)
// )
// }
// }

@Test
fun `ContinueButton should be hidden when showing payment options`() {
Expand Down Expand Up @@ -217,35 +217,35 @@ internal class PaymentOptionsActivityTest {
@Test
fun `Verify bottom sheet expands on start`() {
runActivityScenario {
it.onActivity { activity ->
assertThat(activity.bottomSheetBehavior.state)
.isEqualTo(BottomSheetBehavior.STATE_EXPANDED)
assertThat(activity.bottomSheetBehavior.isFitToContents)
.isFalse()
}
}
}

@Test
fun `Verify selecting a payment method closes the sheet`() {
val args = PAYMENT_OPTIONS_CONTRACT_ARGS.updateState(isGooglePayReady = true)

runActivityScenario(args) {
it.onActivity { activity ->
it.onActivity {
composeTestRule
.onNodeWithTag("${PAYMENT_OPTION_CARD_TEST_TAG}_Google Pay")
.performClick()

composeTestRule.waitForIdle()

idleLooper()

assertThat(activity.bottomSheetBehavior.state)
.isEqualTo(BottomSheetBehavior.STATE_HIDDEN)
.onNodeWithTag(BottomSheetContentTestTag)
.assertIsDisplayed()
}
}
}

// @Test
// fun `Verify selecting a payment method closes the sheet`() {
// val args = PAYMENT_OPTIONS_CONTRACT_ARGS.updateState(isGooglePayReady = true)
//
// runActivityScenario(args) {
// it.onActivity { activity ->
// composeTestRule
// .onNodeWithTag("${PAYMENT_OPTION_CARD_TEST_TAG}_Google Pay")
// .performClick()
//
// composeTestRule.waitForIdle()
//
// idleLooper()
//
// composeTestRule
// .onNodeWithTag(BottomSheetContentTestTag)
// .assertIsNotDisplayed()
// }
// }
// }

@Test
fun `notes visibility is set correctly`() {
val usBankAccount = PaymentMethodFixtures.US_BANK_ACCOUNT
Expand Down
Loading

0 comments on commit 1ad9c49

Please sign in to comment.