Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ class GeneratorViewModel @Inject constructor(
private suspend fun generatePassphrase(passphrase: GeneratorState.MainType.Passphrase) {
val request = PassphraseGeneratorRequest(
numWords = passphrase.numWords.toUByte(),
wordSeparator = passphrase.wordSeparator?.toString() ?: " ",
wordSeparator = passphrase.wordSeparator?.toString().orEmpty(),
capitalize = passphrase.capitalize,
includeNumber = passphrase.includeNumber,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ class FakeGeneratorRepository : GeneratorRepository {

private var passwordGeneratorRequest: PasswordGeneratorRequest? = null

private var passphraseGeneratorRequest: PassphraseGeneratorRequest? = null

private val mutablePasswordHistoryStateFlow =
MutableStateFlow<LocalDataState<List<PasswordHistoryView>>>(LocalDataState.Loading)

Expand Down Expand Up @@ -89,6 +91,7 @@ class FakeGeneratorRepository : GeneratorRepository {
override suspend fun generatePassphrase(
passphraseGeneratorRequest: PassphraseGeneratorRequest,
): GeneratedPassphraseResult {
this.passphraseGeneratorRequest = passphraseGeneratorRequest
return generatePassphraseResult
}

Expand Down Expand Up @@ -198,4 +201,11 @@ class FakeGeneratorRepository : GeneratorRepository {
fun assertEqualsStoredRequest(request: PasswordGeneratorRequest) {
assertEquals(request, passwordGeneratorRequest)
}

/**
* Asserts that the passed in request matches the stored request.
*/
fun assertEqualsStoredRequest(request: PassphraseGeneratorRequest) {
assertEquals(request, passphraseGeneratorRequest)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import app.cash.turbine.test
import app.cash.turbine.turbineScope
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
import com.bitwarden.data.repository.model.Environment
import com.bitwarden.generators.PassphraseGeneratorRequest
import com.bitwarden.generators.PasswordGeneratorRequest
import com.bitwarden.network.model.PolicyTypeJson
import com.bitwarden.network.model.SyncResponseJson
Expand Down Expand Up @@ -2366,6 +2367,30 @@ class GeneratorViewModelTest : BaseViewModelTest() {
firstTimeActionManager.markCoachMarkTourCompleted(CoachMarkTourType.GENERATOR)
}
}

@Test
fun `WordSeparatorTextChange action with null separator falls back to empty string`() =
runTest {
val defaultNumWords = 3

val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(
GeneratorAction.MainTypeOptionSelect(GeneratorState.MainTypeOption.PASSPHRASE),
)

val action = GeneratorAction.MainType.Passphrase.WordSeparatorTextChange(null)
viewModel.trySendAction(action)
fakeGeneratorRepository.assertEqualsStoredRequest(
PassphraseGeneratorRequest(
numWords = defaultNumWords.toUByte(),
wordSeparator = "",
capitalize = false,
includeNumber = false,
),
)
}
}
//region Helper Functions

@Suppress("LongParameterList")
Expand Down
Loading