BIT-479 Implement new send UI (#215)

This commit is contained in:
Andrew Haisting
2024-06-20 17:08:07 +01:00
committed by Álison Fernandes
parent a9295ff981
commit aeb5ff3734
21 changed files with 1447 additions and 14 deletions
@@ -33,6 +33,7 @@ class VaultUnlockedNavBarScreenTest : BaseComposeTest() {
viewModel = viewModel,
navController = fakeNavHostController,
onNavigateToVaultAddItem = {},
onNavigateToNewSend = {},
)
}
onNodeWithText("My vault").performClick()
@@ -54,6 +55,7 @@ class VaultUnlockedNavBarScreenTest : BaseComposeTest() {
viewModel = viewModel,
navController = fakeNavHostController,
onNavigateToVaultAddItem = {},
onNavigateToNewSend = {},
)
}
runOnIdle { fakeNavHostController.assertCurrentRoute("vault") }
@@ -76,6 +78,7 @@ class VaultUnlockedNavBarScreenTest : BaseComposeTest() {
viewModel = viewModel,
navController = fakeNavHostController,
onNavigateToVaultAddItem = {},
onNavigateToNewSend = {},
)
}
onNodeWithText("Send").performClick()
@@ -97,6 +100,7 @@ class VaultUnlockedNavBarScreenTest : BaseComposeTest() {
viewModel = viewModel,
navController = fakeNavHostController,
onNavigateToVaultAddItem = {},
onNavigateToNewSend = {},
)
}
runOnIdle { fakeNavHostController.assertCurrentRoute("vault") }
@@ -119,6 +123,7 @@ class VaultUnlockedNavBarScreenTest : BaseComposeTest() {
viewModel = viewModel,
navController = fakeNavHostController,
onNavigateToVaultAddItem = {},
onNavigateToNewSend = {},
)
}
onNodeWithText("Generator").performClick()
@@ -140,6 +145,7 @@ class VaultUnlockedNavBarScreenTest : BaseComposeTest() {
viewModel = viewModel,
navController = fakeNavHostController,
onNavigateToVaultAddItem = {},
onNavigateToNewSend = {},
)
}
runOnIdle { fakeNavHostController.assertCurrentRoute("vault") }
@@ -162,6 +168,7 @@ class VaultUnlockedNavBarScreenTest : BaseComposeTest() {
viewModel = viewModel,
navController = fakeNavHostController,
onNavigateToVaultAddItem = {},
onNavigateToNewSend = {},
)
}
onNodeWithText("Settings").performClick()
@@ -183,6 +190,7 @@ class VaultUnlockedNavBarScreenTest : BaseComposeTest() {
viewModel = viewModel,
navController = fakeNavHostController,
onNavigateToVaultAddItem = {},
onNavigateToNewSend = {},
)
}
runOnIdle { fakeNavHostController.assertCurrentRoute("vault") }
@@ -0,0 +1,422 @@
package com.x8bit.bitwarden.ui.tools.feature.send
import androidx.compose.ui.test.assertIsOff
import androidx.compose.ui.test.assertIsOn
import androidx.compose.ui.test.assertTextEquals
import androidx.compose.ui.test.filterToOne
import androidx.compose.ui.test.hasSetTextAction
import androidx.compose.ui.test.onAllNodesWithText
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performScrollTo
import androidx.compose.ui.test.performTextInput
import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest
import io.mockk.every
import io.mockk.mockk
import io.mockk.verify
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.test.runTest
import org.junit.Before
import org.junit.Test
class NewSendScreenTest : BaseComposeTest() {
private var onNavigateBackCalled = false
private val mutableEventFlow = MutableSharedFlow<NewSendEvent>(
extraBufferCapacity = Int.MAX_VALUE,
)
private val mutableStateFlow = MutableStateFlow(DEFAULT_STATE)
private val viewModel = mockk<NewSendViewModel>(relaxed = true) {
every { eventFlow } returns mutableEventFlow
every { stateFlow } returns mutableStateFlow
}
@Before
fun setUp() {
composeTestRule.setContent {
NewSendScreen(
viewModel = viewModel,
onNavigateBack = { onNavigateBackCalled = true },
)
}
}
@Test
fun `on NavigateBack should call onNavigateBack`() {
mutableEventFlow.tryEmit(NewSendEvent.NavigateBack)
assert(onNavigateBackCalled)
}
@Test
fun `on close icon click should send CloseClick`() {
composeTestRule
.onNodeWithContentDescription("Close")
.performClick()
verify { viewModel.trySendAction(NewSendAction.CloseClick) }
}
@Test
fun `on save click should send SaveClick`() {
composeTestRule
.onNodeWithText("Save")
.performClick()
verify { viewModel.trySendAction(NewSendAction.SaveClick) }
}
@Test
fun `on name input change should send NameChange`() {
composeTestRule
.onNodeWithText("Name")
.performTextInput("input")
verify { viewModel.trySendAction(NewSendAction.NameChange("input")) }
}
@Test
fun `name input should change according to the state`() {
composeTestRule
.onNodeWithText("Name")
.assertTextEquals("Name", "")
mutableStateFlow.update {
it.copy(name = "input")
}
composeTestRule
.onNodeWithText("Name")
.assertTextEquals("Name", "input")
}
@Test
fun `File segmented button click should send FileTypeClick`() {
composeTestRule
.onNodeWithText("File")
.performClick()
verify { viewModel.trySendAction(NewSendAction.FileTypeClick) }
}
@Test
fun `Text segmented button click should send TextTypeClick`() {
composeTestRule
.onAllNodesWithText("Text")[0]
.performClick()
verify { viewModel.trySendAction(NewSendAction.TextTypeClick) }
}
@Test
fun `Choose file button click should send ChooseFileClick`() {
mutableStateFlow.value = DEFAULT_STATE.copy(
selectedType = NewSendState.SendType.File,
)
composeTestRule
.onNodeWithText("Choose file")
.performScrollTo()
.performClick()
verify { viewModel.trySendAction(NewSendAction.ChooseFileClick) }
}
@Test
fun `text input change should send TextChange`() {
composeTestRule
.onAllNodesWithText("Text")[1]
.performTextInput("input")
viewModel.trySendAction(NewSendAction.TextChange("input"))
}
@Test
fun `text input should change according to the state`() {
composeTestRule
.onAllNodesWithText("Text")
.filterToOne(hasSetTextAction())
.assertTextEquals("Text", "")
mutableStateFlow.update {
it.copy(
selectedType = NewSendState.SendType.Text(
input = "input",
isHideByDefaultChecked = false,
),
)
}
composeTestRule
.onAllNodesWithText("Text")
.filterToOne(hasSetTextAction())
.assertTextEquals("Text", "input")
}
@Test
fun `hide by default toggle should send HideByDefaultToggle`() {
composeTestRule
.onNodeWithText(text = "When accessing the Send", substring = true)
.performClick()
viewModel.trySendAction(NewSendAction.HideByDefaultToggle(true))
}
@Test
fun `hide text toggle should change according to the state`() {
composeTestRule
.onNodeWithText("When accessing the Send,", substring = true)
.assertIsOff()
mutableStateFlow.update {
it.copy(
selectedType = NewSendState.SendType.Text(
input = "",
isHideByDefaultChecked = true,
),
)
}
composeTestRule
.onNodeWithText("When accessing the Send,", substring = true)
.assertIsOn()
}
@Test
fun `options sections should start hidden and show after options clicked`() {
composeTestRule
.onNodeWithText("Deletion date")
.assertDoesNotExist()
composeTestRule
.onNodeWithText("Maximum access count")
.assertDoesNotExist()
composeTestRule
.onNodeWithText("New password")
.assertDoesNotExist()
composeTestRule
.onNodeWithText("Notes")
.assertDoesNotExist()
composeTestRule
.onNodeWithText("Hide my email address from recipients")
.assertDoesNotExist()
composeTestRule
.onNodeWithText("Deactivate this Send", substring = true)
.assertDoesNotExist()
composeTestRule
.onNodeWithText("Options")
.performScrollTo()
.performClick()
composeTestRule
.onNodeWithText("Deletion date", useUnmergedTree = true)
.assertExists()
composeTestRule
.onNodeWithText("Maximum access count")
.assertExists()
composeTestRule
.onNodeWithText("New password")
.assertExists()
composeTestRule
.onNodeWithText("Notes")
.assertExists()
composeTestRule
.onNodeWithText("Hide my email address from recipients")
.assertExists()
composeTestRule
.onNodeWithText("Deactivate this Send", substring = true)
.assertExists()
}
@Test
fun `max access count decrement should be disabled when max access count is null`() = runTest {
// Expand options section:
composeTestRule
.onNodeWithText("Options")
.performScrollTo()
.performClick()
composeTestRule
.onNodeWithContentDescription("\u2212")
.performScrollTo()
.performClick()
}
@Test
fun `max access count decrement should send MaxAccessCountChange`() = runTest {
mutableStateFlow.update {
it.copy(maxAccessCount = 3)
}
// Expand options section:
composeTestRule
.onNodeWithText("Options")
.performScrollTo()
.performClick()
composeTestRule
.onNodeWithContentDescription("\u2212")
.performScrollTo()
.performClick()
verify { viewModel.trySendAction(NewSendAction.MaxAccessCountChange(2)) }
}
@Test
fun `on max access count increment should send MaxAccessCountChange`() = runTest {
// Expand options section:
composeTestRule
.onNodeWithText("Options")
.performScrollTo()
.performClick()
composeTestRule
.onNodeWithContentDescription("+")
.performScrollTo()
.performClick()
verify { viewModel.trySendAction(NewSendAction.MaxAccessCountChange(1)) }
}
@Test
fun `on password input change should send PasswordChange`() = runTest {
// Expand options section:
composeTestRule
.onNodeWithText("Options")
.performScrollTo()
.performClick()
composeTestRule
.onNodeWithText("New password")
.performTextInput("input")
verify { viewModel.trySendAction(NewSendAction.PasswordChange("input")) }
}
@Test
fun `password input should change according to the state`() {
// Expand options section:
composeTestRule
.onNodeWithText("Options")
.performScrollTo()
.performClick()
composeTestRule
.onNodeWithText("New password")
.assertTextEquals("New password", "")
mutableStateFlow.update {
it.copy(
passwordInput = "input",
)
}
composeTestRule
.onNodeWithText("New password")
.assertTextEquals("New password", "•••••")
}
@Test
fun `on notes input change should send NoteChange`() = runTest {
// Expand options section:
composeTestRule
.onNodeWithText("Options")
.performScrollTo()
.performClick()
composeTestRule
.onNodeWithText("Notes")
.performTextInput("input")
verify { viewModel.trySendAction(NewSendAction.NoteChange("input")) }
}
@Test
fun `note input should change according to the state`() {
// Expand options section:
composeTestRule
.onNodeWithText("Options")
.performScrollTo()
.performClick()
composeTestRule
.onNodeWithText("Notes")
.assertTextEquals("Notes", "")
mutableStateFlow.update {
it.copy(
noteInput = "input",
)
}
composeTestRule
.onNodeWithText("Notes")
.assertTextEquals("Notes", "input")
}
@Test
fun `on hide email toggle should send HideMyEmailToggle`() = runTest {
// Expand options section:
composeTestRule
.onNodeWithText("Options")
.performScrollTo()
.performClick()
composeTestRule
.onNodeWithText("Hide my email address", substring = true)
.performScrollTo()
.performClick()
verify { viewModel.trySendAction(NewSendAction.HideMyEmailToggle(true)) }
}
@Test
fun `hide email toggle should change according to the state`() {
// Expand options section:
composeTestRule
.onNodeWithText("Options")
.performScrollTo()
.performClick()
composeTestRule
.onNodeWithText("Hide my email", substring = true)
.assertIsOff()
mutableStateFlow.update {
it.copy(
isHideEmailChecked = true,
)
}
composeTestRule
.onNodeWithText("Hide my email", substring = true)
.assertIsOn()
}
@Test
fun `on deactivate this send toggle should send DeactivateThisSendToggle`() = runTest {
// Expand options section:
composeTestRule
.onNodeWithText("Options")
.performScrollTo()
.performClick()
composeTestRule
.onNodeWithText("Deactivate this Send", substring = true)
.performScrollTo()
.performClick()
verify { viewModel.trySendAction(NewSendAction.DeactivateThisSendToggle(true)) }
}
@Test
fun `deactivate send toggle should change according to the state`() {
// Expand options section:
composeTestRule
.onNodeWithText("Options")
.performScrollTo()
.performClick()
composeTestRule
.onNodeWithText("Deactivate this Send", substring = true)
.assertIsOff()
mutableStateFlow.update {
it.copy(
isDeactivateChecked = true,
)
}
composeTestRule
.onNodeWithText("Deactivate this Send", substring = true)
.assertIsOn()
}
companion object {
private val DEFAULT_STATE = NewSendState(
name = "",
maxAccessCount = null,
passwordInput = "",
noteInput = "",
isHideEmailChecked = false,
isDeactivateChecked = false,
selectedType = NewSendState.SendType.Text(
input = "",
isHideByDefaultChecked = false,
),
)
}
}
@@ -0,0 +1,177 @@
package com.x8bit.bitwarden.ui.tools.feature.send
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest
import io.mockk.mockk
import kotlinx.coroutines.test.runTest
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
class NewSendViewModelTest : BaseViewModelTest() {
@Test
fun `initial state should be correct`() {
val viewModel = createViewModel()
assertEquals(DEFAULT_STATE, viewModel.stateFlow.value)
}
@Test
fun `initial state should read from saved state when present`() {
val savedState = mockk<NewSendState>()
val viewModel = createViewModel(
savedStateHandle = SavedStateHandle(mapOf("state" to savedState)),
)
assertEquals(savedState, viewModel.stateFlow.value)
}
@Test
fun `CloseClick should emit NavigateBack`() = runTest {
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(NewSendAction.CloseClick)
assertEquals(NewSendEvent.NavigateBack, awaitItem())
}
}
@Test
fun `SaveClick should emit ShowToast`() = runTest {
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(NewSendAction.SaveClick)
assertEquals(NewSendEvent.ShowToast("Save Not Implemented"), awaitItem())
}
}
@Test
fun `ChooseFileClick should emit ShowToast`() = runTest {
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(NewSendAction.ChooseFileClick)
assertEquals(NewSendEvent.ShowToast("Not Implemented: File Upload"), awaitItem())
}
}
@Test
fun `FileTypeClick and TextTypeClick should toggle sendType`() = runTest {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.FileTypeClick)
assertEquals(
DEFAULT_STATE.copy(selectedType = NewSendState.SendType.File),
awaitItem(),
)
viewModel.trySendAction(NewSendAction.TextTypeClick)
assertEquals(DEFAULT_STATE, awaitItem())
}
}
@Test
fun `NameChange should update name input`() = runTest {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.NameChange("input"))
assertEquals(DEFAULT_STATE.copy(name = "input"), awaitItem())
}
}
@Test
fun `MaxAccessCountChange should update maxAccessCount`() = runTest {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.MaxAccessCountChange(5))
assertEquals(DEFAULT_STATE.copy(maxAccessCount = 5), awaitItem())
}
}
@Test
fun `MaxAccessCountChang below 1 should keep maxAccessCount at 1`() = runTest {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.MaxAccessCountChange(0))
assertEquals(DEFAULT_STATE.copy(maxAccessCount = 1), awaitItem())
}
}
@Test
fun `TextChange should update text input`() = runTest {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.TextChange("input"))
assertEquals(
DEFAULT_STATE.copy(
selectedType = NewSendState.SendType.Text(
input = "input",
isHideByDefaultChecked = false,
),
), awaitItem(),
)
}
}
@Test
fun `NoteChange should update note input`() = runTest {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.NoteChange("input"))
assertEquals(DEFAULT_STATE.copy(noteInput = "input"), awaitItem())
}
}
@Test
fun `PasswordChange should update note input`() = runTest {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.PasswordChange("input"))
assertEquals(DEFAULT_STATE.copy(passwordInput = "input"), awaitItem())
}
}
@Test
fun `DeactivateThisSendToggle should update isDeactivateChecked`() = runTest {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.DeactivateThisSendToggle(true))
assertEquals(DEFAULT_STATE.copy(isDeactivateChecked = true), awaitItem())
}
}
@Test
fun `HideMyEmailToggle should update isHideEmailChecked`() = runTest {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.HideMyEmailToggle(true))
assertEquals(DEFAULT_STATE.copy(isHideEmailChecked = true), awaitItem())
}
}
private fun createViewModel(
savedStateHandle: SavedStateHandle = SavedStateHandle(),
): NewSendViewModel = NewSendViewModel(
savedStateHandle = savedStateHandle,
)
companion object {
private val DEFAULT_STATE = NewSendState(
name = "",
maxAccessCount = null,
passwordInput = "",
noteInput = "",
isHideEmailChecked = false,
isDeactivateChecked = false,
selectedType = NewSendState.SendType.Text(
input = "",
isHideByDefaultChecked = false,
),
)
}
}
@@ -14,6 +14,7 @@ import org.junit.Test
class SendScreenTest : BaseComposeTest() {
private var onNavigateToNewSendCalled = false
private val mutableEventFlow = MutableSharedFlow<SendEvent>(
extraBufferCapacity = Int.MAX_VALUE,
)
@@ -28,6 +29,7 @@ class SendScreenTest : BaseComposeTest() {
composeTestRule.setContent {
SendScreen(
viewModel = viewModel,
onNavigateNewSend = { onNavigateToNewSendCalled = true },
)
}
}
@@ -55,6 +57,12 @@ class SendScreenTest : BaseComposeTest() {
.performClick()
verify { viewModel.trySendAction(SendAction.SearchClick) }
}
@Test
fun `on NavigateToNewSend should call onNavgiateToNewSend`() {
mutableEventFlow.tryEmit(SendEvent.NavigateNewSend)
assert(onNavigateToNewSendCalled)
}
}
private val DEFAULT_STATE = SendState.Empty
@@ -26,11 +26,11 @@ class SendViewModelTest : BaseViewModelTest() {
}
@Test
fun `AddSendClick should emit ShowToast`() = runTest {
fun `AddSendClick should emit NavigateNewSend`() = runTest {
val viewModel = SendViewModel(SavedStateHandle())
viewModel.eventFlow.test {
viewModel.trySendAction(SendAction.AddSendClick)
assertEquals(SendEvent.ShowToast("New Send Not Implemented".asText()), awaitItem())
assertEquals(SendEvent.NavigateNewSend, awaitItem())
}
}