BIT-1158: Add No Network states to Vault Screen (#391)

This commit is contained in:
Brian Yencho
2024-06-20 17:08:07 +01:00
committed by Álison Fernandes
parent 36e913b680
commit 0655f74479
5 changed files with 380 additions and 13 deletions
@@ -3,9 +3,12 @@ package com.x8bit.bitwarden.ui.vault.feature.vault
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertTextEquals
import androidx.compose.ui.test.filterToOne
import androidx.compose.ui.test.hasAnyAncestor
import androidx.compose.ui.test.hasClickAction
import androidx.compose.ui.test.hasScrollToNodeAction
import androidx.compose.ui.test.hasText
import androidx.compose.ui.test.isDialog
import androidx.compose.ui.test.onAllNodesWithText
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
@@ -176,6 +179,104 @@ class VaultScreenTest : BaseComposeTest() {
composeTestRule.assertNoDialogExists()
}
@Test
fun `error dialog should be shown or hidden according to the state`() {
val errorTitle = "Error title"
val errorMessage = "Error message"
composeTestRule.assertNoDialogExists()
composeTestRule
.onNodeWithText(errorTitle)
.assertDoesNotExist()
composeTestRule
.onNodeWithText(errorMessage)
.assertDoesNotExist()
mutableStateFlow.update {
it.copy(
dialog = VaultState.DialogState.Error(
title = errorTitle.asText(),
message = errorMessage.asText(),
),
)
}
composeTestRule
.onAllNodesWithText(errorTitle)
.filterToOne(hasAnyAncestor(isDialog()))
.assertIsDisplayed()
composeTestRule
.onAllNodesWithText(errorMessage)
.filterToOne(hasAnyAncestor(isDialog()))
.assertIsDisplayed()
}
@Test
fun `OK button click in error dialog should send DialogDismiss`() {
val errorTitle = "Error title"
val errorMessage = "Error message"
mutableStateFlow.update {
it.copy(
dialog = VaultState.DialogState.Error(
title = errorTitle.asText(),
message = errorMessage.asText(),
),
)
}
composeTestRule
.onAllNodesWithText("Ok")
.filterToOne(hasAnyAncestor(isDialog()))
.performClick()
verify { viewModel.trySendAction(VaultAction.DialogDismiss) }
}
@Test
fun `Error screen should be shown according to the state`() {
val errorMessage = "Error message"
val tryAgainButtonText = "Try again"
composeTestRule
.onNodeWithText(errorMessage)
.assertDoesNotExist()
composeTestRule
.onNodeWithText(tryAgainButtonText)
.assertDoesNotExist()
mutableStateFlow.update {
it.copy(
viewState = VaultState.ViewState.Error(
message = errorMessage.asText(),
),
)
}
composeTestRule
.onNodeWithText(errorMessage)
.assertIsDisplayed()
composeTestRule
.onNodeWithText(tryAgainButtonText)
.assertIsDisplayed()
}
@Test
fun `try again button click on the Error screen should send TryAgainClick`() {
val errorMessage = "Error message"
val tryAgainButtonText = "Try again"
mutableStateFlow.update {
it.copy(
viewState = VaultState.ViewState.Error(
message = errorMessage.asText(),
),
)
}
composeTestRule
.onNodeWithText(tryAgainButtonText)
.performClick()
verify { viewModel.trySendAction(VaultAction.TryAgainClick) }
}
@Test
fun `search icon click should send SearchIconClick action`() {
mutableStateFlow.update { it.copy(viewState = VaultState.ViewState.NoItems) }
@@ -1,6 +1,7 @@
package com.x8bit.bitwarden.ui.vault.feature.vault
import app.cash.turbine.test
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
import com.x8bit.bitwarden.data.auth.repository.model.SwitchAccountResult
import com.x8bit.bitwarden.data.auth.repository.model.UserState
@@ -352,25 +353,99 @@ class VaultViewModelTest : BaseViewModelTest() {
}
@Test
fun `vaultDataStateFlow NoNetwork should show toast and update state to NoItems`() = runTest {
fun `vaultDataStateFlow NoNetwork without data should update state to Error`() = runTest {
mutableVaultDataStateFlow.tryEmit(
value = DataState.NoNetwork(),
)
val viewModel = createViewModel()
viewModel.eventFlow.test {
assertEquals(
VaultEvent.ShowToast("Vault no network state not yet implemented"),
awaitItem(),
)
}
assertEquals(
createMockVaultState(viewState = VaultState.ViewState.NoItems),
createMockVaultState(
viewState = VaultState.ViewState.Error(
message = R.string.internet_connection_required_message.asText(),
),
),
viewModel.stateFlow.value,
)
}
@Suppress("MaxLineLength")
@Test
fun `vaultDataStateFlow NoNetwork with items should update state to Content and show an error dialog`() =
runTest {
mutableVaultDataStateFlow.tryEmit(
value = DataState.NoNetwork(
data = VaultData(
cipherViewList = listOf(createMockCipherView(number = 1)),
collectionViewList = listOf(createMockCollectionView(number = 1)),
folderViewList = listOf(createMockFolderView(number = 1)),
),
),
)
val viewModel = createViewModel()
assertEquals(
createMockVaultState(
viewState = VaultState.ViewState.Content(
loginItemsCount = 1,
cardItemsCount = 0,
identityItemsCount = 0,
secureNoteItemsCount = 0,
favoriteItems = listOf(),
folderItems = listOf(
VaultState.ViewState.FolderItem(
id = "mockId-1",
name = "mockName-1".asText(),
itemCount = 1,
),
),
collectionItems = listOf(
VaultState.ViewState.CollectionItem(
id = "mockId-1",
name = "mockName-1",
itemCount = 1,
),
),
noFolderItems = listOf(),
trashItemsCount = 0,
),
dialog = VaultState.DialogState.Error(
title = R.string.internet_connection_required_title.asText(),
message = R.string.internet_connection_required_message.asText(),
),
),
viewModel.stateFlow.value,
)
}
@Suppress("MaxLineLength")
@Test
fun `vaultDataStateFlow NoNetwork with empty items should update state to NoItems and show an error dialog`() =
runTest {
mutableVaultDataStateFlow.tryEmit(
value = DataState.NoNetwork(
data = VaultData(
cipherViewList = emptyList(),
collectionViewList = emptyList(),
folderViewList = emptyList(),
),
),
)
val viewModel = createViewModel()
assertEquals(
createMockVaultState(
viewState = VaultState.ViewState.NoItems,
dialog = VaultState.DialogState.Error(
title = R.string.internet_connection_required_title.asText(),
message = R.string.internet_connection_required_message.asText(),
),
),
viewModel.stateFlow.value,
)
}
@Test
fun `vaultDataStateFlow updates should do nothing when switching accounts`() {
val viewModel = createViewModel()
@@ -532,6 +607,46 @@ class VaultViewModelTest : BaseViewModelTest() {
}
}
@Test
fun `TryAgainClick should sync the vault data`() {
val viewModel = createViewModel()
viewModel.trySendAction(VaultAction.TryAgainClick)
verify { vaultRepository.sync() }
}
@Test
fun `DialogDismiss should clear the active dialog`() {
// Show the No Network error dialog
val viewModel = createViewModel()
mutableVaultDataStateFlow.value = DataState.NoNetwork(
data = VaultData(
cipherViewList = emptyList(),
collectionViewList = emptyList(),
folderViewList = emptyList(),
),
)
val initialState = DEFAULT_STATE.copy(
viewState = VaultState.ViewState.NoItems,
dialog = VaultState.DialogState.Error(
title = R.string.internet_connection_required_title.asText(),
message = R.string.internet_connection_required_message.asText(),
),
)
assertEquals(
initialState,
viewModel.stateFlow.value,
)
viewModel.trySendAction(VaultAction.DialogDismiss)
assertEquals(
initialState.copy(dialog = null),
viewModel.stateFlow.value,
)
}
private fun createViewModel(): VaultViewModel =
VaultViewModel(
authRepository = authRepository,
@@ -566,7 +681,10 @@ private val DEFAULT_USER_STATE = UserState(
),
)
private fun createMockVaultState(viewState: VaultState.ViewState): VaultState =
private fun createMockVaultState(
viewState: VaultState.ViewState,
dialog: VaultState.DialogState? = null,
): VaultState =
VaultState(
avatarColorString = "#aa00aa",
initials = "AU",
@@ -591,5 +709,6 @@ private fun createMockVaultState(viewState: VaultState.ViewState): VaultState =
),
),
viewState = viewState,
dialog = dialog,
isSwitchingAccounts = false,
)