mirror of
https://github.com/bitwarden/android.git
synced 2026-11-19 17:40:12 -06:00
BIT-972 Add the import url (#903)
This commit is contained in:
committed by
Álison Fernandes
parent
7b32e46d37
commit
77913805ab
+23
@@ -236,6 +236,29 @@ class EnvironmentUrlsDataJsonExtensionsTest {
|
||||
.baseIconUrl,
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `toBaseWebVaultImportUrl should return correct url if webVault is empty`() {
|
||||
val expectedUrl = "base/#/tools/import"
|
||||
|
||||
assertEquals(
|
||||
expectedUrl,
|
||||
DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA.copy(
|
||||
webVault = null,
|
||||
)
|
||||
.toBaseWebVaultImportUrl,
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `toBaseWebVaultImportUrl should correctly convert to the import url`() {
|
||||
val expectedUrl = "webVault/#/tools/import"
|
||||
|
||||
assertEquals(
|
||||
expectedUrl,
|
||||
DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA.toBaseWebVaultImportUrl,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private val DEFAULT_CUSTOM_ENVIRONMENT_URL_DATA = EnvironmentUrlDataJson(
|
||||
|
||||
+21
-1
@@ -7,8 +7,10 @@ import androidx.compose.ui.test.isDialog
|
||||
import androidx.compose.ui.test.onNodeWithContentDescription
|
||||
import androidx.compose.ui.test.onNodeWithText
|
||||
import androidx.compose.ui.test.performClick
|
||||
import androidx.core.net.toUri
|
||||
import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFlow
|
||||
import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest
|
||||
import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import io.mockk.verify
|
||||
@@ -23,7 +25,15 @@ class VaultSettingsScreenTest : BaseComposeTest() {
|
||||
private var onNavigateToExportVaultCalled = false
|
||||
private var onNavigateToFoldersCalled = false
|
||||
private val mutableEventFlow = bufferedMutableSharedFlow<VaultSettingsEvent>()
|
||||
private val mutableStateFlow = MutableStateFlow(Unit)
|
||||
private val mutableStateFlow = MutableStateFlow(
|
||||
VaultSettingsState(
|
||||
baseUrl = "testUrl", importUrl = "testUrl/#/tools/import",
|
||||
),
|
||||
)
|
||||
private val intentManager: IntentManager = mockk(relaxed = true) {
|
||||
every { launchUri(any()) } returns Unit
|
||||
}
|
||||
|
||||
val viewModel = mockk<VaultSettingsViewModel>(relaxed = true) {
|
||||
every { eventFlow } returns mutableEventFlow
|
||||
every { stateFlow } returns mutableStateFlow
|
||||
@@ -37,6 +47,7 @@ class VaultSettingsScreenTest : BaseComposeTest() {
|
||||
onNavigateBack = { onNavigateBackCalled = true },
|
||||
onNavigateToExportVault = { onNavigateToExportVaultCalled = true },
|
||||
onNavigateToFolders = { onNavigateToFoldersCalled = true },
|
||||
intentManager = intentManager,
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -101,4 +112,13 @@ class VaultSettingsScreenTest : BaseComposeTest() {
|
||||
mutableEventFlow.tryEmit(VaultSettingsEvent.NavigateToFolders)
|
||||
assertTrue(onNavigateToFoldersCalled)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `on NavigateToImportVault should invoke IntentManager`() {
|
||||
val testUrl = "testUrl"
|
||||
mutableEventFlow.tryEmit(VaultSettingsEvent.NavigateToImportVault(testUrl))
|
||||
verify {
|
||||
intentManager.launchUri(testUrl.toUri())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+8
-3
@@ -1,12 +1,14 @@
|
||||
package com.x8bit.bitwarden.ui.platform.feature.settings.vault
|
||||
|
||||
import app.cash.turbine.test
|
||||
import com.x8bit.bitwarden.data.platform.repository.util.FakeEnvironmentRepository
|
||||
import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest
|
||||
import kotlinx.coroutines.test.runTest
|
||||
import org.junit.jupiter.api.Assertions.assertEquals
|
||||
import org.junit.jupiter.api.Test
|
||||
|
||||
class VaultSettingsViewModelTest : BaseViewModelTest() {
|
||||
private val environmentRepository = FakeEnvironmentRepository()
|
||||
|
||||
@Test
|
||||
fun `BackClick should emit NavigateBack`() = runTest {
|
||||
@@ -30,16 +32,19 @@ class VaultSettingsViewModelTest : BaseViewModelTest() {
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `ImportItemsClick should emit ShowToast`() = runTest {
|
||||
fun `ImportItemsClick should emit send NavigateToImportVault with correct url`() = runTest {
|
||||
val viewModel = createViewModel()
|
||||
val expected = "https://vault.bitwarden.com/#/tools/import"
|
||||
viewModel.eventFlow.test {
|
||||
viewModel.trySendAction(VaultSettingsAction.ImportItemsClick)
|
||||
assertEquals(
|
||||
VaultSettingsEvent.ShowToast("Not yet implemented."),
|
||||
VaultSettingsEvent.NavigateToImportVault(expected),
|
||||
awaitItem(),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private fun createViewModel(): VaultSettingsViewModel = VaultSettingsViewModel()
|
||||
private fun createViewModel(): VaultSettingsViewModel = VaultSettingsViewModel(
|
||||
environmentRepository = environmentRepository,
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user