mirror of
https://github.com/bitwarden/android.git
synced 2026-11-19 17:40:12 -06:00
Add the Delete Send API (#584)
This commit is contained in:
committed by
Álison Fernandes
parent
e6c20e0e88
commit
ee688b79e7
+12
@@ -149,6 +149,18 @@ class VaultDiskSourceTest {
|
||||
assertJsonEquals(SEND_ENTITY.sendJson, storedSendEntity.sendJson)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `DeleteSend should call deleteSend`() = runTest {
|
||||
assertFalse(sendsDao.deleteSendCalled)
|
||||
sendsDao.storedSends.add(SEND_ENTITY)
|
||||
assertEquals(1, sendsDao.storedSends.size)
|
||||
|
||||
vaultDiskSource.deleteSend(USER_ID, SEND_1.id)
|
||||
|
||||
assertTrue(sendsDao.deleteSendCalled)
|
||||
assertEquals(emptyList<SendEntity>(), sendsDao.storedSends)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `getSends should emit all SendsDao updates`() = runTest {
|
||||
val sendEntities = listOf(SEND_ENTITY)
|
||||
|
||||
@@ -10,6 +10,7 @@ class FakeSendsDao : SendsDao {
|
||||
val storedSends = mutableListOf<SendEntity>()
|
||||
|
||||
var deleteSendsCalled: Boolean = false
|
||||
var deleteSendCalled: Boolean = false
|
||||
var insertSendsCalled: Boolean = false
|
||||
|
||||
private val sendsFlow = bufferedMutableSharedFlow<List<SendEntity>>(replay = 1)
|
||||
@@ -26,6 +27,14 @@ class FakeSendsDao : SendsDao {
|
||||
return count
|
||||
}
|
||||
|
||||
override suspend fun deleteSend(userId: String, sendId: String): Int {
|
||||
deleteSendCalled = true
|
||||
val count = storedSends.count { it.userId == userId && it.id == sendId }
|
||||
storedSends.removeAll { it.userId == userId && it.id == sendId }
|
||||
sendsFlow.tryEmit(storedSends.toList())
|
||||
return count
|
||||
}
|
||||
|
||||
override fun getAllSends(userId: String): Flow<List<SendEntity>> =
|
||||
sendsFlow.map { ciphers -> ciphers.filter { it.userId == userId } }
|
||||
|
||||
|
||||
@@ -49,6 +49,7 @@ import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSendView
|
||||
import com.x8bit.bitwarden.data.vault.manager.VaultLockManager
|
||||
import com.x8bit.bitwarden.data.vault.repository.model.CreateCipherResult
|
||||
import com.x8bit.bitwarden.data.vault.repository.model.CreateSendResult
|
||||
import com.x8bit.bitwarden.data.vault.repository.model.DeleteSendResult
|
||||
import com.x8bit.bitwarden.data.vault.repository.model.RemovePasswordSendResult
|
||||
import com.x8bit.bitwarden.data.vault.repository.model.SendData
|
||||
import com.x8bit.bitwarden.data.vault.repository.model.UpdateCipherResult
|
||||
@@ -1598,7 +1599,6 @@ class VaultRepositoryTest {
|
||||
runTest {
|
||||
fakeAuthDiskSource.userState = MOCK_USER_STATE
|
||||
val sendId = "sendId1234"
|
||||
val mockSendView = createMockSendView(number = 1)
|
||||
coEvery {
|
||||
sendsService.removeSendPassword(sendId = sendId)
|
||||
} returns Throwable("Fail").asFailure()
|
||||
@@ -1651,6 +1651,34 @@ class VaultRepositoryTest {
|
||||
assertEquals(RemovePasswordSendResult.Success(mockSendView), result)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `deleteSend with sendsService deleteSend failure should return DeleteSendResult Error`() =
|
||||
runTest {
|
||||
fakeAuthDiskSource.userState = MOCK_USER_STATE
|
||||
val sendId = "mockId-1"
|
||||
coEvery {
|
||||
sendsService.deleteSend(sendId = sendId)
|
||||
} returns Throwable("Fail").asFailure()
|
||||
|
||||
val result = vaultRepository.deleteSend(sendId)
|
||||
|
||||
assertEquals(DeleteSendResult.Error, result)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `deleteSend with sendsService deleteSend success should return DeleteSendResult success`() =
|
||||
runTest {
|
||||
fakeAuthDiskSource.userState = MOCK_USER_STATE
|
||||
val userId = "mockId-1"
|
||||
val sendId = "mockId-1"
|
||||
coEvery { sendsService.deleteSend(sendId = sendId) } returns Unit.asSuccess()
|
||||
coEvery { vaultDiskSource.deleteSend(userId, sendId) } just runs
|
||||
|
||||
val result = vaultRepository.deleteSend(sendId)
|
||||
|
||||
assertEquals(DeleteSendResult.Success, result)
|
||||
}
|
||||
|
||||
//region Helper functions
|
||||
|
||||
/**
|
||||
|
||||
+58
-13
@@ -12,6 +12,7 @@ import com.x8bit.bitwarden.data.platform.repository.model.Environment
|
||||
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSendView
|
||||
import com.x8bit.bitwarden.data.vault.repository.VaultRepository
|
||||
import com.x8bit.bitwarden.data.vault.repository.model.CreateSendResult
|
||||
import com.x8bit.bitwarden.data.vault.repository.model.DeleteSendResult
|
||||
import com.x8bit.bitwarden.data.vault.repository.model.RemovePasswordSendResult
|
||||
import com.x8bit.bitwarden.data.vault.repository.model.UpdateSendResult
|
||||
import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest
|
||||
@@ -37,6 +38,7 @@ import java.time.Instant
|
||||
import java.time.ZoneOffset
|
||||
import java.time.ZonedDateTime
|
||||
|
||||
@Suppress("LargeClass")
|
||||
class AddSendViewModelTest : BaseViewModelTest() {
|
||||
|
||||
private val clock = Clock.fixed(
|
||||
@@ -279,19 +281,6 @@ class AddSendViewModelTest : BaseViewModelTest() {
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `DeleteClick should send ShowToast`() = runTest {
|
||||
val viewModel = createViewModel(
|
||||
state = DEFAULT_STATE.copy(addSendType = AddSendType.EditItem("sendId")),
|
||||
addSendType = AddSendType.EditItem("sendId"),
|
||||
)
|
||||
|
||||
viewModel.eventFlow.test {
|
||||
viewModel.trySendAction(AddSendAction.DeleteClick)
|
||||
assertEquals(AddSendEvent.ShowToast("Not yet implemented".asText()), awaitItem())
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `in add item state, RemovePasswordClick should do nothing`() = runTest {
|
||||
val viewModel = createViewModel()
|
||||
@@ -414,6 +403,62 @@ class AddSendViewModelTest : BaseViewModelTest() {
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `DeleteClick vaultRepository deleteSend Error should show error dialog`() = runTest {
|
||||
val sendId = "mockId-1"
|
||||
coEvery { vaultRepository.deleteSend(sendId) } returns DeleteSendResult.Error
|
||||
val initialState = DEFAULT_STATE.copy(
|
||||
addSendType = AddSendType.EditItem(sendItemId = sendId),
|
||||
)
|
||||
val mockSendView = createMockSendView(number = 1)
|
||||
every {
|
||||
mockSendView.toViewState(clock, DEFAULT_ENVIRONMENT_URL)
|
||||
} returns DEFAULT_VIEW_STATE
|
||||
mutableSendDataStateFlow.value = DataState.Loaded(mockSendView)
|
||||
val viewModel = createViewModel(
|
||||
state = initialState,
|
||||
addSendType = AddSendType.EditItem(sendItemId = sendId),
|
||||
)
|
||||
|
||||
viewModel.stateFlow.test {
|
||||
assertEquals(initialState, awaitItem())
|
||||
viewModel.trySendAction(AddSendAction.DeleteClick)
|
||||
assertEquals(
|
||||
initialState.copy(
|
||||
dialogState = AddSendState.DialogState.Loading(
|
||||
message = R.string.deleting.asText(),
|
||||
),
|
||||
),
|
||||
awaitItem(),
|
||||
)
|
||||
assertEquals(
|
||||
initialState.copy(
|
||||
dialogState = AddSendState.DialogState.Error(
|
||||
title = R.string.an_error_has_occurred.asText(),
|
||||
message = R.string.generic_error_message.asText(),
|
||||
),
|
||||
),
|
||||
awaitItem(),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `DeleteClick vaultRepository deleteSend Success should show toast`() = runTest {
|
||||
val sendId = "mockId-1"
|
||||
coEvery { vaultRepository.deleteSend(sendId) } returns DeleteSendResult.Success
|
||||
val viewModel = createViewModel(
|
||||
state = DEFAULT_STATE.copy(addSendType = AddSendType.EditItem(sendItemId = sendId)),
|
||||
addSendType = AddSendType.EditItem(sendItemId = sendId),
|
||||
)
|
||||
|
||||
viewModel.eventFlow.test {
|
||||
viewModel.trySendAction(AddSendAction.DeleteClick)
|
||||
assertEquals(AddSendEvent.NavigateBack, awaitItem())
|
||||
assertEquals(AddSendEvent.ShowToast(R.string.send_deleted.asText()), awaitItem())
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `ShareLinkClick should send ShowToast`() = runTest {
|
||||
val viewModel = createViewModel(
|
||||
|
||||
Reference in New Issue
Block a user