mirror of
https://github.com/bitwarden/android.git
synced 2026-11-20 11:37:52 -06:00
Add initial attachments screen shell (#745)
This commit is contained in:
committed by
Álison Fernandes
parent
30ab22f826
commit
96201fd34c
+10
-3
@@ -60,6 +60,7 @@ class VaultAddEditScreenTest : BaseComposeTest() {
|
||||
private var onNavigateQrCodeScanScreenCalled = false
|
||||
private var onNavigateToManualCodeEntryScreenCalled = false
|
||||
private var onNavigateToGeneratorModalType: GeneratorMode.Modal? = null
|
||||
private var onNavigateToAttachmentsId: String? = null
|
||||
|
||||
private val mutableEventFlow = bufferedMutableSharedFlow<VaultAddEditEvent>()
|
||||
private val mutableStateFlow = MutableStateFlow(DEFAULT_STATE_LOGIN)
|
||||
@@ -76,13 +77,12 @@ class VaultAddEditScreenTest : BaseComposeTest() {
|
||||
composeTestRule.setContent {
|
||||
VaultAddEditScreen(
|
||||
onNavigateBack = { onNavigateBackCalled = true },
|
||||
onNavigateToQrCodeScanScreen = {
|
||||
onNavigateQrCodeScanScreenCalled = true
|
||||
},
|
||||
onNavigateToQrCodeScanScreen = { onNavigateQrCodeScanScreenCalled = true },
|
||||
onNavigateToManualCodeEntryScreen = {
|
||||
onNavigateToManualCodeEntryScreenCalled = true
|
||||
},
|
||||
onNavigateToGeneratorModal = { onNavigateToGeneratorModalType = it },
|
||||
onNavigateToAttachments = { onNavigateToAttachmentsId = it },
|
||||
viewModel = viewModel,
|
||||
permissionsManager = fakePermissionManager,
|
||||
)
|
||||
@@ -120,6 +120,13 @@ class VaultAddEditScreenTest : BaseComposeTest() {
|
||||
assertEquals(GeneratorMode.Modal.Password, onNavigateToGeneratorModalType)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `on NavigateToAttachments event should invoke onNavigateToAttachments`() {
|
||||
val cipherId = "cipherId-1234"
|
||||
mutableEventFlow.tryEmit(VaultAddEditEvent.NavigateToAttachments(cipherId))
|
||||
assertEquals(cipherId, onNavigateToAttachmentsId)
|
||||
}
|
||||
|
||||
@Suppress("MaxLineLength")
|
||||
@Test
|
||||
fun `on NavigateToGeneratorModal event in username mode should invoke NavigateToGeneratorModal with Username Generator Mode `() {
|
||||
|
||||
+21
-1
@@ -161,6 +161,25 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `AttachmentsClick should emit NavigateToAttachments`() = runTest {
|
||||
val vaultAddEditType = VaultAddEditType.EditItem(DEFAULT_EDIT_ITEM_ID)
|
||||
val initState = createVaultAddItemState(vaultAddEditType = vaultAddEditType)
|
||||
val viewModel = createAddVaultItemViewModel(
|
||||
savedStateHandle = createSavedStateHandleWithState(
|
||||
state = initState,
|
||||
vaultAddEditType = vaultAddEditType,
|
||||
),
|
||||
)
|
||||
viewModel.eventFlow.test {
|
||||
viewModel.actionChannel.trySend(VaultAddEditAction.Common.AttachmentsClick)
|
||||
assertEquals(
|
||||
VaultAddEditEvent.NavigateToAttachments(DEFAULT_EDIT_ITEM_ID),
|
||||
awaitItem(),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `in add mode, SaveClick should show dialog, and remove it once an item is saved`() =
|
||||
runTest {
|
||||
@@ -1526,7 +1545,8 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
|
||||
"TestId 1",
|
||||
"Boolean Field",
|
||||
true,
|
||||
), VaultAddEditState.Custom.BooleanField(
|
||||
),
|
||||
VaultAddEditState.Custom.BooleanField(
|
||||
"TestId 3",
|
||||
"Boolean Field",
|
||||
true,
|
||||
|
||||
+44
@@ -0,0 +1,44 @@
|
||||
package com.x8bit.bitwarden.ui.vault.feature.attachments
|
||||
|
||||
import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFlow
|
||||
import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest
|
||||
import io.mockk.every
|
||||
import io.mockk.just
|
||||
import io.mockk.mockk
|
||||
import io.mockk.runs
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import org.junit.Assert
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
|
||||
class AttachmentsScreenTest : BaseComposeTest() {
|
||||
private var onNavigateBackCalled = false
|
||||
|
||||
private val mutableStateFlow = MutableStateFlow(DEFAULT_STATE)
|
||||
private val mutableEventFlow = bufferedMutableSharedFlow<AttachmentsEvent>()
|
||||
val viewModel: AttachmentsViewModel = mockk {
|
||||
every { stateFlow } returns mutableStateFlow
|
||||
every { eventFlow } returns mutableEventFlow
|
||||
every { trySendAction(any()) } just runs
|
||||
}
|
||||
|
||||
@Before
|
||||
fun setup() {
|
||||
composeTestRule.setContent {
|
||||
AttachmentsScreen(
|
||||
viewModel = viewModel,
|
||||
onNavigateBack = { onNavigateBackCalled = true },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `NavigateBack should call onNavigateBack`() {
|
||||
mutableEventFlow.tryEmit(AttachmentsEvent.NavigateBack)
|
||||
Assert.assertTrue(onNavigateBackCalled)
|
||||
}
|
||||
}
|
||||
|
||||
private val DEFAULT_STATE: AttachmentsState = AttachmentsState(
|
||||
cipherId = "cipherId-1234",
|
||||
)
|
||||
+56
@@ -0,0 +1,56 @@
|
||||
package com.x8bit.bitwarden.ui.vault.feature.attachments
|
||||
|
||||
import androidx.lifecycle.SavedStateHandle
|
||||
import app.cash.turbine.test
|
||||
import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest
|
||||
import com.x8bit.bitwarden.ui.platform.base.util.asText
|
||||
import kotlinx.coroutines.test.runTest
|
||||
import org.junit.jupiter.api.Assertions.assertEquals
|
||||
import org.junit.jupiter.api.Test
|
||||
|
||||
class AttachmentsViewModelTest : BaseViewModelTest() {
|
||||
|
||||
@Test
|
||||
fun `initial state should be correct when state is null`() = runTest {
|
||||
val viewModel = createViewModel()
|
||||
assertEquals(DEFAULT_STATE, viewModel.stateFlow.value)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `initial state should be correct when state is set`() = runTest {
|
||||
val initialState = DEFAULT_STATE.copy(cipherId = "123456789")
|
||||
val viewModel = createViewModel(initialState)
|
||||
assertEquals(initialState, viewModel.stateFlow.value)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `BackClick should emit NavigateBack`() = runTest {
|
||||
val viewModel = createViewModel()
|
||||
viewModel.eventFlow.test {
|
||||
viewModel.trySendAction(AttachmentsAction.BackClick)
|
||||
assertEquals(AttachmentsEvent.NavigateBack, awaitItem())
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `SaveClick should emit ShowToast`() = runTest {
|
||||
val viewModel = createViewModel()
|
||||
viewModel.eventFlow.test {
|
||||
viewModel.trySendAction(AttachmentsAction.SaveClick)
|
||||
assertEquals(AttachmentsEvent.ShowToast("Not Yet Implemented".asText()), awaitItem())
|
||||
}
|
||||
}
|
||||
|
||||
private fun createViewModel(
|
||||
initialState: AttachmentsState? = null,
|
||||
): AttachmentsViewModel = AttachmentsViewModel(
|
||||
savedStateHandle = SavedStateHandle().apply {
|
||||
set("state", initialState)
|
||||
set("cipher_id", initialState?.cipherId ?: "cipherId-1234")
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
private val DEFAULT_STATE: AttachmentsState = AttachmentsState(
|
||||
cipherId = "cipherId-1234",
|
||||
)
|
||||
@@ -57,6 +57,7 @@ class VaultItemScreenTest : BaseComposeTest() {
|
||||
private var onNavigateBackCalled = false
|
||||
private var onNavigateToVaultEditItemId: String? = null
|
||||
private var onNavigateToMoveToOrganizationItemId: String? = null
|
||||
private var onNavigateToAttachmentsId: String? = null
|
||||
|
||||
private val intentManager = mockk<IntentManager>()
|
||||
|
||||
@@ -75,6 +76,7 @@ class VaultItemScreenTest : BaseComposeTest() {
|
||||
onNavigateBack = { onNavigateBackCalled = true },
|
||||
onNavigateToVaultAddEditItem = { id, _ -> onNavigateToVaultEditItemId = id },
|
||||
onNavigateToMoveToOrganization = { onNavigateToMoveToOrganizationItemId = it },
|
||||
onNavigateToAttachments = { onNavigateToAttachmentsId = it },
|
||||
intentManager = intentManager,
|
||||
)
|
||||
}
|
||||
@@ -95,6 +97,13 @@ class VaultItemScreenTest : BaseComposeTest() {
|
||||
assertEquals(id, onNavigateToMoveToOrganizationItemId)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `NavigateToMoveToOrganization event should invoke onNavigateToAttachments`() {
|
||||
val id = "id1234"
|
||||
mutableEventFlow.tryEmit(VaultItemEvent.NavigateToAttachments(itemId = id))
|
||||
assertEquals(id, onNavigateToAttachmentsId)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `on close click should send CloseClick`() {
|
||||
composeTestRule.onNodeWithContentDescription(label = "Close").performClick()
|
||||
|
||||
Reference in New Issue
Block a user