BIT-965: Navigation for vault item listing screen (#336)

This commit is contained in:
Ramsey Smith
2024-06-20 17:08:07 +01:00
committed by Álison Fernandes
parent 1560241a13
commit b4df58d630
12 changed files with 356 additions and 91 deletions
@@ -69,6 +69,9 @@ class FakeNavHostController : NavHostController(context = mockk()) {
mockk<NavGraph>().apply {
every { id } returns graphId
every { startDestinationId } returns graphId
every {
findNode(graphId)
} returns mockk { every { id } returns graphId }
}
override var graph: NavGraph
@@ -64,11 +64,11 @@ class VaultUnlockedNavBarScreenTest : BaseComposeTest() {
onNavigateToDeleteAccount = {},
)
}
runOnIdle { fakeNavHostController.assertCurrentRoute("vault") }
runOnIdle { fakeNavHostController.assertCurrentRoute("vault_graph") }
vaultUnlockedNavBarEventFlow.tryEmit(VaultUnlockedNavBarEvent.NavigateToVaultScreen)
runOnIdle {
fakeNavHostController.assertLastNavigation(
route = "vault",
route = "vault_graph",
navOptions = expectedNavOptions,
)
}
@@ -115,7 +115,7 @@ class VaultUnlockedNavBarScreenTest : BaseComposeTest() {
onNavigateToDeleteAccount = {},
)
}
runOnIdle { fakeNavHostController.assertCurrentRoute("vault") }
runOnIdle { fakeNavHostController.assertCurrentRoute("vault_graph") }
vaultUnlockedNavBarEventFlow.tryEmit(VaultUnlockedNavBarEvent.NavigateToSendScreen)
runOnIdle {
fakeNavHostController.assertLastNavigation(
@@ -166,7 +166,7 @@ class VaultUnlockedNavBarScreenTest : BaseComposeTest() {
onNavigateToDeleteAccount = {},
)
}
runOnIdle { fakeNavHostController.assertCurrentRoute("vault") }
runOnIdle { fakeNavHostController.assertCurrentRoute("vault_graph") }
vaultUnlockedNavBarEventFlow.tryEmit(VaultUnlockedNavBarEvent.NavigateToGeneratorScreen)
runOnIdle {
fakeNavHostController.assertLastNavigation(
@@ -217,7 +217,7 @@ class VaultUnlockedNavBarScreenTest : BaseComposeTest() {
onNavigateToDeleteAccount = {},
)
}
runOnIdle { fakeNavHostController.assertCurrentRoute("vault") }
runOnIdle { fakeNavHostController.assertCurrentRoute("vault_graph") }
vaultUnlockedNavBarEventFlow.tryEmit(VaultUnlockedNavBarEvent.NavigateToSettingsScreen)
runOnIdle {
fakeNavHostController.assertLastNavigation(
@@ -13,6 +13,7 @@ import androidx.compose.ui.test.performScrollToNode
import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary
import com.x8bit.bitwarden.ui.vault.model.VaultItemListingType
import io.mockk.every
import io.mockk.mockk
import io.mockk.verify
@@ -31,6 +32,7 @@ class VaultScreenTest : BaseComposeTest() {
private var onNavigateToVaultAddItemScreenCalled = false
private var onNavigateToVaultItemId: String? = null
private var onNavigateToVaultEditItemId: String? = null
private var onNavigateToVaultItemListingType: VaultItemListingType? = null
private var onDimBottomNavBarRequestCalled = false
private val mutableEventFlow = MutableSharedFlow<VaultEvent>(
@@ -50,6 +52,7 @@ class VaultScreenTest : BaseComposeTest() {
onNavigateToVaultAddItemScreen = { onNavigateToVaultAddItemScreenCalled = true },
onNavigateToVaultItemScreen = { onNavigateToVaultItemId = it },
onNavigateToVaultEditItemScreen = { onNavigateToVaultEditItemId = it },
onNavigateToVaultItemListingScreen = { onNavigateToVaultItemListingType = it },
onDimBottomNavBarRequest = { onDimBottomNavBarRequestCalled = true },
)
}
@@ -134,6 +137,45 @@ class VaultScreenTest : BaseComposeTest() {
assertEquals(id, onNavigateToVaultEditItemId)
}
@Test
fun `NavigateNavigateToCardGroup event should call onNavigateToVaultItemListingType`() {
mutableEventFlow.tryEmit(VaultEvent.NavigateToItemListing(VaultItemListingType.Card))
assertEquals(VaultItemListingType.Card, onNavigateToVaultItemListingType)
}
@Test
fun `NavigateToIdentityGroup event should call onNavigateToVaultItemListingType`() {
mutableEventFlow.tryEmit(VaultEvent.NavigateToItemListing(VaultItemListingType.Identity))
assertEquals(VaultItemListingType.Identity, onNavigateToVaultItemListingType)
}
@Test
fun `NavigateToLoginGroup event should call onNavigateToVaultItemListingType`() {
mutableEventFlow.tryEmit(VaultEvent.NavigateToItemListing(VaultItemListingType.Login))
assertEquals(VaultItemListingType.Login, onNavigateToVaultItemListingType)
}
@Test
fun `NavigateToSecureNotesGroup event should call onNavigateToVaultItemListingType`() {
mutableEventFlow.tryEmit(VaultEvent.NavigateToItemListing(VaultItemListingType.SecureNote))
assertEquals(VaultItemListingType.SecureNote, onNavigateToVaultItemListingType)
}
@Test
fun `NavigateToTrash event should call onNavigateToVaultItemListingType`() {
mutableEventFlow.tryEmit(VaultEvent.NavigateToItemListing(VaultItemListingType.Trash))
assertEquals(VaultItemListingType.Trash, onNavigateToVaultItemListingType)
}
@Test
fun `NavigateToFolder event should call onNavigateToVaultItemListingType`() {
val mockFolderId = "mockFolderId"
mutableEventFlow.tryEmit(
VaultEvent.NavigateToItemListing(VaultItemListingType.Folder(mockFolderId)),
)
assertEquals(VaultItemListingType.Folder(mockFolderId), onNavigateToVaultItemListingType)
}
@Test
fun `clicking a favorite item should send VaultItemClick with the correct item`() {
val itemText = "Test Item"
@@ -13,6 +13,7 @@ import com.x8bit.bitwarden.data.vault.repository.model.VaultData
import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary
import com.x8bit.bitwarden.ui.vault.model.VaultItemListingType
import io.mockk.every
import io.mockk.just
import io.mockk.mockk
@@ -345,7 +346,10 @@ class VaultViewModelTest : BaseViewModelTest() {
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(VaultAction.CardGroupClick)
assertEquals(VaultEvent.NavigateToCardGroup, awaitItem())
assertEquals(
VaultEvent.NavigateToItemListing(VaultItemListingType.Card),
awaitItem(),
)
}
}
@@ -358,7 +362,10 @@ class VaultViewModelTest : BaseViewModelTest() {
}
viewModel.eventFlow.test {
viewModel.trySendAction(VaultAction.FolderClick(folder))
assertEquals(VaultEvent.NavigateToFolder(folderId), awaitItem())
assertEquals(
VaultEvent.NavigateToItemListing(VaultItemListingType.Folder(folderId)),
awaitItem(),
)
}
}
@@ -367,7 +374,10 @@ class VaultViewModelTest : BaseViewModelTest() {
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(VaultAction.IdentityGroupClick)
assertEquals(VaultEvent.NavigateToIdentityGroup, awaitItem())
assertEquals(
VaultEvent.NavigateToItemListing(VaultItemListingType.Identity),
awaitItem(),
)
}
}
@@ -376,7 +386,10 @@ class VaultViewModelTest : BaseViewModelTest() {
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(VaultAction.LoginGroupClick)
assertEquals(VaultEvent.NavigateToLoginGroup, awaitItem())
assertEquals(
VaultEvent.NavigateToItemListing(VaultItemListingType.Login),
awaitItem(),
)
}
}
@@ -394,7 +407,10 @@ class VaultViewModelTest : BaseViewModelTest() {
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(VaultAction.SecureNoteGroupClick)
assertEquals(VaultEvent.NavigateToSecureNotesGroup, awaitItem())
assertEquals(
VaultEvent.NavigateToItemListing(VaultItemListingType.SecureNote),
awaitItem(),
)
}
}
@@ -403,7 +419,10 @@ class VaultViewModelTest : BaseViewModelTest() {
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(VaultAction.TrashClick)
assertEquals(VaultEvent.NavigateToTrash, awaitItem())
assertEquals(
VaultEvent.NavigateToItemListing(VaultItemListingType.Trash),
awaitItem(),
)
}
}