Enable new LPMs

CHANGELOG.md

@@ -3,7 +3,8 @@
 ## x.x.x - xxxx-xx-xx
 
 ### PaymentSheet
-- [FIXED] the format of the country dropdown in PaymentSheet for all languages.
+- [FIXED] Fixed the format of the country dropdown in PaymentSheet for all languages.
+- [ADDED] Added Affirm and AU BECS Direct Debit.
 
 
 ## 20.3.0 - 2022-05-16

paymentsheet-example/src/androidTestDebug/java/com/stripe/android/TestHardCodedLpms.kt

@@ -164,8 +164,7 @@ class TestHardCodedLpms {
         )
     }
 
-    @Ignore("Ignored until ready to release")
-//    @Test
+    @Test
     fun testAffirm() {
         testDriver.confirmNewOrGuestComplete(
             newUser.copy(
@@ -178,14 +177,16 @@ class TestHardCodedLpms {
         )
     }
 
-    @Ignore("Cannot be tested requires AU-based merchant")
+    @Test
     fun testAuBecsDD() {
         testDriver.confirmNewOrGuestComplete(
             newUser.copy(
                 paymentMethod = SupportedPaymentMethod.AuBecsDebit,
-                authorizationAction = AuthorizeAction.Authorize,
-                currency = Currency.USD,
-                shipping = Shipping.On
+                authorizationAction = null,
+                currency = Currency.AUD,
+                shipping = Shipping.On,
+                delayed = DelayedPMs.On,
+                automatic = Automatic.Off,
             )
         )
     }
@@ -201,13 +202,14 @@ class TestHardCodedLpms {
         )
     }
 
-    @Ignore("Cannot be tested requires EU-based merchant")
+    @Test
     fun testPayPal() {
         testDriver.confirmNewOrGuestComplete(
             newUser.copy(
                 paymentMethod = SupportedPaymentMethod.PayPal,
                 authorizationAction = AuthorizeAction.Authorize,
-                currency = Currency.USD
+                currency = Currency.EUR,
+                automatic = Automatic.Off
             )
         )
     }

paymentsheet-example/src/androidTestDebug/java/com/stripe/android/TestMultiStepFieldsReloaded.kt

@@ -159,8 +159,7 @@ class TestMultiStepFieldsReloaded {
         )
     }
 
-    @Ignore("Ignored until ready to release")
-//    @Test
+    @Test
     fun testAffirm() {
         testDriver.confirmCustom(
             newUser.copy(
@@ -170,7 +169,7 @@ class TestMultiStepFieldsReloaded {
         )
     }
 
-    @Ignore("Cannot be tested requires AU-based merchant")
+    @Test
     fun testAuBecsDD() {
         testDriver.confirmCustom(
             newUser.copy(
@@ -190,7 +189,7 @@ class TestMultiStepFieldsReloaded {
         )
     }
 
-    @Ignore("Cannot be tested requires EU-based merchant")
+    @Test
     fun testPayPal() {
         testDriver.confirmCustom(
             newUser.copy(

paymentsheet-example/src/androidTestDebug/java/com/stripe/android/test/core/FieldPopulator.kt

@@ -10,10 +10,11 @@ import androidx.test.espresso.Espresso
 import com.stripe.android.test.core.ui.Selectors
 import com.stripe.android.ui.core.elements.AddressSpec
 import com.stripe.android.ui.core.elements.AuBankAccountNumberSpec
-import com.stripe.android.ui.core.elements.DropdownSpec
+import com.stripe.android.ui.core.elements.BsbSpec
 import com.stripe.android.ui.core.elements.CardBillingSpec
 import com.stripe.android.ui.core.elements.CardDetailsSectionSpec
 import com.stripe.android.ui.core.elements.CountrySpec
+import com.stripe.android.ui.core.elements.DropdownSpec
 import com.stripe.android.ui.core.elements.EmailSpec
 import com.stripe.android.ui.core.elements.IbanSpec
 import com.stripe.android.ui.core.elements.KlarnaCountrySpec
@@ -89,12 +90,18 @@ class FieldPopulator(
         val state: String = "CA",
         val cardNumber: String = "4242424242424242",
         val cardExpiration: String = "1230",
-        val cardCvc: String = "321"
+        val cardCvc: String = "321",
+        val auBecsBsbNumber: String = "000000",
+        val auBecsAccountNumber: String = "000123456"
     )
 
     private fun verifyPlatformLpmFields(values: Values = Values()) {
         formSpec.items.forEach {
             when (it) {
+                is BsbSpec -> {
+                    selectors.getAuBsb()
+                        .assertContentDescriptionEquals(values.auBecsBsbNumber)
+                }
                 is CardDetailsSectionSpec -> {
                     selectors.getCardNumber()
                         .assertContentDescriptionEquals(values.cardNumber)
@@ -135,7 +142,10 @@ class FieldPopulator(
                             }
                             is CountrySpec -> {}
                             is SimpleTextSpec -> {}
-                            AuBankAccountNumberSpec -> {}
+                            AuBankAccountNumberSpec -> {
+                                selectors.getAuAccountNumber()
+                                    .assertContentDescriptionEquals(values.state)
+                            }
                             is DropdownSpec -> {}
                             IbanSpec -> {}
                             is KlarnaCountrySpec -> {}
@@ -156,6 +166,11 @@ class FieldPopulator(
     private fun populatePlatformLpmFields(values: Values = Values()) {
         formSpec.items.forEach {
             when (it) {
+                is BsbSpec -> {
+                    selectors.getAuBsb().apply {
+                        performTextInput(values.auBecsBsbNumber)
+                    }
+                }
                 is CardDetailsSectionSpec -> {
                     selectors.getCardNumber().performTextInput(values.cardNumber)
                     selectors.composeTestRule.waitForIdle()
@@ -204,7 +219,12 @@ class FieldPopulator(
                             }
                             is CountrySpec -> {}
                             is SimpleTextSpec -> {}
-                            AuBankAccountNumberSpec -> {}
+                            is AuBankAccountNumberSpec -> {
+                                selectors.getAuAccountNumber().apply {
+                                    performTextInput(values.auBecsAccountNumber)
+                                }
+
+                            }
                             is DropdownSpec -> {}
                             IbanSpec -> {}
                             is KlarnaCountrySpec -> {}

paymentsheet-example/src/androidTestDebug/java/com/stripe/android/test/core/PlaygroundTestDriver.kt

@@ -245,6 +245,7 @@ class PlaygroundTestDriver(
         // Could consider setting these preferences instead of clicking
         // if it is faster (possibly 1-2s)
         selectors.customer.click()
+        selectors.automatic.click()
         selectors.currency.click()
         selectors.checkout.click()
         selectors.delayed.click()

paymentsheet-example/src/androidTestDebug/java/com/stripe/android/test/core/TestParameters.kt

@@ -96,7 +96,8 @@ enum class IntentType {
  */
 enum class Currency {
     USD,
-    EUR
+    EUR,
+    AUD
 }
 
 /**

paymentsheet-example/src/androidTestDebug/java/com/stripe/android/test/core/ui/Selectors.kt

@@ -59,6 +59,7 @@ class Selectors(
     val currency = when (testParameters.currency) {
         Currency.EUR -> EspressoLabelIdButton(R.string.currency_eur)
         Currency.USD -> EspressoLabelIdButton(R.string.currency_usd)
+        Currency.AUD -> EspressoLabelIdButton(R.string.currency_aud)
     }
 
     val checkout = when (testParameters.intentType) {
@@ -241,6 +242,14 @@ class Selectors(
         getResourceString(R.string.address_label_zip_code)
     )
 
+    fun getAuBsb() = composeTestRule.onNodeWithText(
+        getResourceString(com.stripe.android.ui.core.R.string.becs_widget_bsb)
+    )
+
+    fun getAuAccountNumber() = composeTestRule.onNodeWithText(
+        getResourceString(R.string.becs_widget_account_number)
+    )
+
     fun getGoogleDividerText() = composeTestRule.onNodeWithText(
         "Or pay",
         substring = true,

paymentsheet-example/src/main/java/com/stripe/android/paymentsheet/example/playground/model/PlaygroundCheckoutModel.kt

@@ -42,7 +42,15 @@ data class CheckoutRequest(
     val mode: String,
     val set_shipping_address: Boolean,
     val automatic_payment_methods: Boolean,
-    val use_link: Boolean
+    val use_link: Boolean,
+
+    // when used with the glitch backend: mature-buttery-bumper, which skyler has access to
+    // this will use a different merchant based on the country code
+    val merchant_country_code: String? = when (currency.uppercase()) {
+        "AUD" -> "AU"
+        "EUR" -> "GB"
+        else -> null
+    }
 )
 
 @Serializable

paymentsheet-example/src/main/res/layout/activity_payment_sheet_playground.xml

@@ -159,7 +159,7 @@
 
             <RadioButton
                 android:id="@+id/currency_aud_button"
-                android:text="AUD"
+                android:text="@string/currency_aud"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:checked="true"

paymentsheet-example/src/main/res/values/strings.xml

@@ -39,6 +39,7 @@
     <string name="confirm">confirm</string>
     <string name="currency_usd">USD</string>
     <string name="currency_eur">EUR</string>
+    <string name="currency_aud">AUD</string>
     <string name="show_sheet">Show Sheet</string>
     <string name="appearance_playground">"Appearance Customization"</string>
 </resources>

paymentsheet/api/paymentsheet.api

@@ -888,7 +888,7 @@ public final class com/stripe/android/paymentsheet/injection/PaymentSheetCommonM
 	public static fun create (Ljavax/inject/Provider;)Lcom/stripe/android/paymentsheet/injection/PaymentSheetCommonModule_Companion_ProvidePublishableKeyFactory;
 	public synthetic fun get ()Ljava/lang/Object;
 	public fun get ()Lkotlin/jvm/functions/Function0;
-	public static fun providePublishableKey (Ldagger/Lazy;)Lkotlin/jvm/functions/Function0;
+	public static fun providePublishableKey (Landroid/content/Context;)Lkotlin/jvm/functions/Function0;
 }
 
 public final class com/stripe/android/paymentsheet/injection/PaymentSheetCommonModule_Companion_ProvideStripeAccountIdFactory : dagger/internal/Factory {

paymentsheet/src/main/java/com/stripe/android/paymentsheet/injection/PaymentSheetCommonModule.kt

@@ -56,8 +56,8 @@ internal abstract class PaymentSheetCommonModule {
 
         @Provides
         @Named(PUBLISHABLE_KEY)
-        fun providePublishableKey(paymentConfiguration: Lazy<PaymentConfiguration>): () -> String =
-            { paymentConfiguration.get().publishableKey }
+        fun providePublishableKey(appContext: Context): () -> String =
+            { PaymentConfiguration.getInstance(appContext).publishableKey }
 
         @Provides
         @Named(STRIPE_ACCOUNT_ID)

paymentsheet/src/main/java/com/stripe/android/paymentsheet/model/SupportedPaymentMethod.kt

@@ -407,8 +407,8 @@ sealed class SupportedPaymentMethod(
                 PayPal,
                 AfterpayClearpay,
                 USBankAccount,
-                // Affirm // TODO: uncomment once we are ready to go live
-                // AuBecsDebit // TODO: uncomment once we are ready to go live
+                Affirm,
+                AuBecsDebit
             )
         }