Show appropriate empty states for autofill flow (#843)

This commit is contained in:
Brian Yencho
2024-06-20 17:08:07 +01:00
committed by Álison Fernandes
parent 9a8aca9fe1
commit 82ef39e15d
8 changed files with 214 additions and 71 deletions
@@ -300,7 +300,14 @@ class VaultItemListingScreenTest : BaseComposeTest() {
@Test
fun `add an item button click should send AddItemClick action`() {
mutableStateFlow.update { it.copy(viewState = VaultItemListingState.ViewState.NoItems) }
mutableStateFlow.update {
it.copy(
viewState = VaultItemListingState.ViewState.NoItems(
message = "There are no items in your vault.".asText(),
shouldShowAddButton = true,
),
)
}
composeTestRule
.onNodeWithText("Add an Item")
.performClick()
@@ -385,7 +392,12 @@ class VaultItemListingScreenTest : BaseComposeTest() {
.assertIsDisplayed()
mutableStateFlow.update {
it.copy(viewState = VaultItemListingState.ViewState.NoItems)
it.copy(
viewState = VaultItemListingState.ViewState.NoItems(
message = "There are no items in your vault.".asText(),
shouldShowAddButton = true,
),
)
}
composeTestRule
@@ -401,7 +413,14 @@ class VaultItemListingScreenTest : BaseComposeTest() {
.onNodeWithText(message)
.assertIsNotDisplayed()
mutableStateFlow.update { it.copy(viewState = VaultItemListingState.ViewState.NoItems) }
mutableStateFlow.update {
it.copy(
viewState = VaultItemListingState.ViewState.NoItems(
message = "There are no items in your vault.".asText(),
shouldShowAddButton = true,
),
)
}
composeTestRule
.onNodeWithText(message)
.assertIsNotDisplayed()
@@ -422,23 +441,23 @@ class VaultItemListingScreenTest : BaseComposeTest() {
.assertDoesNotExist()
mutableStateFlow.update {
it.copy(viewState = VaultItemListingState.ViewState.NoItems)
it.copy(
viewState = VaultItemListingState.ViewState.NoItems(
message = "There are no items in your vault.".asText(),
shouldShowAddButton = true,
),
)
}
composeTestRule
.onNodeWithText(text = "Add an Item")
.assertIsDisplayed()
mutableStateFlow.update {
it.copy(itemListingType = VaultItemListingState.ItemListingType.Vault.Trash)
}
composeTestRule
.onNodeWithText(text = "Add an Item")
.assertDoesNotExist()
mutableStateFlow.update {
it.copy(
itemListingType = VaultItemListingState.ItemListingType.Vault.Folder(
folderId = null,
viewState = VaultItemListingState.ViewState.NoItems(
message = "There are no items in your vault.".asText(),
shouldShowAddButton = false,
),
)
}
@@ -449,29 +468,16 @@ class VaultItemListingScreenTest : BaseComposeTest() {
@Test
fun `empty text should be displayed according to state`() {
mutableStateFlow.update {
DEFAULT_STATE.copy(viewState = VaultItemListingState.ViewState.NoItems)
}
composeTestRule
.onNodeWithText(text = "There are no items in your vault.")
.assertIsDisplayed()
mutableStateFlow.update {
it.copy(itemListingType = VaultItemListingState.ItemListingType.Vault.Trash)
}
composeTestRule
.onNodeWithText(text = "There are no items in the trash.")
.assertIsDisplayed()
mutableStateFlow.update {
it.copy(
itemListingType = VaultItemListingState.ItemListingType.Vault.Folder(
folderId = null,
viewState = VaultItemListingState.ViewState.NoItems(
message = "There are no items in your vault.".asText(),
shouldShowAddButton = true,
),
)
}
composeTestRule
.onNodeWithText(text = "There are no items in this folder.")
.onNodeWithText(text = "There are no items in your vault.")
.assertIsDisplayed()
}
@@ -621,7 +621,12 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
assertEquals(VaultItemListingEvent.DismissPullToRefresh, awaitItem())
}
assertEquals(
createVaultItemListingState(viewState = VaultItemListingState.ViewState.NoItems),
createVaultItemListingState(
viewState = VaultItemListingState.ViewState.NoItems(
message = R.string.no_items.asText(),
shouldShowAddButton = true,
),
),
viewModel.stateFlow.value,
)
}
@@ -645,7 +650,10 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
}
assertEquals(
createVaultItemListingState(
viewState = VaultItemListingState.ViewState.NoItems,
viewState = VaultItemListingState.ViewState.NoItems(
message = R.string.no_items.asText(),
shouldShowAddButton = true,
),
),
viewModel.stateFlow.value,
)
@@ -708,7 +716,12 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
val viewModel = createVaultItemListingViewModel()
assertEquals(
createVaultItemListingState(viewState = VaultItemListingState.ViewState.NoItems),
createVaultItemListingState(
viewState = VaultItemListingState.ViewState.NoItems(
message = R.string.no_items.asText(),
shouldShowAddButton = true,
),
),
viewModel.stateFlow.value,
)
}
@@ -729,7 +742,12 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
val viewModel = createVaultItemListingViewModel()
assertEquals(
createVaultItemListingState(viewState = VaultItemListingState.ViewState.NoItems),
createVaultItemListingState(
viewState = VaultItemListingState.ViewState.NoItems(
message = R.string.no_items.asText(),
shouldShowAddButton = true,
),
),
viewModel.stateFlow.value,
)
}
@@ -810,7 +828,10 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
}
assertEquals(
createVaultItemListingState(
viewState = VaultItemListingState.ViewState.NoItems,
viewState = VaultItemListingState.ViewState.NoItems(
message = R.string.no_items.asText(),
shouldShowAddButton = true,
),
),
viewModel.stateFlow.value,
)
@@ -836,7 +857,10 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
}
assertEquals(
createVaultItemListingState(
viewState = VaultItemListingState.ViewState.NoItems,
viewState = VaultItemListingState.ViewState.NoItems(
message = R.string.no_items.asText(),
shouldShowAddButton = true,
),
),
viewModel.stateFlow.value,
)
@@ -916,7 +940,10 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
}
assertEquals(
createVaultItemListingState(
viewState = VaultItemListingState.ViewState.NoItems,
viewState = VaultItemListingState.ViewState.NoItems(
message = R.string.no_items.asText(),
shouldShowAddButton = true,
),
),
viewModel.stateFlow.value,
)
@@ -941,7 +968,10 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
}
assertEquals(
createVaultItemListingState(
viewState = VaultItemListingState.ViewState.NoItems,
viewState = VaultItemListingState.ViewState.NoItems(
message = R.string.no_items.asText(),
shouldShowAddButton = true,
),
),
viewModel.stateFlow.value,
)
@@ -4,6 +4,8 @@ import android.net.Uri
import com.bitwarden.core.CipherType
import com.bitwarden.core.CipherView
import com.bitwarden.core.SendType
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData
import com.x8bit.bitwarden.data.platform.repository.model.Environment
import com.x8bit.bitwarden.data.platform.repository.util.baseIconUrl
import com.x8bit.bitwarden.data.platform.repository.util.baseWebSendUrl
@@ -12,13 +14,15 @@ import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCollectionView
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockFolderView
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSendView
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.vault.feature.itemlisting.VaultItemListingState
import io.mockk.every
import io.mockk.mockk
import io.mockk.mockkStatic
import io.mockk.unmockkStatic
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import java.time.Clock
import java.time.Instant
import java.time.ZoneOffset
@@ -30,6 +34,12 @@ class VaultItemListingDataExtensionsTest {
ZoneOffset.UTC,
)
@AfterEach
fun tearDown() {
unmockkStatic(Uri::class)
unmockkStatic(CipherView::subtitle)
}
@Test
@Suppress("MaxLineLength")
fun `determineListingPredicate should return the correct predicate for non trash Login cipherView`() {
@@ -333,8 +343,10 @@ class VaultItemListingDataExtensionsTest {
)
val result = cipherViewList.toViewState(
itemListingType = VaultItemListingState.ItemListingType.Vault.Login,
isIconLoadingDisabled = false,
baseIconUrl = Environment.Us.environmentUrlData.baseIconUrl,
autofillSelectionData = null,
)
assertEquals(
@@ -364,9 +376,73 @@ class VaultItemListingDataExtensionsTest {
),
result,
)
}
unmockkStatic(CipherView::subtitle)
unmockkStatic(Uri::class)
@Suppress("MaxLineLength")
@Test
fun `toViewState should transform an empty list of CipherViews into a NoItems ViewState with the appropriate data`() {
val cipherViewList = emptyList<CipherView>()
// Trash
assertEquals(
VaultItemListingState.ViewState.NoItems(
message = R.string.no_items_trash.asText(),
shouldShowAddButton = false,
),
cipherViewList.toViewState(
itemListingType = VaultItemListingState.ItemListingType.Vault.Trash,
isIconLoadingDisabled = false,
baseIconUrl = Environment.Us.environmentUrlData.baseIconUrl,
autofillSelectionData = null,
),
)
// Folders
assertEquals(
VaultItemListingState.ViewState.NoItems(
message = R.string.no_items_folder.asText(),
shouldShowAddButton = false,
),
cipherViewList.toViewState(
itemListingType = VaultItemListingState.ItemListingType.Vault.Folder(
folderId = "folderId",
),
isIconLoadingDisabled = false,
baseIconUrl = Environment.Us.environmentUrlData.baseIconUrl,
autofillSelectionData = null,
),
)
// Other ciphers
assertEquals(
VaultItemListingState.ViewState.NoItems(
message = R.string.no_items.asText(),
shouldShowAddButton = true,
),
cipherViewList.toViewState(
itemListingType = VaultItemListingState.ItemListingType.Vault.Login,
isIconLoadingDisabled = false,
baseIconUrl = Environment.Us.environmentUrlData.baseIconUrl,
autofillSelectionData = null,
),
)
// Autofill
assertEquals(
VaultItemListingState.ViewState.NoItems(
message = R.string.no_items_for_uri.asText("www.test.com"),
shouldShowAddButton = true,
),
cipherViewList.toViewState(
itemListingType = VaultItemListingState.ItemListingType.Vault.Login,
isIconLoadingDisabled = false,
baseIconUrl = Environment.Us.environmentUrlData.baseIconUrl,
autofillSelectionData = AutofillSelectionData(
type = AutofillSelectionData.Type.LOGIN,
uri = "https://www.test.com",
),
),
)
}
@Test