Skip to content

Commit 925db01

Browse files
PM-17797 and PM-17798 set onboarding features to be remotely configurable (#4662)
1 parent 2b79cc9 commit 925db01

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

app/src/main/java/com/x8bit/bitwarden/data/platform/manager/model/FlagKey.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ sealed class FlagKey<out T : Any> {
7070
data object OnboardingCarousel : FlagKey<Boolean>() {
7171
override val keyName: String = "native-carousel-flow"
7272
override val defaultValue: Boolean = false
73-
override val isRemotelyConfigured: Boolean = false
73+
override val isRemotelyConfigured: Boolean = true
7474
}
7575

7676
/**
@@ -79,7 +79,7 @@ sealed class FlagKey<out T : Any> {
7979
data object OnboardingFlow : FlagKey<Boolean>() {
8080
override val keyName: String = "native-create-account-flow"
8181
override val defaultValue: Boolean = false
82-
override val isRemotelyConfigured: Boolean = false
82+
override val isRemotelyConfigured: Boolean = true
8383
}
8484

8585
/**

app/src/test/java/com/x8bit/bitwarden/data/platform/repository/DebugMenuRepositoryTest.kt

+4-7
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ import io.mockk.every
1313
import io.mockk.just
1414
import io.mockk.mockk
1515
import io.mockk.runs
16-
import io.mockk.unmockkStatic
1716
import io.mockk.verify
1817
import kotlinx.coroutines.flow.MutableStateFlow
1918
import kotlinx.coroutines.test.runTest
2019
import kotlinx.serialization.json.JsonPrimitive
2120
import org.junit.jupiter.api.Assertions.assertEquals
22-
import org.junit.jupiter.api.Assertions.assertFalse
2321
import org.junit.jupiter.api.Assertions.assertNull
2422
import org.junit.jupiter.api.Assertions.assertTrue
2523
import org.junit.jupiter.api.Test
@@ -128,7 +126,7 @@ class DebugMenuRepositoryTest {
128126
val mockServerData = mockk<ConfigResponseJson>(relaxed = true) {
129127
every { featureStates } returns mapOf(
130128
FlagKey.EmailVerification.keyName to JsonPrimitive(true),
131-
FlagKey.OnboardingCarousel.keyName to JsonPrimitive(false),
129+
FlagKey.OnboardingCarousel.keyName to JsonPrimitive(true),
132130
FlagKey.OnboardingFlow.keyName to JsonPrimitive(true),
133131
)
134132
}
@@ -140,16 +138,16 @@ class DebugMenuRepositoryTest {
140138
debugMenuRepository.resetFeatureFlagOverrides()
141139

142140
assertTrue(FlagKey.EmailVerification.isRemotelyConfigured)
143-
assertFalse(FlagKey.OnboardingCarousel.isRemotelyConfigured)
141+
assertTrue(FlagKey.OnboardingCarousel.isRemotelyConfigured)
144142
verify(exactly = 1) {
145143
mockFeatureFlagOverrideDiskSource.saveFeatureFlag(FlagKey.EmailVerification, true)
146144
mockFeatureFlagOverrideDiskSource.saveFeatureFlag(
147145
FlagKey.OnboardingCarousel,
148-
false,
146+
true,
149147
)
150148
mockFeatureFlagOverrideDiskSource.saveFeatureFlag(
151149
FlagKey.OnboardingFlow,
152-
false,
150+
true,
153151
)
154152
}
155153

@@ -158,7 +156,6 @@ class DebugMenuRepositoryTest {
158156
awaitItem()
159157
cancel()
160158
}
161-
unmockkStatic(FlagKey.OnboardingFlow::class)
162159
}
163160

164161
@Test

0 commit comments

Comments
 (0)