mirror of
https://github.com/bitwarden/android.git
synced 2026-11-19 17:40:12 -06:00
BIT-526: Clone vault item (#713)
This commit is contained in:
committed by
Álison Fernandes
parent
3ec95b0ffd
commit
a760127711
+47
-5
@@ -16,6 +16,7 @@ import com.x8bit.bitwarden.data.vault.repository.model.UpdateCipherResult
|
||||
import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest
|
||||
import com.x8bit.bitwarden.ui.platform.base.util.Text
|
||||
import com.x8bit.bitwarden.ui.platform.base.util.asText
|
||||
import com.x8bit.bitwarden.ui.platform.manager.resource.ResourceManager
|
||||
import com.x8bit.bitwarden.ui.tools.feature.generator.model.GeneratorMode
|
||||
import com.x8bit.bitwarden.ui.vault.feature.addedit.model.CustomFieldType
|
||||
import com.x8bit.bitwarden.ui.vault.feature.addedit.model.toCustomField
|
||||
@@ -58,7 +59,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
private val totpTestCodeFlow: MutableSharedFlow<TotpCodeResult> = bufferedMutableSharedFlow()
|
||||
|
||||
private val mutableVaultItemFlow = MutableStateFlow<DataState<CipherView?>>(DataState.Loading)
|
||||
|
||||
private val resourceManager: ResourceManager = mockk()
|
||||
private val clipboardManager: BitwardenClipboardManager = mockk()
|
||||
private val vaultRepository: VaultRepository = mockk {
|
||||
every { getVaultItemStateFlow(DEFAULT_EDIT_ITEM_ID) } returns mutableVaultItemFlow
|
||||
@@ -131,6 +132,25 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `initial clone state should be correct`() = runTest {
|
||||
val vaultAddEditType = VaultAddEditType.CloneItem(DEFAULT_EDIT_ITEM_ID)
|
||||
val initState = createVaultAddItemState(vaultAddEditType = vaultAddEditType)
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
savedStateHandle = createSavedStateHandleWithState(
|
||||
state = initState,
|
||||
vaultAddEditType = vaultAddEditType,
|
||||
),
|
||||
)
|
||||
assertEquals(
|
||||
initState.copy(viewState = VaultAddEditState.ViewState.Loading),
|
||||
viewModel.stateFlow.value,
|
||||
)
|
||||
verify(exactly = 1) {
|
||||
vaultRepository.getVaultItemStateFlow(DEFAULT_EDIT_ITEM_ID)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `CloseClick should emit NavigateBack`() = runTest {
|
||||
val viewModel = createAddVaultItemViewModel()
|
||||
@@ -254,7 +274,12 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
name = "mockName",
|
||||
),
|
||||
)
|
||||
every { cipherView.toViewState() } returns stateWithName.viewState
|
||||
every {
|
||||
cipherView.toViewState(
|
||||
isClone = false,
|
||||
resourceManager = resourceManager,
|
||||
)
|
||||
} returns stateWithName.viewState
|
||||
mutableVaultItemFlow.value = DataState.Loaded(cipherView)
|
||||
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
@@ -276,7 +301,10 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
}
|
||||
|
||||
coVerify(exactly = 1) {
|
||||
cipherView.toViewState()
|
||||
cipherView.toViewState(
|
||||
isClone = false,
|
||||
resourceManager = resourceManager,
|
||||
)
|
||||
vaultRepository.updateCipher(DEFAULT_EDIT_ITEM_ID, any())
|
||||
}
|
||||
}
|
||||
@@ -294,7 +322,12 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
),
|
||||
)
|
||||
|
||||
every { cipherView.toViewState() } returns stateWithName.viewState
|
||||
every {
|
||||
cipherView.toViewState(
|
||||
isClone = false,
|
||||
resourceManager = resourceManager,
|
||||
)
|
||||
} returns stateWithName.viewState
|
||||
coEvery {
|
||||
vaultRepository.updateCipher(DEFAULT_EDIT_ITEM_ID, any())
|
||||
} returns UpdateCipherResult.Error(errorMessage = null)
|
||||
@@ -336,7 +369,12 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
)
|
||||
val errorMessage = "You do not have permission to edit this."
|
||||
|
||||
every { cipherView.toViewState() } returns stateWithName.viewState
|
||||
every {
|
||||
cipherView.toViewState(
|
||||
isClone = false,
|
||||
resourceManager = resourceManager,
|
||||
)
|
||||
} returns stateWithName.viewState
|
||||
coEvery {
|
||||
vaultRepository.updateCipher(DEFAULT_EDIT_ITEM_ID, any())
|
||||
} returns UpdateCipherResult.Error(errorMessage = errorMessage)
|
||||
@@ -1192,6 +1230,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
clipboardManager = clipboardManager,
|
||||
vaultRepository = vaultRepository,
|
||||
generatorRepository = generatorRepository,
|
||||
resourceManager = resourceManager,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1484,6 +1523,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
when (vaultAddEditType) {
|
||||
VaultAddEditType.AddItem -> "add"
|
||||
is VaultAddEditType.EditItem -> "edit"
|
||||
is VaultAddEditType.CloneItem -> "clone"
|
||||
},
|
||||
)
|
||||
set("vault_edit_id", (vaultAddEditType as? VaultAddEditType.EditItem)?.vaultItemId)
|
||||
@@ -1494,12 +1534,14 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
bitwardenClipboardManager: BitwardenClipboardManager = clipboardManager,
|
||||
vaultRepo: VaultRepository = vaultRepository,
|
||||
generatorRepo: GeneratorRepository = generatorRepository,
|
||||
bitwardenResourceManager: ResourceManager = resourceManager,
|
||||
): VaultAddEditViewModel =
|
||||
VaultAddEditViewModel(
|
||||
savedStateHandle = savedStateHandle,
|
||||
clipboardManager = bitwardenClipboardManager,
|
||||
vaultRepository = vaultRepo,
|
||||
generatorRepository = generatorRepo,
|
||||
resourceManager = bitwardenResourceManager,
|
||||
)
|
||||
|
||||
/**
|
||||
|
||||
+55
-4
@@ -14,10 +14,12 @@ import com.bitwarden.core.SecureNoteType
|
||||
import com.bitwarden.core.SecureNoteView
|
||||
import com.x8bit.bitwarden.R
|
||||
import com.x8bit.bitwarden.ui.platform.base.util.asText
|
||||
import com.x8bit.bitwarden.ui.platform.manager.resource.ResourceManager
|
||||
import com.x8bit.bitwarden.ui.vault.feature.addedit.VaultAddEditState
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultCardBrand
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultLinkedFieldType
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import io.mockk.mockkStatic
|
||||
import io.mockk.unmockkStatic
|
||||
import org.junit.jupiter.api.AfterEach
|
||||
@@ -29,6 +31,10 @@ import java.util.UUID
|
||||
|
||||
class CipherViewExtensionsTest {
|
||||
|
||||
private val resourceManager: ResourceManager = mockk {
|
||||
every { getString(R.string.clone) } returns "Clone"
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
fun setup() {
|
||||
mockkStatic(UUID::randomUUID)
|
||||
@@ -44,7 +50,10 @@ class CipherViewExtensionsTest {
|
||||
fun `toViewState should create a Card ViewState`() {
|
||||
val cipherView = DEFAULT_CARD_CIPHER_VIEW
|
||||
|
||||
val result = cipherView.toViewState()
|
||||
val result = cipherView.toViewState(
|
||||
isClone = false,
|
||||
resourceManager = resourceManager,
|
||||
)
|
||||
|
||||
assertEquals(
|
||||
VaultAddEditState.ViewState.Content(
|
||||
@@ -85,7 +94,10 @@ class CipherViewExtensionsTest {
|
||||
fun `toViewState should create a Identity ViewState`() {
|
||||
val cipherView = DEFAULT_IDENTITY_CIPHER_VIEW
|
||||
|
||||
val result = cipherView.toViewState()
|
||||
val result = cipherView.toViewState(
|
||||
isClone = false,
|
||||
resourceManager = resourceManager,
|
||||
)
|
||||
|
||||
assertEquals(
|
||||
VaultAddEditState.ViewState.Content(
|
||||
@@ -131,7 +143,10 @@ class CipherViewExtensionsTest {
|
||||
fun `toViewState should create a Login ViewState`() {
|
||||
val cipherView = DEFAULT_LOGIN_CIPHER_VIEW
|
||||
|
||||
val result = cipherView.toViewState()
|
||||
val result = cipherView.toViewState(
|
||||
isClone = false,
|
||||
resourceManager = resourceManager,
|
||||
)
|
||||
|
||||
assertEquals(
|
||||
VaultAddEditState.ViewState.Content(
|
||||
@@ -172,7 +187,10 @@ class CipherViewExtensionsTest {
|
||||
fun `toViewState should create a Secure Notes ViewState`() {
|
||||
val cipherView = DEFAULT_SECURE_NOTES_CIPHER_VIEW
|
||||
|
||||
val result = cipherView.toViewState()
|
||||
val result = cipherView.toViewState(
|
||||
isClone = false,
|
||||
resourceManager = resourceManager,
|
||||
)
|
||||
|
||||
assertEquals(
|
||||
VaultAddEditState.ViewState.Content(
|
||||
@@ -197,6 +215,39 @@ class CipherViewExtensionsTest {
|
||||
result,
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `toViewState with isClone true should append clone text to the cipher name`() {
|
||||
val cipherView = DEFAULT_SECURE_NOTES_CIPHER_VIEW
|
||||
|
||||
val result = cipherView.toViewState(
|
||||
isClone = true,
|
||||
resourceManager = resourceManager,
|
||||
)
|
||||
|
||||
assertEquals(
|
||||
VaultAddEditState.ViewState.Content(
|
||||
common = VaultAddEditState.ViewState.Content.Common(
|
||||
originalCipher = cipherView,
|
||||
name = "cipher - Clone",
|
||||
folderName = R.string.folder_none.asText(),
|
||||
favorite = false,
|
||||
masterPasswordReprompt = true,
|
||||
notes = "Lots of notes",
|
||||
ownership = "",
|
||||
customFieldData = listOf(
|
||||
VaultAddEditState.Custom.BooleanField(TEST_ID, "TestBoolean", false),
|
||||
VaultAddEditState.Custom.TextField(TEST_ID, "TestText", "TestText"),
|
||||
VaultAddEditState.Custom.HiddenField(TEST_ID, "TestHidden", "TestHidden"),
|
||||
),
|
||||
availableFolders = emptyList(),
|
||||
availableOwners = emptyList(),
|
||||
),
|
||||
type = VaultAddEditState.ViewState.Content.ItemType.SecureNotes,
|
||||
),
|
||||
result,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private val DEFAULT_BASE_CIPHER_VIEW: CipherView = CipherView(
|
||||
|
||||
@@ -70,7 +70,7 @@ class VaultItemScreenTest : BaseComposeTest() {
|
||||
VaultItemScreen(
|
||||
viewModel = viewModel,
|
||||
onNavigateBack = { onNavigateBackCalled = true },
|
||||
onNavigateToVaultAddEditItem = { onNavigateToVaultEditItemId = it },
|
||||
onNavigateToVaultAddEditItem = { id, _ -> onNavigateToVaultEditItemId = id },
|
||||
onNavigateToMoveToOrganization = { onNavigateToMoveToOrganizationItemId = it },
|
||||
intentManager = intentManager,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user