Add some tests

stripe · Oct 17, 2024 · 74b4f5f · 74b4f5f
1 parent 7aee8fb
commit 74b4f5f
Show file tree

Hide file tree

Showing 5 changed files with 113 additions and 6 deletions.
diff --git a/payments-core/res/values/strings.xml b/payments-core/res/values/strings.xml
@@ -147,6 +147,8 @@
   <string name="stripe_invalid_card_number">Your card\'s number is invalid.</string>
   <!-- Error message for card entry form when CVC/CVV is invalid -->
   <string name="stripe_invalid_cvc">Your card\'s security code is invalid.</string>
+  <!-- Error message for card entry form when a user enters a card with a brand that is not accepted. -->
+  <string name="stripe_disallowed_card_brand">%s is not accepted</string>
   <!-- Error when customer's name is invalid -->
   <string name="stripe_invalid_owner_name">Your name is invalid.</string>
   <!-- Shipping form error message -->

diff --git a/payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardDetailsController.kt b/payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardDetailsController.kt
@@ -55,7 +55,11 @@ internal class CardDetailsController(
     val numberElement = CardNumberElement(
         IdentifierSpec.CardNumber,
         DefaultCardNumberController(
-            cardTextFieldConfig = CardNumberConfig(isCBCEligible = cbcEligibility != CardBrandChoiceEligibility.Ineligible, cardBrandFilter = cardBrandFilter),
+            cardTextFieldConfig = CardNumberConfig(
+                isCBCEligible = cbcEligibility != CardBrandChoiceEligibility.Ineligible,
+                cardBrandFilter = cardBrandFilter
+
+            ),
             cardAccountRangeRepository = cardAccountRangeRepositoryFactory.create(),
             uiContext = uiContext,
             workContext = workContext,

diff --git a/payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardNumberConfig.kt b/payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardNumberConfig.kt
@@ -13,20 +13,29 @@ import com.stripe.android.R as StripeR
 internal class CardNumberConfig(
     private val isCBCEligible: Boolean,
     private val cardBrandFilter: CardBrandFilter
-)    : CardDetailsTextFieldConfig {
+) : CardDetailsTextFieldConfig {
     override val capitalization: KeyboardCapitalization = KeyboardCapitalization.None
     override val debugLabel: String = "Card number"
     override val label: Int = StripeR.string.stripe_acc_label_card_number
     override val keyboard: KeyboardType = KeyboardType.NumberPassword
     override val visualTransformation: VisualTransformation = CardNumberVisualTransformation(' ')
 
+    // Hardcoded number of card digits entered before we hit the card metadata service in CBC
+    private var digitsRequiredToFetchBrands = 8
+
     override fun determineState(brand: CardBrand, number: String, numberAllowedDigits: Int): TextFieldState {
         val luhnValid = CardUtils.isValidLuhnNumber(number)
         val isDigitLimit = brand.getMaxLengthForCardNumber(number) != -1
 
         return if (number.isBlank()) {
             TextFieldStateConstants.Error.Blank
-        } else if (!cardBrandFilter.isAccepted(brand) && (!isCBCEligible || number.length > 8)) {
+        } else if (!cardBrandFilter.isAccepted(brand) &&
+            (!isCBCEligible || number.length > digitsRequiredToFetchBrands)
+        ) {
+            /*
+              If the merchant is eligible for CBC do not show the disallowed error
+              until we have had time to hit the card metadata service for a list of possible brands
+             */
             return TextFieldStateConstants.Error.Invalid(
                 errorMessageResId = StripeR.string.stripe_disallowed_card_brand,
                 formatArgs = arrayOf(brand.displayName),

diff --git a/payments-ui-core/src/test/java/com/stripe/android/ui/core/elements/CardNumberConfigTest.kt b/payments-ui-core/src/test/java/com/stripe/android/ui/core/elements/CardNumberConfigTest.kt
@@ -2,6 +2,8 @@ package com.stripe.android.ui.core.elements
 
 import androidx.compose.ui.text.AnnotatedString
 import com.google.common.truth.Truth
+import com.google.common.truth.Truth.assertThat
+import com.stripe.android.DefaultCardBrandFilter
 import com.stripe.android.model.CardBrand
 import com.stripe.android.ui.core.CardNumberFixtures
 import com.stripe.android.uicore.elements.TextFieldStateConstants
@@ -10,7 +12,7 @@ import org.junit.Test
 import com.stripe.android.R as StripeR
 
 class CardNumberConfigTest {
-    private val cardNumberConfig = CardNumberConfig()
+    private val cardNumberConfig = CardNumberConfig(isCBCEligible = false, cardBrandFilter = DefaultCardBrandFilter)
 
     @Test
     fun `visualTransformation formats entered value`() {
@@ -94,4 +96,94 @@ class CardNumberConfigTest {
         Truth.assertThat(state)
             .isInstanceOf<TextFieldStateConstants.Valid.Full>()
     }
+
+    @Test
+    fun `determineState returns valid for allowed brand without CBC`() {
+        val cardBrandFilter = FakeCardBrandFilter(disallowedBrands = setOf(CardBrand.MasterCard))
+        val cardNumberConfig = CardNumberConfig(
+            isCBCEligible = false,
+            cardBrandFilter = cardBrandFilter
+        )
+
+        val state = cardNumberConfig.determineState(
+            brand = CardBrand.Visa,
+            number = "4242424242424242",
+            numberAllowedDigits = CardBrand.Visa.getMaxLengthForCardNumber("4242424242424242")
+        )
+
+        assertThat(state).isInstanceOf<TextFieldStateConstants.Valid.Full>()
+    }
+
+    @Test
+    fun `determineState returns error for disallowed brand without CBC`() {
+        val cardBrandFilter = FakeCardBrandFilter(disallowedBrands = setOf(CardBrand.MasterCard))
+        val cardNumberConfig = CardNumberConfig(
+            isCBCEligible = false,
+            cardBrandFilter = cardBrandFilter
+        )
+
+        val state = cardNumberConfig.determineState(
+            brand = CardBrand.MasterCard,
+            number = "5555555555554444",
+            numberAllowedDigits = CardBrand.MasterCard.getMaxLengthForCardNumber("5555555555554444")
+        )
+
+        assertThat(state).isInstanceOf<TextFieldStateConstants.Error.Invalid>()
+        assertThat(state.getError()?.errorMessage)
+            .isEqualTo(StripeR.string.stripe_disallowed_card_brand)
+    }
+
+    @Test
+    fun `determineState allows disallowed brand with CBC when number length is less than or equal to 8`() {
+        val cardBrandFilter = FakeCardBrandFilter(disallowedBrands = setOf(CardBrand.MasterCard))
+        val cardNumberConfig = CardNumberConfig(
+            isCBCEligible = true,
+            cardBrandFilter = cardBrandFilter
+        )
+
+        val state = cardNumberConfig.determineState(
+            brand = CardBrand.MasterCard,
+            number = "55555555", // Length is 8
+            numberAllowedDigits = CardBrand.MasterCard.getMaxLengthForCardNumber("55555555")
+        )
+
+        // Since number length is less than or equal to 8, it should not return disallowed brand error
+        assertThat(state).isInstanceOf<TextFieldStateConstants.Error.Incomplete>()
+    }
+
+    @Test
+    fun `determineState returns error for disallowed brand with CBC when number length is greater than 8`() {
+        val cardBrandFilter = FakeCardBrandFilter(disallowedBrands = setOf(CardBrand.MasterCard))
+        val cardNumberConfig = CardNumberConfig(
+            isCBCEligible = true,
+            cardBrandFilter = cardBrandFilter
+        )
+
+        val state = cardNumberConfig.determineState(
+            brand = CardBrand.MasterCard,
+            number = "5555555555554444", // Length is greater than 8
+            numberAllowedDigits = CardBrand.MasterCard.getMaxLengthForCardNumber("5555555555554444")
+        )
+
+        assertThat(state).isInstanceOf<TextFieldStateConstants.Error.Invalid>()
+        assertThat(state.getError()?.errorMessage)
+            .isEqualTo(StripeR.string.stripe_disallowed_card_brand)
+    }
+
+    @Test
+    fun `determineState returns valid for allowed brand with CBC`() {
+        val cardBrandFilter = FakeCardBrandFilter(disallowedBrands = setOf(CardBrand.MasterCard))
+        val cardNumberConfig = CardNumberConfig(
+            isCBCEligible = true,
+            cardBrandFilter = cardBrandFilter
+        )
+
+        val state = cardNumberConfig.determineState(
+            brand = CardBrand.Visa,
+            number = "4242424242424242",
+            numberAllowedDigits = CardBrand.Visa.getMaxLengthForCardNumber("4242424242424242")
+        )
+
+        assertThat(state).isInstanceOf<TextFieldStateConstants.Valid.Full>()
+    }
 }
diff --git a/...nts-ui-core/src/test/java/com/stripe/android/ui/core/elements/CardNumberControllerTest.kt b/...nts-ui-core/src/test/java/com/stripe/android/ui/core/elements/CardNumberControllerTest.kt
@@ -477,7 +477,7 @@ internal class CardNumberControllerTest {
         cardBrandFilter: CardBrandFilter = DefaultCardBrandFilter
     ): DefaultCardNumberController {
         return DefaultCardNumberController(
-            cardTextFieldConfig = CardNumberConfig(),
+            cardTextFieldConfig = CardNumberConfig(isCBCEligible = false, cardBrandFilter = DefaultCardBrandFilter),
             cardAccountRangeRepository = repository,
             uiContext = testDispatcher,
             workContext = testDispatcher,
@@ -521,7 +521,7 @@ internal class CardNumberControllerTest {
 }
 
 @Parcelize
-private class FakeCardBrandFilter(
+class FakeCardBrandFilter(
     private val disallowedBrands: Set<CardBrand>
 ) : CardBrandFilter {
     override fun isAccepted(cardBrand: CardBrand): Boolean {