diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt index de660bbef..2f76237ed 100644 --- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt +++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt @@ -10,11 +10,6 @@ object FeatureFlags { */ const val pullToRefreshEnabled = false - /** - * Enables tip feature - */ - val tips = Config.channel.isDebug - /** * Allows edit of saved logins. */ @@ -29,10 +24,4 @@ object FeatureFlags { * Enables new tab tray pref */ val tabTray = Config.channel.isNightlyOrDebug - - /** - * Allows search widget CFR to be displayed. - * This is a placeholder for the experimentation framework determining cohorts. - */ - val searchWidgetCFR = Config.channel.isDebug } diff --git a/app/src/main/java/org/mozilla/fenix/components/tips/TipManager.kt b/app/src/main/java/org/mozilla/fenix/components/tips/TipManager.kt index 1c0769db7..1cb82131f 100644 --- a/app/src/main/java/org/mozilla/fenix/components/tips/TipManager.kt +++ b/app/src/main/java/org/mozilla/fenix/components/tips/TipManager.kt @@ -4,8 +4,6 @@ package org.mozilla.fenix.components.tips -import org.mozilla.fenix.FeatureFlags - sealed class TipType { data class Button(val text: String, val action: () -> Unit) : TipType() } @@ -31,7 +29,6 @@ class FenixTipManager( private val providers: List ) : TipManager { override fun getTip(): Tip? { - if (!FeatureFlags.tips) { return null } return providers .firstOrNull { it.shouldDisplay } ?.tip diff --git a/app/src/test/java/org/mozilla/fenix/components/tips/TipManagerTest.kt b/app/src/test/java/org/mozilla/fenix/components/tips/TipManagerTest.kt index 0d01986e0..f9ed1f9d0 100644 --- a/app/src/test/java/org/mozilla/fenix/components/tips/TipManagerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/tips/TipManagerTest.kt @@ -4,54 +4,12 @@ package org.mozilla.fenix.components.tips -import io.mockk.every import io.mockk.mockk -import io.mockk.mockkObject -import io.mockk.unmockkObject -import org.junit.After import org.junit.Assert.assertEquals import org.junit.Assert.assertNull -import org.junit.Before import org.junit.Test -import org.mozilla.fenix.FeatureFlags class TipManagerTest { - - @Before - fun setup() { - mockkObject(FeatureFlags) - every { FeatureFlags.tips } returns true - } - - @After - fun after() { - unmockkObject(FeatureFlags) - } - - @Test - fun `test feature flag off`() { - every { FeatureFlags.tips } returns false - assertNull(FenixTipManager(emptyList()).getTip()) - assertNull(FenixTipManager(listOf( - object : TipProvider { - override val tip = mockk() - override val shouldDisplay = true - }, - object : TipProvider { - override val tip = mockk() - override val shouldDisplay = false - }, - object : TipProvider { - override val tip: Tip? = null - override val shouldDisplay = true - }, - object : TipProvider { - override val tip: Tip? = null - override val shouldDisplay = false - } - )).getTip()) - } - @Test fun `test first with shouldDisplay`() { val shouldDisplayProvider = object : TipProvider {