Merge branch 'polling-for-account-expiry-is-slow-if-logged-in-droid-1916'

2 files changed, 5 insertions, 3 deletions

diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModelTest.kt
index 7a6b756bf5..26fc228729 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModelTest.kt
@@ -2,9 +2,11 @@ package net.mullvad.mullvadvpn.viewmodel
 
 import app.cash.turbine.test
 import arrow.core.right
+import io.mockk.Runs
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.every
+import io.mockk.just
 import io.mockk.mockk
 import io.mockk.unmockkAll
 import java.time.ZonedDateTime
@@ -61,7 +63,7 @@ class AccountViewModelTest {
         every { mockAccountRepository.accountData } returns accountExpiryState
         every { mockDeviceRepository.deviceState } returns deviceState
         coEvery { mockPaymentUseCase.paymentAvailability } returns paymentAvailability
-        coEvery { mockAccountRepository.getAccountData() } returns null
+        coEvery { mockAccountRepository.refreshAccountData(any()) } just Runs
 
         viewModel =
             AccountViewModel(
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/AddTimeViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/AddTimeViewModelTest.kt
index 7e3f966dbb..d3c95690bf 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/AddTimeViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/AddTimeViewModelTest.kt
@@ -56,7 +56,7 @@ class AddTimeViewModelTest {
             VerificationResult.NothingToVerify.right()
         coEvery { mockPaymentUseCase.queryPaymentAvailability() } just Runs
         coEvery { mockPaymentUseCase.resetPurchaseResult() } just Runs
-        coEvery { mockAccountRepository.getAccountData() } returns null
+        coEvery { mockAccountRepository.refreshAccountData(any()) } just Runs
 
         viewModel =
             AddTimeViewModel(
@@ -151,7 +151,7 @@ class AddTimeViewModelTest {
         purchaseResult.emit(purchaseResultData)
 
         // Assert
-        coVerify { mockAccountRepository.getAccountData() }
+        coVerify { mockAccountRepository.refreshAccountData(ignoreTimeout = true) }
     }
 
     @Test