BIT-890 Adding a check for name when we save an item (#355)

This commit is contained in:
Oleg Semenenko
2024-06-20 17:08:07 +01:00
committed by Álison Fernandes
parent bfc0e9831c
commit 33a99ce68d
4 changed files with 212 additions and 44 deletions
@@ -2,13 +2,16 @@ package com.x8bit.bitwarden.ui.vault.feature.additem
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsNotDisplayed
import androidx.compose.ui.test.assertIsOff
import androidx.compose.ui.test.assertIsOn
import androidx.compose.ui.test.assertTextContains
import androidx.compose.ui.test.click
import androidx.compose.ui.test.filterToOne
import androidx.compose.ui.test.hasAnyAncestor
import androidx.compose.ui.test.hasContentDescription
import androidx.compose.ui.test.hasSetTextAction
import androidx.compose.ui.test.isDialog
import androidx.compose.ui.test.onAllNodesWithText
import androidx.compose.ui.test.onFirst
import androidx.compose.ui.test.onLast
@@ -77,6 +80,47 @@ class VaultAddItemScreenTest : BaseComposeTest() {
}
}
@Test
fun `clicking dismiss dialog button should send DismissDialog action`() {
mutableStateFlow.value = DEFAULT_STATE_LOGIN_DIALOG
composeTestRule.setContent {
VaultAddItemScreen(viewModel = viewModel, onNavigateBack = {})
}
composeTestRule
.onAllNodesWithText("Ok")
.filterToOne(hasAnyAncestor(isDialog()))
.performClick()
verify {
viewModel.trySendAction(
VaultAddItemAction.DismissDialog,
)
}
}
@Test
fun `dialog should display when state is updated to do so`() {
mutableStateFlow.value = DEFAULT_STATE_LOGIN
composeTestRule.setContent {
VaultAddItemScreen(viewModel = viewModel, onNavigateBack = {})
}
composeTestRule
.onAllNodesWithText("Ok")
.filterToOne(hasAnyAncestor(isDialog()))
.assertIsNotDisplayed()
mutableStateFlow.value = DEFAULT_STATE_LOGIN_DIALOG
composeTestRule
.onAllNodesWithText("Ok")
.filterToOne(hasAnyAncestor(isDialog()))
.assertIsDisplayed()
}
@Test
fun `clicking a Type Option should send TypeOptionSelect action`() {
composeTestRule.setContent {
@@ -112,7 +156,7 @@ class VaultAddItemScreenTest : BaseComposeTest() {
.onNodeWithContentDescriptionAfterScroll(label = "Type, Login")
.assertIsDisplayed()
mutableStateFlow.update { it.copy(selectedType = VaultAddItemState.ItemType.Card) }
mutableStateFlow.update { it.copy(selectedType = VaultAddItemState.ItemType.Card()) }
composeTestRule
.onNodeWithContentDescriptionAfterScroll(label = "Type, Card")
@@ -960,6 +1004,12 @@ class VaultAddItemScreenTest : BaseComposeTest() {
//endregion Helper functions
companion object {
private val DEFAULT_STATE_LOGIN_DIALOG = VaultAddItemState(
selectedType = VaultAddItemState.ItemType.Login(),
dialog = VaultAddItemState.DialogState.Error("test".asText()),
vaultAddEditType = VaultAddEditType.AddItem,
)
private val DEFAULT_STATE_LOGIN = VaultAddItemState(
vaultAddEditType = VaultAddEditType.AddItem,
selectedType = VaultAddItemState.ItemType.Login(),
@@ -59,26 +59,47 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
@Test
fun `SaveClick should show dialog, and remove it once an item is saved`() = runTest {
val stateWithDialog = createVaultAddLoginItemState(
name = "tester",
dialogState = VaultAddItemState.DialogState.Loading(
R.string.saving.asText(),
),
)
val viewModel = createAddVaultItemViewModel()
val stateWithName = createVaultAddLoginItemState(
name = "tester",
)
val viewModel = createAddVaultItemViewModel(
createSavedStateHandleWithState(
state = stateWithName,
vaultAddEditType = VaultAddEditType.AddItem,
),
)
coEvery {
vaultRepository.createCipher(any())
} returns CreateCipherResult.Success
viewModel.stateFlow.test {
viewModel.actionChannel.trySend(VaultAddItemAction.SaveClick)
assertEquals(initialState, awaitItem())
assertEquals(stateWithName, awaitItem())
assertEquals(stateWithDialog, awaitItem())
assertEquals(initialState, awaitItem())
assertEquals(stateWithName, awaitItem())
}
}
@Test
fun `SaveClick should update value to loading`() = runTest {
val viewModel = createAddVaultItemViewModel()
val stateWithName = createVaultAddLoginItemState(
name = "tester",
)
val viewModel = createAddVaultItemViewModel(
createSavedStateHandleWithState(
state = stateWithName,
vaultAddEditType = VaultAddEditType.AddItem,
),
)
coEvery {
vaultRepository.createCipher(any())
} returns CreateCipherResult.Success
@@ -90,7 +111,17 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
@Test
fun `SaveClick createCipher error should emit ShowToast`() = runTest {
val viewModel = createAddVaultItemViewModel()
val stateWithName = createVaultAddLoginItemState(
name = "tester",
)
val viewModel = createAddVaultItemViewModel(
createSavedStateHandleWithState(
state = stateWithName,
vaultAddEditType = VaultAddEditType.AddItem,
),
)
coEvery {
vaultRepository.createCipher(any())
} returns CreateCipherResult.Error
@@ -100,6 +131,56 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
}
}
@Test
fun `Saving item with an empty name field will cause a dialog to show up`() = runTest {
val stateWithNoName = createVaultAddSecureNotesItemState(name = "")
val stateWithNoNameAndDialog = createVaultAddSecureNotesItemState(
name = "",
dialogState = VaultAddItemState.DialogState.Error(
R.string.validation_field_required
.asText(R.string.name.asText()),
),
)
val viewModel = createAddVaultItemViewModel(
createSavedStateHandleWithState(
state = stateWithNoName,
vaultAddEditType = VaultAddEditType.AddItem,
),
)
coEvery { vaultRepository.createCipher(any()) } returns CreateCipherResult.Success
viewModel.stateFlow.test {
viewModel.actionChannel.trySend(VaultAddItemAction.SaveClick)
assertEquals(stateWithNoName, awaitItem())
assertEquals(stateWithNoNameAndDialog, awaitItem())
}
}
@Test
fun `HandleDialogDismiss will remove the current dialog`() = runTest {
val errorState = createVaultAddLoginItemState(
dialogState = VaultAddItemState.DialogState.Error(
R.string.validation_field_required
.asText(R.string.name.asText()),
),
)
val viewModel = createAddVaultItemViewModel(
createSavedStateHandleWithState(
state = errorState,
vaultAddEditType = VaultAddEditType.AddItem,
),
)
coEvery { vaultRepository.createCipher(any()) } returns CreateCipherResult.Success
viewModel.stateFlow.test {
viewModel.actionChannel.trySend(VaultAddItemAction.DismissDialog)
assertEquals(errorState, awaitItem())
assertEquals(null, awaitItem().dialog)
}
}
@Test
fun `TypeOptionSelect LOGIN should switch to LoginItem`() = runTest {
val viewModel = createAddVaultItemViewModel()
@@ -572,6 +653,7 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
masterPasswordReprompt: Boolean = false,
notes: String = "",
ownership: String = "placeholder@email.com",
dialogState: VaultAddItemState.DialogState? = null,
): VaultAddItemState =
VaultAddItemState(
vaultAddEditType = VaultAddEditType.AddItem,
@@ -583,7 +665,7 @@ class VaultAddItemViewModelTest : BaseViewModelTest() {
notes = notes,
ownership = ownership,
),
dialog = null,
dialog = dialogState,
)
private fun createSavedStateHandleWithState(