From 3a1ed7e4acb380542b8957466bfebf2d5cc4d04d Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 11 Mar 2025 16:51:01 -0300 Subject: [PATCH] Fix recurring donations unit tests. --- .../CheckoutFlowActivityTest__RecurringDonations.kt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivityTest__RecurringDonations.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivityTest__RecurringDonations.kt index 77f38ba631..8456ea14fa 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivityTest__RecurringDonations.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivityTest__RecurringDonations.kt @@ -25,6 +25,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.testing.Delete import org.thoughtcrime.securesms.testing.Get import org.thoughtcrime.securesms.testing.InAppPaymentsRule +import org.thoughtcrime.securesms.testing.RxTestSchedulerRule import org.thoughtcrime.securesms.testing.SignalActivityRule import org.thoughtcrime.securesms.testing.actions.RecyclerViewScrollToBottomAction import org.thoughtcrime.securesms.testing.success @@ -44,6 +45,9 @@ class CheckoutFlowActivityTest__RecurringDonations { @get:Rule val iapRule = InAppPaymentsRule() + @get:Rule + val rxRule = RxTestSchedulerRule() + private val intent = CheckoutFlowActivity.createIntent(InstrumentationRegistry.getInstrumentation().targetContext, InAppPaymentType.RECURRING_DONATION) @Test @@ -65,6 +69,8 @@ class CheckoutFlowActivityTest__RecurringDonations { ActivityScenario.launch(intent) + rxRule.defaultTestScheduler.triggerActions() + onView(withId(R.id.recycler)).perform(RecyclerViewScrollToBottomAction) onView(withText(R.string.SubscribeFragment__update_subscription)).check(matches(isDisplayed())) onView(withText(R.string.SubscribeFragment__cancel_subscription)).check(matches(isDisplayed())) @@ -75,12 +81,14 @@ class CheckoutFlowActivityTest__RecurringDonations { initialiseActiveSubscription() ActivityScenario.launch(intent) + + rxRule.defaultTestScheduler.triggerActions() + onView(withId(R.id.recycler)).perform(RecyclerViewScrollToBottomAction) onView(withText(R.string.SubscribeFragment__cancel_subscription)).check(matches(isDisplayed())) onView(withText(R.string.SubscribeFragment__cancel_subscription)).perform(ViewActions.click()) onView(withText(R.string.SubscribeFragment__confirm_cancellation)).check(matches(isDisplayed())) onView(withText(R.string.SubscribeFragment__confirm)).perform(ViewActions.click()) - onView(withText(R.string.StripePaymentInProgressFragment__cancelling)).check(matches(isDisplayed())) } @Test @@ -88,6 +96,9 @@ class CheckoutFlowActivityTest__RecurringDonations { initialisePendingSubscription() ActivityScenario.launch(intent) + + rxRule.defaultTestScheduler.triggerActions() + onView(withId(R.id.recycler)).perform(RecyclerViewScrollToBottomAction) onView(withText(R.string.SubscribeFragment__update_subscription)).check(matches(isDisplayed())) onView(withText(R.string.SubscribeFragment__update_subscription)).check(matches(isNotEnabled()))