Merge branch 'account-page-is-set-into-loading-state-when-logging-out-droid-1006'

1 files changed, 9 insertions, 9 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 fd1a363e11..76c176c519 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
@@ -39,11 +39,6 @@ class AccountViewModelTest {
     private val mockDeviceRepository: DeviceRepository = mockk(relaxUnitFun = true)
     private val mockPaymentUseCase: PaymentUseCase = mockk(relaxed = true)
 
-    private val deviceState: MutableStateFlow<DeviceState?> = MutableStateFlow(null)
-    private val paymentAvailability = MutableStateFlow<PaymentAvailability?>(null)
-    private val purchaseResult = MutableStateFlow<PurchaseResult?>(null)
-    private val accountExpiryState = MutableStateFlow(null)
-
     private val dummyDevice =
         Device(id = DeviceId.fromString(UUID), name = "fake_name", creationDate = DateTime.now())
     private val dummyAccountNumber: AccountNumber =
@@ -51,6 +46,14 @@ class AccountViewModelTest {
             DUMMY_DEVICE_NAME,
         )
 
+    private val deviceState: MutableStateFlow<DeviceState?> =
+        MutableStateFlow(
+            DeviceState.LoggedIn(accountNumber = dummyAccountNumber, device = dummyDevice)
+        )
+    private val paymentAvailability = MutableStateFlow<PaymentAvailability?>(null)
+    private val purchaseResult = MutableStateFlow<PurchaseResult?>(null)
+    private val accountExpiryState = MutableStateFlow(null)
+
     private lateinit var viewModel: AccountViewModel
 
     @BeforeEach
@@ -80,11 +83,10 @@ class AccountViewModelTest {
     fun `given device state LoggedIn uiState should contain accountNumber`() = runTest {
         // Act, Assert
         viewModel.uiState.test {
-            awaitItem() // Default state
             deviceState.value =
                 DeviceState.LoggedIn(accountNumber = dummyAccountNumber, device = dummyDevice)
             val result = awaitItem()
-            assertEquals(DUMMY_DEVICE_NAME, result.accountNumber)
+            assertEquals(dummyAccountNumber, result.accountNumber)
         }
     }
 
@@ -100,8 +102,6 @@ class AccountViewModelTest {
     @Test
     fun `when paymentAvailability emits ProductsUnavailable uiState should be NoPayment`() =
         runTest {
-            // Arrange in setup
-
             // Act, Assert
             viewModel.uiState.test {
                 awaitItem() // Default state