mirror of
https://github.com/bitwarden/android.git
synced 2026-11-19 17:40:12 -06:00
BIT-1653 Add functionality to new URI button (#862)
This commit is contained in:
committed by
Álison Fernandes
parent
b1cc9a1dd6
commit
d2ffd7bf01
+14
-3
@@ -43,6 +43,7 @@ import com.x8bit.bitwarden.ui.util.onNodeWithContentDescriptionAfterScroll
|
||||
import com.x8bit.bitwarden.ui.util.onNodeWithTextAfterScroll
|
||||
import com.x8bit.bitwarden.ui.vault.feature.addedit.model.CustomFieldAction
|
||||
import com.x8bit.bitwarden.ui.vault.feature.addedit.model.CustomFieldType
|
||||
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.VaultCardExpirationMonth
|
||||
@@ -720,13 +721,21 @@ class VaultAddEditScreenTest : BaseComposeTest() {
|
||||
|
||||
@Test
|
||||
fun `in ItemType_Login state changing URI text field should trigger UriTextChange`() {
|
||||
mutableStateFlow.update { currentState ->
|
||||
updateLoginType(currentState) {
|
||||
copy(uriList = listOf(UriItem("TestId", "URI", null)))
|
||||
}
|
||||
}
|
||||
|
||||
composeTestRule
|
||||
.onNodeWithTextAfterScroll("URI")
|
||||
.performTextInput("TestURI")
|
||||
.performTextInput("Test")
|
||||
|
||||
verify {
|
||||
viewModel.trySendAction(
|
||||
VaultAddEditAction.ItemType.LoginType.UriTextChange("TestURI"),
|
||||
VaultAddEditAction.ItemType.LoginType.UriTextChange(
|
||||
UriItem("TestId", "TestURI", null),
|
||||
),
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -738,7 +747,9 @@ class VaultAddEditScreenTest : BaseComposeTest() {
|
||||
.assertTextContains("")
|
||||
|
||||
mutableStateFlow.update { currentState ->
|
||||
updateLoginType(currentState) { copy(uri = "NewURI") }
|
||||
updateLoginType(currentState) {
|
||||
copy(uriList = listOf(UriItem("TestId", "NewURI", null)))
|
||||
}
|
||||
}
|
||||
|
||||
composeTestRule
|
||||
|
||||
+23
-14
@@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.vault.feature.addedit
|
||||
import androidx.lifecycle.SavedStateHandle
|
||||
import app.cash.turbine.test
|
||||
import com.bitwarden.core.CipherView
|
||||
import com.bitwarden.core.UriMatchType
|
||||
import com.x8bit.bitwarden.R
|
||||
import com.x8bit.bitwarden.data.auth.repository.AuthRepository
|
||||
import com.x8bit.bitwarden.data.auth.repository.model.BreachCountResult
|
||||
@@ -24,6 +25,7 @@ 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.CustomFieldAction
|
||||
import com.x8bit.bitwarden.ui.vault.feature.addedit.model.CustomFieldType
|
||||
import com.x8bit.bitwarden.ui.vault.feature.addedit.model.UriItem
|
||||
import com.x8bit.bitwarden.ui.vault.feature.addedit.model.toCustomField
|
||||
import com.x8bit.bitwarden.ui.vault.feature.addedit.util.toViewState
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultAddEditType
|
||||
@@ -306,7 +308,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
typeContentViewState = createLoginTypeContentViewState(
|
||||
username = "mockUsername-1",
|
||||
password = "mockPassword-1",
|
||||
uri = "www.mockuri1.com",
|
||||
uri = listOf(UriItem("testId", "www.mockuri1.com", UriMatchType.HOST)),
|
||||
totpCode = "mockTotp-1",
|
||||
canViewPassword = false,
|
||||
),
|
||||
@@ -755,13 +757,15 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
|
||||
@Test
|
||||
fun `UriTextChange should update uri in LoginItem`() = runTest {
|
||||
val action = VaultAddEditAction.ItemType.LoginType.UriTextChange("newUri")
|
||||
val action = VaultAddEditAction.ItemType.LoginType.UriTextChange(
|
||||
UriItem("testId", "TestUri", null),
|
||||
)
|
||||
|
||||
viewModel.actionChannel.trySend(action)
|
||||
|
||||
val expectedState = createVaultAddItemState(
|
||||
typeContentViewState = createLoginTypeContentViewState(
|
||||
uri = "newUri",
|
||||
uri = listOf(UriItem("testId", "TestUri", null)),
|
||||
),
|
||||
)
|
||||
|
||||
@@ -985,18 +989,23 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `AddNewUriClick should emit ShowToast with 'Add New URI' message`() = runTest {
|
||||
fun `AddNewUriClick should update state with another empty UriItem`() = runTest {
|
||||
val viewModel = createAddVaultItemViewModel()
|
||||
every { UUID.randomUUID().toString() } returns "testId2"
|
||||
|
||||
viewModel.eventFlow.test {
|
||||
viewModel
|
||||
.actionChannel
|
||||
.trySend(
|
||||
VaultAddEditAction.ItemType.LoginType.AddNewUriClick,
|
||||
)
|
||||
viewModel.trySendAction(VaultAddEditAction.ItemType.LoginType.AddNewUriClick)
|
||||
|
||||
assertEquals(VaultAddEditEvent.ShowToast("Add New URI".asText()), awaitItem())
|
||||
}
|
||||
val expectedState = createVaultAddItemState(
|
||||
typeContentViewState = createLoginTypeContentViewState().copy(
|
||||
uriList = listOf(UriItem("testId", "", null), UriItem("testId2", "", null)),
|
||||
),
|
||||
)
|
||||
|
||||
assertEquals(
|
||||
expectedState,
|
||||
viewModel.stateFlow.value,
|
||||
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1901,14 +1910,14 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
private fun createLoginTypeContentViewState(
|
||||
username: String = "",
|
||||
password: String = "",
|
||||
uri: String = "",
|
||||
uri: List<UriItem> = listOf(UriItem("testId", "", null)),
|
||||
totpCode: String? = null,
|
||||
canViewPassword: Boolean = true,
|
||||
): VaultAddEditState.ViewState.Content.ItemType.Login =
|
||||
VaultAddEditState.ViewState.Content.ItemType.Login(
|
||||
username = username,
|
||||
password = password,
|
||||
uri = uri,
|
||||
uriList = uri,
|
||||
totp = totpCode,
|
||||
canViewPassword = canViewPassword,
|
||||
)
|
||||
|
||||
+2
-1
@@ -16,6 +16,7 @@ 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.feature.addedit.model.UriItem
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultCardBrand
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultLinkedFieldType
|
||||
import io.mockk.every
|
||||
@@ -174,7 +175,7 @@ class CipherViewExtensionsTest {
|
||||
type = VaultAddEditState.ViewState.Content.ItemType.Login(
|
||||
username = "username",
|
||||
password = "password",
|
||||
uri = "www.example.com",
|
||||
uriList = listOf(UriItem(TEST_ID, "www.example.com", null)),
|
||||
totp = "otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example",
|
||||
canViewPassword = false,
|
||||
),
|
||||
|
||||
+4
-3
@@ -14,6 +14,7 @@ import com.bitwarden.core.SecureNoteView
|
||||
import com.bitwarden.core.UriMatchType
|
||||
import com.x8bit.bitwarden.ui.platform.base.util.asText
|
||||
import com.x8bit.bitwarden.ui.vault.feature.addedit.VaultAddEditState
|
||||
import com.x8bit.bitwarden.ui.vault.feature.addedit.model.UriItem
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultIdentityTitle
|
||||
import com.x8bit.bitwarden.ui.vault.model.VaultLinkedFieldType
|
||||
import io.mockk.every
|
||||
@@ -50,7 +51,7 @@ class VaultAddItemStateExtensionsTest {
|
||||
type = VaultAddEditState.ViewState.Content.ItemType.Login(
|
||||
username = "mockUsername-1",
|
||||
password = "mockPassword-1",
|
||||
uri = "mockUri-1",
|
||||
uriList = listOf(UriItem("testId", "mockUri-1", UriMatchType.DOMAIN)),
|
||||
totp = "otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example",
|
||||
),
|
||||
)
|
||||
@@ -127,7 +128,7 @@ class VaultAddItemStateExtensionsTest {
|
||||
type = VaultAddEditState.ViewState.Content.ItemType.Login(
|
||||
username = "mockUsername-1",
|
||||
password = "mockPassword-1",
|
||||
uri = "mockUri-1",
|
||||
uriList = listOf(UriItem("TestId", "mockUri-1", null)),
|
||||
totp = "otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example",
|
||||
),
|
||||
)
|
||||
@@ -147,7 +148,7 @@ class VaultAddItemStateExtensionsTest {
|
||||
uris = listOf(
|
||||
LoginUriView(
|
||||
uri = "mockUri-1",
|
||||
match = UriMatchType.DOMAIN,
|
||||
match = null,
|
||||
),
|
||||
),
|
||||
totp = "otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example",
|
||||
|
||||
Reference in New Issue
Block a user