BIT-1524, BIT-898: Update generated text (#964)

This commit is contained in:
David Perez
2024-06-20 17:08:07 +01:00
committed by Álison Fernandes
parent 6294e656ce
commit dc2e07c130
5 changed files with 213 additions and 57 deletions
@@ -132,7 +132,10 @@ class GeneratorViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(GeneratorAction.SelectClick)
assertEquals(GeneratorEvent.NavigateBack, eventTurbine.awaitItem())
assertEquals(GeneratorResult.Username("username"), generatorResultTurbine.awaitItem())
assertEquals(
GeneratorResult.Username(username = "-"),
generatorResultTurbine.awaitItem(),
)
}
}
@@ -484,6 +487,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
val expectedState =
initialPasscodeState.copy(
generatedText = "email+abcd1234@address.com",
selectedType = GeneratorState.MainType.Username(
GeneratorState.MainType.Username.UsernameType.PlusAddressedEmail(
email = "currentEmail",
@@ -558,6 +562,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
)
val expectedState = initialUsernameState.copy(
generatedText = "email+abcd1234@address.com",
selectedType = GeneratorState.MainType.Username(
selectedType = GeneratorState
.MainType
@@ -587,6 +592,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
)
val expectedState = initialUsernameState.copy(
generatedText = "-",
selectedType = GeneratorState.MainType.Username(
selectedType = GeneratorState.MainType.Username.UsernameType.CatchAllEmail(),
),
@@ -612,6 +618,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
)
val expectedState = initialUsernameState.copy(
generatedText = "-",
selectedType = GeneratorState.MainType.Username(
selectedType = GeneratorState
.MainType
@@ -639,6 +646,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
)
val expectedState = initialUsernameState.copy(
generatedText = "randomWord",
selectedType = GeneratorState.MainType.Username(
selectedType = GeneratorState.MainType.Username.UsernameType.RandomWord(),
),
@@ -1209,6 +1217,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedState = defaultForwardedEmailAliasState.copy(
generatedText = "-",
selectedType = GeneratorState.MainType.Username(
selectedType = GeneratorState
.MainType
@@ -1262,6 +1271,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedState = defaultAddyIoState.copy(
generatedText = "-",
selectedType = GeneratorState.MainType.Username(
GeneratorState.MainType.Username.UsernameType.ForwardedEmailAlias(
selectedServiceType = GeneratorState
@@ -1301,6 +1311,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedState = defaultAddyIoState.copy(
generatedText = "-",
selectedType = GeneratorState.MainType.Username(
GeneratorState.MainType.Username.UsernameType.ForwardedEmailAlias(
selectedServiceType = GeneratorState
@@ -1351,6 +1362,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedState = defaultDuckDuckGoState.copy(
generatedText = "-",
selectedType = GeneratorState.MainType.Username(
GeneratorState.MainType.Username.UsernameType.ForwardedEmailAlias(
selectedServiceType = GeneratorState
@@ -1401,6 +1413,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedState = defaultFastMailState.copy(
generatedText = "-",
selectedType = GeneratorState.MainType.Username(
GeneratorState.MainType.Username.UsernameType.ForwardedEmailAlias(
selectedServiceType = GeneratorState
@@ -1452,6 +1465,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedState = defaultFirefoxRelayState.copy(
generatedText = "-",
selectedType = GeneratorState.MainType.Username(
GeneratorState.MainType.Username.UsernameType.ForwardedEmailAlias(
selectedServiceType = GeneratorState
@@ -1503,6 +1517,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
viewModel.actionChannel.trySend(action)
val expectedState = defaultSimpleLoginState.copy(
generatedText = "-",
selectedType = GeneratorState.MainType.Username(
GeneratorState.MainType.Username.UsernameType.ForwardedEmailAlias(
selectedServiceType = GeneratorState
@@ -1547,6 +1562,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
)
val expectedState = defaultPlusAddressedEmailState.copy(
generatedText = "-",
selectedType = GeneratorState.MainType.Username(
selectedType = GeneratorState
.MainType
@@ -1589,6 +1605,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
)
val expectedState = defaultCatchAllEmailState.copy(
generatedText = "-",
selectedType = GeneratorState.MainType.Username(
selectedType = GeneratorState
.MainType
@@ -1629,6 +1646,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
)
val expectedState = defaultRandomWordState.copy(
generatedText = "randomWord",
selectedType = GeneratorState.MainType.Username(
GeneratorState.MainType.Username.UsernameType.RandomWord(
capitalize = true,
@@ -1654,6 +1672,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
)
val expectedState = defaultRandomWordState.copy(
generatedText = "randomWord",
selectedType = GeneratorState.MainType.Username(
GeneratorState.MainType.Username.UsernameType.RandomWord(
includeNumber = true,
@@ -1,12 +1,38 @@
package com.x8bit.bitwarden.ui.tools.feature.generator.util
import com.bitwarden.generators.ForwarderServiceType
import com.bitwarden.generators.UsernameGeneratorRequest
import com.x8bit.bitwarden.ui.tools.feature.generator.GeneratorState.MainType.Username.UsernameType.ForwardedEmailAlias.ServiceType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertNull
import org.junit.jupiter.api.Test
internal class ServiceTypeExtensionsTest {
@Test
fun `toUsernameGeneratorRequest for AddyIo returns null when apiAccessToken is blank`() {
val addyIoServiceType = ServiceType.AddyIo(
apiAccessToken = "",
domainName = "test.com",
baseUrl = "http://test.com",
)
val request = addyIoServiceType.toUsernameGeneratorRequest()
assertNull(request)
}
@Test
fun `toUsernameGeneratorRequest for AddyIo returns null when domainName is blank`() {
val addyIoServiceType = ServiceType.AddyIo(
apiAccessToken = "testToken",
domainName = "",
baseUrl = "http://test.com",
)
val request = addyIoServiceType.toUsernameGeneratorRequest()
assertNull(request)
}
@Test
fun `toUsernameGeneratorRequest for AddyIo returns correct request`() {
val addyIoServiceType = ServiceType.AddyIo(
@@ -17,14 +43,24 @@ internal class ServiceTypeExtensionsTest {
val request = addyIoServiceType.toUsernameGeneratorRequest()
assertEquals(
ForwarderServiceType.AddyIo(
apiToken = "testToken",
domain = "test.com",
baseUrl = "http://test.com",
UsernameGeneratorRequest.Forwarded(
service = ForwarderServiceType.AddyIo(
apiToken = "testToken",
domain = "test.com",
baseUrl = "http://test.com",
),
website = null,
),
request.service,
request,
)
assertEquals(null, request.website)
}
@Test
fun `toUsernameGeneratorRequest for DuckDuckGo returns null when apiKey is blank`() {
val duckDuckGoServiceType = ServiceType.DuckDuckGo(apiKey = "")
val request = duckDuckGoServiceType.toUsernameGeneratorRequest()
assertNull(request)
}
@Test
@@ -32,8 +68,21 @@ internal class ServiceTypeExtensionsTest {
val duckDuckGoServiceType = ServiceType.DuckDuckGo(apiKey = "testKey")
val request = duckDuckGoServiceType.toUsernameGeneratorRequest()
assertEquals(ForwarderServiceType.DuckDuckGo("testKey"), request.service)
assertEquals(null, request.website)
assertEquals(
UsernameGeneratorRequest.Forwarded(
service = ForwarderServiceType.DuckDuckGo(token = "testKey"),
website = null,
),
request,
)
}
@Test
fun `toUsernameGeneratorRequest for FirefoxRelay returns null when apiAccessToken is blank`() {
val firefoxRelayServiceType = ServiceType.FirefoxRelay(apiAccessToken = "")
val request = firefoxRelayServiceType.toUsernameGeneratorRequest()
assertNull(request)
}
@Test
@@ -41,8 +90,21 @@ internal class ServiceTypeExtensionsTest {
val firefoxRelayServiceType = ServiceType.FirefoxRelay(apiAccessToken = "testToken")
val request = firefoxRelayServiceType.toUsernameGeneratorRequest()
assertEquals(ForwarderServiceType.Firefox(apiToken = "testToken"), request.service)
assertEquals(null, request.website)
assertEquals(
UsernameGeneratorRequest.Forwarded(
service = ForwarderServiceType.Firefox(apiToken = "testToken"),
website = null,
),
request,
)
}
@Test
fun `toUsernameGeneratorRequest for FastMail returns null when apiKey is blank`() {
val fastMailServiceType = ServiceType.FastMail(apiKey = "")
val request = fastMailServiceType.toUsernameGeneratorRequest()
assertNull(request)
}
@Test
@@ -50,8 +112,21 @@ internal class ServiceTypeExtensionsTest {
val fastMailServiceType = ServiceType.FastMail(apiKey = "testKey")
val request = fastMailServiceType.toUsernameGeneratorRequest()
assertEquals(ForwarderServiceType.Fastmail(apiToken = "testKey"), request.service)
assertEquals(null, request.website)
assertEquals(
UsernameGeneratorRequest.Forwarded(
service = ForwarderServiceType.Fastmail(apiToken = "testKey"),
website = null,
),
request,
)
}
@Test
fun `toUsernameGeneratorRequest for SimpleLogin returns null when apiKey is blank`() {
val simpleLoginServiceType = ServiceType.SimpleLogin(apiKey = "")
val request = simpleLoginServiceType.toUsernameGeneratorRequest()
assertNull(request)
}
@Test
@@ -59,7 +134,12 @@ internal class ServiceTypeExtensionsTest {
val simpleLoginServiceType = ServiceType.SimpleLogin(apiKey = "testKey")
val request = simpleLoginServiceType.toUsernameGeneratorRequest()
assertEquals(ForwarderServiceType.SimpleLogin(apiKey = "testKey"), request.service)
assertEquals(null, request.website)
assertEquals(
UsernameGeneratorRequest.Forwarded(
service = ForwarderServiceType.SimpleLogin(apiKey = "testKey"),
website = null,
),
request,
)
}
}