mirror of
https://github.com/bitwarden/android.git
synced 2026-11-19 17:40:12 -06:00
BIT-2128: Item creation screen cipher type error (#1169)
This commit is contained in:
committed by
Álison Fernandes
parent
25ceaf8c0b
commit
992bafc16c
+8
-7
@@ -54,6 +54,7 @@ import com.x8bit.bitwarden.ui.vault.model.VaultCardBrand
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultCardExpirationMonth
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultCollection
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultIdentityTitle
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultItemCipherType
|
||||
import io.mockk.every
|
||||
import io.mockk.just
|
||||
import io.mockk.mockk
|
||||
@@ -2602,7 +2603,7 @@ class VaultAddEditScreenTest : BaseComposeTest() {
|
||||
fun `should display policy warning when personal vault is disabled for add item type`() {
|
||||
mutableStateFlow.update {
|
||||
it.copy(
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
viewState = VaultAddEditState.ViewState.Content(
|
||||
common = VaultAddEditState.ViewState.Content.Common(
|
||||
originalCipher = createMockCipherView(1),
|
||||
@@ -2853,11 +2854,11 @@ class VaultAddEditScreenTest : BaseComposeTest() {
|
||||
isIndividualVaultDisabled = false,
|
||||
),
|
||||
dialog = VaultAddEditState.DialogState.Generic(message = "test".asText()),
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
)
|
||||
|
||||
private val DEFAULT_STATE_LOGIN = VaultAddEditState(
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
viewState = VaultAddEditState.ViewState.Content(
|
||||
common = VaultAddEditState.ViewState.Content.Common(),
|
||||
type = VaultAddEditState.ViewState.Content.ItemType.Login(),
|
||||
@@ -2867,7 +2868,7 @@ class VaultAddEditScreenTest : BaseComposeTest() {
|
||||
)
|
||||
|
||||
private val DEFAULT_STATE_IDENTITY = VaultAddEditState(
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.IDENTITY),
|
||||
viewState = VaultAddEditState.ViewState.Content(
|
||||
common = VaultAddEditState.ViewState.Content.Common(),
|
||||
type = VaultAddEditState.ViewState.Content.ItemType.Identity(),
|
||||
@@ -2877,7 +2878,7 @@ class VaultAddEditScreenTest : BaseComposeTest() {
|
||||
)
|
||||
|
||||
private val DEFAULT_STATE_CARD = VaultAddEditState(
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.CARD),
|
||||
viewState = VaultAddEditState.ViewState.Content(
|
||||
common = VaultAddEditState.ViewState.Content.Common(),
|
||||
type = VaultAddEditState.ViewState.Content.ItemType.Card(),
|
||||
@@ -2904,11 +2905,11 @@ class VaultAddEditScreenTest : BaseComposeTest() {
|
||||
isIndividualVaultDisabled = false,
|
||||
),
|
||||
dialog = null,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.SECURE_NOTE),
|
||||
)
|
||||
|
||||
private val DEFAULT_STATE_SECURE_NOTES = VaultAddEditState(
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.SECURE_NOTE),
|
||||
viewState = VaultAddEditState.ViewState.Content(
|
||||
common = VaultAddEditState.ViewState.Content.Common(),
|
||||
type = VaultAddEditState.ViewState.Content.ItemType.SecureNotes,
|
||||
|
||||
+38
-32
@@ -52,6 +52,7 @@ import com.x8bit.bitwarden.ui.vault.model.VaultCardBrand
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultCardExpirationMonth
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultCollection
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultIdentityTitle
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultItemCipherType
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultLinkedFieldType
|
||||
import io.mockk.coEvery
|
||||
import io.mockk.coVerify
|
||||
@@ -97,7 +98,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
)
|
||||
private val loginInitialSavedStateHandle = createSavedStateHandleWithState(
|
||||
state = loginInitialState,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
)
|
||||
|
||||
private val totpTestCodeFlow: MutableSharedFlow<TotpCodeResult> = bufferedMutableSharedFlow()
|
||||
@@ -139,7 +140,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
savedStateHandle = createSavedStateHandleWithState(
|
||||
state = null,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
),
|
||||
)
|
||||
viewModel.stateFlow.test {
|
||||
@@ -158,7 +159,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
|
||||
@Test
|
||||
fun `initial add state should be correct when not autofill`() = runTest {
|
||||
val vaultAddEditType = VaultAddEditType.AddItem
|
||||
val vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN)
|
||||
val initState = createVaultAddItemState(vaultAddEditType = vaultAddEditType)
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
savedStateHandle = createSavedStateHandleWithState(
|
||||
@@ -188,7 +189,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
data = null,
|
||||
),
|
||||
)
|
||||
val vaultAddEditType = VaultAddEditType.AddItem
|
||||
val vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN)
|
||||
mutableVaultDataFlow.value = DataState.Loaded(
|
||||
data = createVaultData(),
|
||||
)
|
||||
@@ -239,7 +240,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
val autofillContentState = autofillSelectionData.toDefaultAddTypeContent(
|
||||
isIndividualVaultDisabled = false,
|
||||
)
|
||||
val vaultAddEditType = VaultAddEditType.AddItem
|
||||
val vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN)
|
||||
val initState = createVaultAddItemState(
|
||||
vaultAddEditType = vaultAddEditType,
|
||||
commonContentViewState = autofillContentState.common,
|
||||
@@ -271,7 +272,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
autofillSaveItem = autofillSaveItem,
|
||||
)
|
||||
val autofillContentState = autofillSaveItem.toDefaultAddTypeContent(false)
|
||||
val vaultAddEditType = VaultAddEditType.AddItem
|
||||
val vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN)
|
||||
val initState = createVaultAddItemState(
|
||||
vaultAddEditType = vaultAddEditType,
|
||||
commonContentViewState = autofillContentState.common,
|
||||
@@ -500,7 +501,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
fun `in add mode, SaveClick should show dialog, remove it once an item is saved, and emit NavigateBack`() =
|
||||
runTest {
|
||||
val stateWithDialog = createVaultAddItemState(
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
dialogState = VaultAddEditState.DialogState.Loading(
|
||||
R.string.saving.asText(),
|
||||
),
|
||||
@@ -509,7 +510,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
),
|
||||
)
|
||||
val stateWithName = createVaultAddItemState(
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
commonContentViewState = createCommonContentViewState(
|
||||
name = "mockName-1",
|
||||
),
|
||||
@@ -520,7 +521,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
createSavedStateHandleWithState(
|
||||
state = stateWithName,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
),
|
||||
)
|
||||
coEvery {
|
||||
@@ -567,7 +568,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
autofillSaveItem = autofillSaveItem,
|
||||
)
|
||||
val stateWithDialog = createVaultAddItemState(
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
dialogState = VaultAddEditState.DialogState.Loading(
|
||||
R.string.saving.asText(),
|
||||
),
|
||||
@@ -577,7 +578,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
)
|
||||
.copy(shouldExitOnSave = true)
|
||||
val stateWithName = createVaultAddItemState(
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
commonContentViewState = createCommonContentViewState(
|
||||
name = "mockName-1",
|
||||
),
|
||||
@@ -589,7 +590,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
createSavedStateHandleWithState(
|
||||
state = stateWithName,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
),
|
||||
)
|
||||
coEvery {
|
||||
@@ -621,7 +622,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
fun `in add mode, createCipherInOrganization success should ShowToast and NavigateBack`() =
|
||||
runTest {
|
||||
val stateWithName = createVaultAddItemState(
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
commonContentViewState = createCommonContentViewState(
|
||||
name = "mockName-1",
|
||||
),
|
||||
@@ -632,7 +633,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
createSavedStateHandleWithState(
|
||||
state = stateWithName,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
),
|
||||
)
|
||||
|
||||
@@ -667,7 +668,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
createSavedStateHandleWithState(
|
||||
state = stateWithName,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
),
|
||||
)
|
||||
|
||||
@@ -690,7 +691,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
fun `in add mode, SaveClick createCipher error should show error dialog`() = runTest {
|
||||
|
||||
val stateWithName = createVaultAddItemState(
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
commonContentViewState = createCommonContentViewState(
|
||||
name = "mockName-1",
|
||||
),
|
||||
@@ -700,7 +701,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
createSavedStateHandleWithState(
|
||||
state = stateWithName,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
),
|
||||
)
|
||||
|
||||
@@ -941,7 +942,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
createSavedStateHandleWithState(
|
||||
state = stateWithNoName,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
),
|
||||
)
|
||||
coEvery { vaultRepository.createCipher(any()) } returns CreateCipherResult.Success
|
||||
@@ -958,7 +959,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
createVaultData(cipherView = createMockCipherView(1)),
|
||||
)
|
||||
val errorState = createVaultAddItemState(
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
dialogState = VaultAddEditState.DialogState.Generic(
|
||||
title = R.string.an_error_has_occurred.asText(),
|
||||
message = R.string.validation_field_required.asText(R.string.name.asText()),
|
||||
@@ -968,7 +969,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
createSavedStateHandleWithState(
|
||||
state = errorState,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
),
|
||||
)
|
||||
|
||||
@@ -1176,7 +1177,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
savedStateHandle = createSavedStateHandleWithState(
|
||||
state = loginState,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
),
|
||||
)
|
||||
|
||||
@@ -1454,7 +1455,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
)
|
||||
identityInitialSavedStateHandle = createSavedStateHandleWithState(
|
||||
state = vaultAddItemInitialState,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
)
|
||||
viewModel = createAddVaultItemViewModel(
|
||||
savedStateHandle = identityInitialSavedStateHandle,
|
||||
@@ -1748,7 +1749,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
)
|
||||
identityInitialSavedStateHandle = createSavedStateHandleWithState(
|
||||
state = vaultAddItemInitialState,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
)
|
||||
viewModel = createAddVaultItemViewModel(
|
||||
savedStateHandle = identityInitialSavedStateHandle,
|
||||
@@ -1861,7 +1862,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
vaultAddItemInitialState = createVaultAddItemState()
|
||||
secureNotesInitialSavedStateHandle = createSavedStateHandleWithState(
|
||||
state = vaultAddItemInitialState,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
)
|
||||
viewModel = VaultAddEditViewModel(
|
||||
savedStateHandle = secureNotesInitialSavedStateHandle,
|
||||
@@ -2038,7 +2039,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
@Test
|
||||
fun `CustomFieldValueChange should allow a user to update a text custom field`() = runTest {
|
||||
val initState = createVaultAddItemState(
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
typeContentViewState = VaultAddEditState.ViewState.Content.ItemType.SecureNotes,
|
||||
commonContentViewState = VaultAddEditState.ViewState.Content.Common(
|
||||
customFieldData = listOf(
|
||||
@@ -2139,7 +2140,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
savedStateHandle = createSavedStateHandleWithState(
|
||||
state = initState,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
),
|
||||
)
|
||||
val currentContentState =
|
||||
@@ -2194,7 +2195,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
savedStateHandle = createSavedStateHandleWithState(
|
||||
state = initState,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
),
|
||||
)
|
||||
val currentContentState =
|
||||
@@ -2260,7 +2261,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
savedStateHandle = createSavedStateHandleWithState(
|
||||
state = initState,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
),
|
||||
)
|
||||
val currentContentState =
|
||||
@@ -2340,7 +2341,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
|
||||
@Suppress("MaxLineLength")
|
||||
private fun createVaultAddItemState(
|
||||
vaultAddEditType: VaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType: VaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
commonContentViewState: VaultAddEditState.ViewState.Content.Common = createCommonContentViewState(),
|
||||
isIndividualVaultDisabled: Boolean = false,
|
||||
typeContentViewState: VaultAddEditState.ViewState.Content.ItemType = createLoginTypeContentViewState(),
|
||||
@@ -2412,12 +2413,17 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
set(
|
||||
"vault_add_edit_type",
|
||||
when (vaultAddEditType) {
|
||||
VaultAddEditType.AddItem -> "add"
|
||||
is VaultAddEditType.AddItem -> "add"
|
||||
is VaultAddEditType.EditItem -> "edit"
|
||||
is VaultAddEditType.CloneItem -> "clone"
|
||||
},
|
||||
)
|
||||
set("vault_edit_id", (vaultAddEditType as? VaultAddEditType.EditItem)?.vaultItemId)
|
||||
set(
|
||||
"vault_add_item_type",
|
||||
(vaultAddEditType as? VaultAddEditType.AddItem)
|
||||
?.vaultItemCipherType,
|
||||
)
|
||||
}
|
||||
|
||||
@Suppress("LongParameterList")
|
||||
@@ -2582,7 +2588,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
savedStateHandle = createSavedStateHandleWithState(
|
||||
state = initialState,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
),
|
||||
)
|
||||
|
||||
@@ -2611,7 +2617,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
savedStateHandle = createSavedStateHandleWithState(
|
||||
state = initialState,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
+3
-2
@@ -28,6 +28,7 @@ import com.x8bit.bitwarden.ui.vault.feature.addedit.model.UriItem
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultAddEditType
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultCardBrand
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultCollection
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultItemCipherType
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultLinkedFieldType
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
@@ -279,7 +280,7 @@ class CipherViewExtensionsTest {
|
||||
val result = createMockCipherView(number = 1)
|
||||
.validateCipherOrReturnErrorState(
|
||||
currentAccount = createAccount(),
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
) { _, _ -> providedState }
|
||||
|
||||
assertEquals(providedState, result)
|
||||
@@ -308,7 +309,7 @@ class CipherViewExtensionsTest {
|
||||
val result = createMockCipherView(number = 1)
|
||||
.validateCipherOrReturnErrorState(
|
||||
currentAccount = null,
|
||||
vaultAddEditType = VaultAddEditType.AddItem,
|
||||
vaultAddEditType = VaultAddEditType.AddItem(VaultItemCipherType.LOGIN),
|
||||
) { _, _ -> providedState }
|
||||
|
||||
assertEquals(
|
||||
|
||||
+48
@@ -0,0 +1,48 @@
|
||||
package com.x8bit.bitwarden.ui.vault.feature.addedit.util
|
||||
|
||||
import com.x8bit.bitwarden.ui.vault.feature.addedit.VaultAddEditState
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultItemCipherType
|
||||
import io.mockk.every
|
||||
import io.mockk.mockkStatic
|
||||
import io.mockk.unmockkStatic
|
||||
import org.junit.jupiter.api.AfterEach
|
||||
import org.junit.jupiter.api.Assertions.assertEquals
|
||||
import org.junit.jupiter.api.BeforeEach
|
||||
import org.junit.jupiter.api.Test
|
||||
import java.util.UUID
|
||||
|
||||
class VaultAddEditExtensionsTest {
|
||||
|
||||
@BeforeEach
|
||||
fun setup() {
|
||||
mockkStatic(UUID::randomUUID)
|
||||
every { UUID.randomUUID().toString() } returns "123"
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
fun teardown() {
|
||||
unmockkStatic(UUID::randomUUID)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `toItemType should return the correct response`() {
|
||||
val vaultItemCipherTypeList = listOf(
|
||||
VaultItemCipherType.LOGIN,
|
||||
VaultItemCipherType.CARD,
|
||||
VaultItemCipherType.SECURE_NOTE,
|
||||
VaultItemCipherType.IDENTITY,
|
||||
)
|
||||
|
||||
val result = vaultItemCipherTypeList.map { it.toItemType() }
|
||||
|
||||
assertEquals(
|
||||
listOf(
|
||||
VaultAddEditState.ViewState.Content.ItemType.Login(),
|
||||
VaultAddEditState.ViewState.Content.ItemType.Card(),
|
||||
VaultAddEditState.ViewState.Content.ItemType.SecureNotes,
|
||||
VaultAddEditState.ViewState.Content.ItemType.Identity(),
|
||||
),
|
||||
result,
|
||||
)
|
||||
}
|
||||
}
|
||||
+4
-1
@@ -45,6 +45,7 @@ import com.x8bit.bitwarden.ui.util.performLogoutAccountClick
|
||||
import com.x8bit.bitwarden.ui.util.performLogoutAccountConfirmationClick
|
||||
import com.x8bit.bitwarden.ui.vault.feature.itemlisting.model.ListingItemOverflowAction
|
||||
import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultItemCipherType
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultItemListingType
|
||||
import io.mockk.every
|
||||
import io.mockk.just
|
||||
@@ -366,7 +367,9 @@ class VaultItemListingScreenTest : BaseComposeTest() {
|
||||
|
||||
@Test
|
||||
fun `NavigateToAdd VaultItem event should call NavigateToVaultAddItemScreen`() {
|
||||
mutableEventFlow.tryEmit(VaultItemListingEvent.NavigateToAddVaultItem)
|
||||
mutableEventFlow.tryEmit(
|
||||
VaultItemListingEvent.NavigateToAddVaultItem(VaultItemCipherType.LOGIN),
|
||||
)
|
||||
assertTrue(onNavigateToVaultAddItemScreenCalled)
|
||||
}
|
||||
|
||||
|
||||
+5
-1
@@ -43,6 +43,7 @@ import com.x8bit.bitwarden.ui.vault.feature.itemlisting.util.createMockDisplayIt
|
||||
import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType
|
||||
import com.x8bit.bitwarden.ui.vault.feature.vault.util.toAccountSummaries
|
||||
import com.x8bit.bitwarden.ui.vault.feature.vault.util.toActiveAccountSummary
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultItemCipherType
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultItemListingType
|
||||
import io.mockk.coEvery
|
||||
import io.mockk.every
|
||||
@@ -461,7 +462,10 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
|
||||
val viewModel = createVaultItemListingViewModel()
|
||||
viewModel.eventFlow.test {
|
||||
viewModel.trySendAction(VaultItemListingsAction.AddVaultItemClick)
|
||||
assertEquals(VaultItemListingEvent.NavigateToAddVaultItem, awaitItem())
|
||||
assertEquals(
|
||||
VaultItemListingEvent.NavigateToAddVaultItem(VaultItemCipherType.LOGIN),
|
||||
awaitItem(),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+41
@@ -2,8 +2,10 @@ package com.x8bit.bitwarden.ui.vault.feature.itemlisting.util
|
||||
|
||||
import com.x8bit.bitwarden.ui.platform.feature.search.model.SearchType
|
||||
import com.x8bit.bitwarden.ui.vault.feature.itemlisting.VaultItemListingState
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultItemCipherType
|
||||
import org.junit.jupiter.api.Assertions.assertEquals
|
||||
import org.junit.jupiter.api.Test
|
||||
import org.junit.jupiter.api.assertThrows
|
||||
|
||||
class VaultItemListingStateExtensionsTest {
|
||||
|
||||
@@ -108,4 +110,43 @@ class VaultItemListingStateExtensionsTest {
|
||||
|
||||
assertEquals(expected, result)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `toVaultItemCipherType should return the correct response`() {
|
||||
val itemListingTypes = listOf(
|
||||
VaultItemListingState.ItemListingType.Vault.Card,
|
||||
VaultItemListingState.ItemListingType.Vault.Identity,
|
||||
VaultItemListingState.ItemListingType.Vault.SecureNote,
|
||||
VaultItemListingState.ItemListingType.Vault.Login,
|
||||
)
|
||||
|
||||
val result = itemListingTypes.map { it.toVaultItemCipherType() }
|
||||
|
||||
assertEquals(
|
||||
listOf(
|
||||
VaultItemCipherType.CARD,
|
||||
VaultItemCipherType.IDENTITY,
|
||||
VaultItemCipherType.SECURE_NOTE,
|
||||
VaultItemCipherType.LOGIN,
|
||||
),
|
||||
result,
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `toVaultItemCipherType should throw an exception for unsupported ItemListingTypes`() {
|
||||
val itemListingTypes = listOf(
|
||||
VaultItemListingState.ItemListingType.Vault.Trash,
|
||||
VaultItemListingState.ItemListingType.Vault.Collection(
|
||||
collectionId = "mockId",
|
||||
),
|
||||
VaultItemListingState.ItemListingType.Vault.Folder(
|
||||
folderId = "mockId",
|
||||
),
|
||||
)
|
||||
|
||||
itemListingTypes.forEach {
|
||||
assertThrows<IllegalStateException> { it.toVaultItemCipherType() }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user