Add ViewState VaultAddItemViewModel (#359)

This commit is contained in:
David Perez
2024-06-20 17:08:07 +01:00
committed by Álison Fernandes
parent d5a1592ef0
commit 1219aa20fd
11 changed files with 539 additions and 346 deletions
@@ -24,6 +24,7 @@ import androidx.compose.ui.test.performTextInput
import androidx.compose.ui.test.performTouchInput
import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.util.isProgressBar
import com.x8bit.bitwarden.ui.util.onAllNodesWithTextAfterScroll
import com.x8bit.bitwarden.ui.util.onNodeWithContentDescriptionAfterScroll
import com.x8bit.bitwarden.ui.util.onNodeWithTextAfterScroll
@@ -126,6 +127,43 @@ class VaultAddItemScreenTest : BaseComposeTest() {
.assertIsDisplayed()
}
@Test
fun `error text and retry should be displayed according to state`() {
val message = "error_message"
mutableStateFlow.update {
it.copy(viewState = VaultAddItemState.ViewState.Loading)
}
composeTestRule.onNodeWithText(message).assertIsNotDisplayed()
mutableStateFlow.update {
it.copy(viewState = VaultAddItemState.ViewState.Content.Login())
}
composeTestRule.onNodeWithText(message).assertIsNotDisplayed()
mutableStateFlow.update {
it.copy(viewState = VaultAddItemState.ViewState.Error(message.asText()))
}
composeTestRule.onNodeWithText(message).assertIsDisplayed()
}
@Test
fun `progressbar should be displayed according to state`() {
mutableStateFlow.update {
it.copy(viewState = VaultAddItemState.ViewState.Loading)
}
composeTestRule.onNode(isProgressBar).assertIsDisplayed()
mutableStateFlow.update {
it.copy(viewState = VaultAddItemState.ViewState.Error("Fail".asText()))
}
composeTestRule.onNode(isProgressBar).assertDoesNotExist()
mutableStateFlow.update {
it.copy(viewState = VaultAddItemState.ViewState.Content.Login())
}
composeTestRule.onNode(isProgressBar).assertDoesNotExist()
}
@Test
fun `clicking a Type Option should send TypeOptionSelect action`() {
// Opens the menu
@@ -153,7 +191,7 @@ class VaultAddItemScreenTest : BaseComposeTest() {
.onNodeWithContentDescriptionAfterScroll(label = "Type, Login")
.assertIsDisplayed()
mutableStateFlow.update { it.copy(selectedType = VaultAddItemState.ItemType.Card()) }
mutableStateFlow.update { it.copy(viewState = VaultAddItemState.ViewState.Content.Card()) }
composeTestRule
.onNodeWithContentDescriptionAfterScroll(label = "Type, Card")
@@ -815,47 +853,48 @@ class VaultAddItemScreenTest : BaseComposeTest() {
//region Helper functions
@Suppress("MaxLineLength")
private fun updateLoginType(
currentState: VaultAddItemState,
transform: VaultAddItemState.ItemType.Login.() -> VaultAddItemState.ItemType.Login,
transform: VaultAddItemState.ViewState.Content.Login.() -> VaultAddItemState.ViewState.Content.Login,
): VaultAddItemState {
val updatedType = when (val currentType = currentState.selectedType) {
is VaultAddItemState.ItemType.Login -> currentType.transform()
else -> currentType
val updatedType = when (val viewState = currentState.viewState) {
is VaultAddItemState.ViewState.Content.Login -> viewState.transform()
else -> viewState
}
return currentState.copy(selectedType = updatedType)
return currentState.copy(viewState = updatedType)
}
@Suppress("MaxLineLength")
private fun updateSecureNotesType(
currentState: VaultAddItemState,
transform: VaultAddItemState.ItemType.SecureNotes.() -> VaultAddItemState.ItemType.SecureNotes,
transform: VaultAddItemState.ViewState.Content.SecureNotes.() -> VaultAddItemState.ViewState.Content.SecureNotes,
): VaultAddItemState {
val updatedType = when (val currentType = currentState.selectedType) {
is VaultAddItemState.ItemType.SecureNotes -> currentType.transform()
else -> currentType
val updatedType = when (val viewState = currentState.viewState) {
is VaultAddItemState.ViewState.Content.SecureNotes -> viewState.transform()
else -> viewState
}
return currentState.copy(selectedType = updatedType)
return currentState.copy(viewState = updatedType)
}
//endregion Helper functions
companion object {
private val DEFAULT_STATE_LOGIN_DIALOG = VaultAddItemState(
selectedType = VaultAddItemState.ItemType.Login(),
viewState = VaultAddItemState.ViewState.Content.Login(),
dialog = VaultAddItemState.DialogState.Error("test".asText()),
vaultAddEditType = VaultAddEditType.AddItem,
)
private val DEFAULT_STATE_LOGIN = VaultAddItemState(
vaultAddEditType = VaultAddEditType.AddItem,
selectedType = VaultAddItemState.ItemType.Login(),
viewState = VaultAddItemState.ViewState.Content.Login(),
dialog = null,
)
private val DEFAULT_STATE_SECURE_NOTES = VaultAddItemState(
vaultAddEditType = VaultAddEditType.AddItem,
selectedType = VaultAddItemState.ItemType.SecureNotes(),
viewState = VaultAddItemState.ViewState.Content.SecureNotes(),
dialog = null,
)
}
@@ -40,11 +40,29 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
}
@Test
fun `initial state should be correct`() = runTest {
val viewModel = createAddVaultItemViewModel()
viewModel.stateFlow.test {
assertEquals(initialState, awaitItem())
}
fun `initial add state should be correct`() = runTest {
val vaultAddEditType = VaultAddEditType.AddItem
val initState = createVaultAddLoginItemState(vaultAddEditType = vaultAddEditType)
val viewModel = createAddVaultItemViewModel(
savedStateHandle = createSavedStateHandleWithState(
state = initState,
vaultAddEditType = vaultAddEditType,
),
)
assertEquals(initState, viewModel.stateFlow.value)
}
@Test
fun `initial edit state should be correct`() = runTest {
val vaultAddEditType = VaultAddEditType.EditItem(DEFAULT_EDIT_ITEM_ID)
val initState = createVaultAddLoginItemState(vaultAddEditType = vaultAddEditType)
val viewModel = createAddVaultItemViewModel(
savedStateHandle = createSavedStateHandleWithState(
state = initState,
vaultAddEditType = vaultAddEditType,
),
)
assertEquals(initState, viewModel.stateFlow.value)
}
@Test
@@ -188,7 +206,9 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedState = initialState.copy(selectedType = VaultAddItemState.ItemType.Login())
val expectedState = initialState.copy(
viewState = VaultAddItemState.ViewState.Content.Login(),
)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -210,10 +230,10 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedLoginItem =
(initialState.selectedType as VaultAddItemState.ItemType.Login)
(initialState.viewState as VaultAddItemState.ViewState.Content.Login)
.copy(name = "newName")
val expectedState = initialState.copy(selectedType = expectedLoginItem)
val expectedState = initialState.copy(viewState = expectedLoginItem)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -227,10 +247,10 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedLoginItem =
(initialState.selectedType as VaultAddItemState.ItemType.Login)
(initialState.viewState as VaultAddItemState.ViewState.Content.Login)
.copy(username = "newUsername")
val expectedState = initialState.copy(selectedType = expectedLoginItem)
val expectedState = initialState.copy(viewState = expectedLoginItem)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -244,10 +264,10 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedLoginItem =
(initialState.selectedType as VaultAddItemState.ItemType.Login)
(initialState.viewState as VaultAddItemState.ViewState.Content.Login)
.copy(password = "newPassword")
val expectedState = initialState.copy(selectedType = expectedLoginItem)
val expectedState = initialState.copy(viewState = expectedLoginItem)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -260,10 +280,10 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedLoginItem =
(initialState.selectedType as VaultAddItemState.ItemType.Login)
(initialState.viewState as VaultAddItemState.ViewState.Content.Login)
.copy(uri = "newUri")
val expectedState = initialState.copy(selectedType = expectedLoginItem)
val expectedState = initialState.copy(viewState = expectedLoginItem)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -276,10 +296,10 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedLoginItem =
(initialState.selectedType as VaultAddItemState.ItemType.Login)
(initialState.viewState as VaultAddItemState.ViewState.Content.Login)
.copy(folderName = "newFolder".asText())
val expectedState = initialState.copy(selectedType = expectedLoginItem)
val expectedState = initialState.copy(viewState = expectedLoginItem)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -292,10 +312,10 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedLoginItem =
(initialState.selectedType as VaultAddItemState.ItemType.Login)
(initialState.viewState as VaultAddItemState.ViewState.Content.Login)
.copy(favorite = true)
val expectedState = initialState.copy(selectedType = expectedLoginItem)
val expectedState = initialState.copy(viewState = expectedLoginItem)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -312,10 +332,10 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedLoginItem =
(initialState.selectedType as VaultAddItemState.ItemType.Login)
(initialState.viewState as VaultAddItemState.ViewState.Content.Login)
.copy(masterPasswordReprompt = true)
val expectedState = initialState.copy(selectedType = expectedLoginItem)
val expectedState = initialState.copy(viewState = expectedLoginItem)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -328,10 +348,10 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedLoginItem =
(initialState.selectedType as VaultAddItemState.ItemType.Login)
(initialState.viewState as VaultAddItemState.ViewState.Content.Login)
.copy(notes = "newNotes")
val expectedState = initialState.copy(selectedType = expectedLoginItem)
val expectedState = initialState.copy(viewState = expectedLoginItem)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -346,10 +366,10 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedLoginItem =
(initialState.selectedType as VaultAddItemState.ItemType.Login)
(initialState.viewState as VaultAddItemState.ViewState.Content.Login)
.copy(ownership = "newOwner")
val expectedState = initialState.copy(selectedType = expectedLoginItem)
val expectedState = initialState.copy(viewState = expectedLoginItem)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -496,10 +516,10 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedSecureNotesItem =
(initialState.selectedType as VaultAddItemState.ItemType.SecureNotes)
(initialState.viewState as VaultAddItemState.ViewState.Content.SecureNotes)
.copy(name = "newName")
val expectedState = initialState.copy(selectedType = expectedSecureNotesItem)
val expectedState = initialState.copy(viewState = expectedSecureNotesItem)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -513,10 +533,10 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedSecureNotesItem =
(initialState.selectedType as VaultAddItemState.ItemType.SecureNotes)
(initialState.viewState as VaultAddItemState.ViewState.Content.SecureNotes)
.copy(folderName = "newFolder".asText())
val expectedState = initialState.copy(selectedType = expectedSecureNotesItem)
val expectedState = initialState.copy(viewState = expectedSecureNotesItem)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -528,10 +548,10 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedSecureNotesItem =
(initialState.selectedType as VaultAddItemState.ItemType.SecureNotes)
(initialState.viewState as VaultAddItemState.ViewState.Content.SecureNotes)
.copy(favorite = true)
val expectedState = initialState.copy(selectedType = expectedSecureNotesItem)
val expectedState = initialState.copy(viewState = expectedSecureNotesItem)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -548,10 +568,10 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedSecureNotesItem =
(initialState.selectedType as VaultAddItemState.ItemType.SecureNotes)
(initialState.viewState as VaultAddItemState.ViewState.Content.SecureNotes)
.copy(masterPasswordReprompt = true)
val expectedState = initialState.copy(selectedType = expectedSecureNotesItem)
val expectedState = initialState.copy(viewState = expectedSecureNotesItem)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -565,10 +585,10 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedSecureNotesItem =
(initialState.selectedType as VaultAddItemState.ItemType.SecureNotes)
(initialState.viewState as VaultAddItemState.ViewState.Content.SecureNotes)
.copy(notes = "newNotes")
val expectedState = initialState.copy(selectedType = expectedSecureNotesItem)
val expectedState = initialState.copy(viewState = expectedSecureNotesItem)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -582,10 +602,10 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedSecureNotesItem =
(initialState.selectedType as VaultAddItemState.ItemType.SecureNotes)
(initialState.viewState as VaultAddItemState.ViewState.Content.SecureNotes)
.copy(ownership = "newOwner")
val expectedState = initialState.copy(selectedType = expectedSecureNotesItem)
val expectedState = initialState.copy(viewState = expectedSecureNotesItem)
assertEquals(expectedState, viewModel.stateFlow.value)
}
@@ -618,6 +638,7 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
@Suppress("LongParameterList")
private fun createVaultAddLoginItemState(
vaultAddEditType: VaultAddEditType = VaultAddEditType.AddItem,
name: String = "",
username: String = "",
password: String = "",
@@ -630,8 +651,8 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
dialogState: VaultAddItemState.DialogState? = null,
): VaultAddItemState =
VaultAddItemState(
vaultAddEditType = VaultAddEditType.AddItem,
selectedType = VaultAddItemState.ItemType.Login(
vaultAddEditType = vaultAddEditType,
viewState = VaultAddItemState.ViewState.Content.Login(
name = name,
username = username,
password = password,
@@ -657,7 +678,7 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
): VaultAddItemState =
VaultAddItemState(
vaultAddEditType = VaultAddEditType.AddItem,
selectedType = VaultAddItemState.ItemType.SecureNotes(
viewState = VaultAddItemState.ViewState.Content.SecureNotes(
name = name,
folderName = folder,
favorite = favorite,
@@ -692,3 +713,5 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
vaultRepository = vaultRepo,
)
}
private const val DEFAULT_EDIT_ITEM_ID: String = "edit_item_id"
@@ -109,7 +109,7 @@ class VaultDataExtensionsTest {
fun `toCipherView should transform Login ItemType to CipherView`() {
mockkStatic(Instant::class)
every { Instant.now() } returns Instant.MIN
val loginItemType = VaultAddItemState.ItemType.Login(
val loginItemType = VaultAddItemState.ViewState.Content.Login(
name = "mockName-1",
username = "mockUsername-1",
password = "mockPassword-1",
@@ -170,7 +170,7 @@ class VaultDataExtensionsTest {
fun `toCipherView should transform SecureNotes ItemType to CipherView`() {
mockkStatic(Instant::class)
every { Instant.now() } returns Instant.MIN
val secureNotesItemType = VaultAddItemState.ItemType.SecureNotes(
val secureNotesItemType = VaultAddItemState.ViewState.Content.SecureNotes(
name = "mockName-1",
folderName = "mockFolder-1".asText(),
favorite = false,