Merge branch 'main' into 1805070-update-detekt-in-ac

gabrielluong · May 19, 2023 · ea3fd8f · ea3fd8f
2 parents 9ffc8e5 + bc1c40a
commit ea3fd8f
Show file tree

Hide file tree

Showing 15 changed files with 680 additions and 19 deletions.
diff --git a/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelper.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelper.kt
@@ -77,6 +77,11 @@ interface FeatureSettingsHelper {
      */
     var isOpenInAppBannerEnabled: Boolean
 
+    /**
+     * Enable or disable the Tabs Tray to Compose rewrite.
+     */
+    var tabsTrayRewriteEnabled: Boolean
+
     fun applyFlagUpdates()
 
     fun resetAllFeatureFlags()

diff --git a/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelperDelegate.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelperDelegate.kt
@@ -37,6 +37,7 @@ class FeatureSettingsHelperDelegate : FeatureSettingsHelper {
         isCookieBannerReductionDialogEnabled = !settings.userOptOutOfReEngageCookieBannerDialog,
         isOpenInAppBannerEnabled = settings.shouldShowOpenInAppBanner,
         etpPolicy = getETPPolicy(settings),
+        tabsTrayRewriteEnabled = settings.enableTabsTrayToCompose,
     )
 
     /**
@@ -64,6 +65,7 @@ class FeatureSettingsHelperDelegate : FeatureSettingsHelper {
     override var isCookieBannerReductionDialogEnabled: Boolean by updatedFeatureFlags::isCookieBannerReductionDialogEnabled
     override var isOpenInAppBannerEnabled: Boolean by updatedFeatureFlags::isOpenInAppBannerEnabled
     override var etpPolicy: ETPPolicy by updatedFeatureFlags::etpPolicy
+    override var tabsTrayRewriteEnabled: Boolean by updatedFeatureFlags::tabsTrayRewriteEnabled
 
     override fun applyFlagUpdates() {
         applyFeatureFlags(updatedFeatureFlags)
@@ -89,6 +91,7 @@ class FeatureSettingsHelperDelegate : FeatureSettingsHelper {
         settings.deleteSitePermissions = featureFlags.isDeleteSitePermissionsEnabled
         settings.userOptOutOfReEngageCookieBannerDialog = !featureFlags.isCookieBannerReductionDialogEnabled
         settings.shouldShowOpenInAppBanner = featureFlags.isOpenInAppBannerEnabled
+        settings.enableTabsTrayToCompose = featureFlags.tabsTrayRewriteEnabled
         setETPPolicy(featureFlags.etpPolicy)
     }
 }
@@ -108,6 +111,7 @@ private data class FeatureFlags(
     var isCookieBannerReductionDialogEnabled: Boolean,
     var isOpenInAppBannerEnabled: Boolean,
     var etpPolicy: ETPPolicy,
+    var tabsTrayRewriteEnabled: Boolean,
 )
 
 internal fun getETPPolicy(settings: Settings): ETPPolicy {

diff --git a/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/HomeActivityTestRule.kt b/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/HomeActivityTestRule.kt
@@ -8,6 +8,7 @@ package org.mozilla.fenix.helpers
 
 import android.content.Intent
 import android.view.ViewConfiguration.getLongPressTimeout
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.test.espresso.intent.rule.IntentsTestRule
 import androidx.test.rule.ActivityTestRule
 import androidx.test.uiautomator.UiSelector
@@ -17,6 +18,8 @@ import org.mozilla.fenix.helpers.TestHelper.appContext
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.onboarding.FenixOnboarding
 
+typealias HomeActivityComposeTestRule = AndroidComposeTestRule<HomeActivityTestRule, HomeActivity>
+
 /**
  * A [org.junit.Rule] to handle shared test set up for tests on [HomeActivity].
  *
@@ -51,6 +54,7 @@ class HomeActivityTestRule(
         isCookieBannerReductionDialogEnabled: Boolean = !settings.userOptOutOfReEngageCookieBannerDialog,
         isOpenInAppBannerEnabled: Boolean = settings.shouldShowOpenInAppBanner,
         etpPolicy: ETPPolicy = getETPPolicy(settings),
+        tabsTrayRewriteEnabled: Boolean = false,
     ) : this(initialTouchMode, launchActivity, skipOnboarding) {
         this.isHomeOnboardingDialogEnabled = isHomeOnboardingDialogEnabled
         this.isPocketEnabled = isPocketEnabled
@@ -64,6 +68,7 @@ class HomeActivityTestRule(
         this.isCookieBannerReductionDialogEnabled = isCookieBannerReductionDialogEnabled
         this.isOpenInAppBannerEnabled = isOpenInAppBannerEnabled
         this.etpPolicy = etpPolicy
+        this.tabsTrayRewriteEnabled = tabsTrayRewriteEnabled
     }
 
     /**
@@ -107,10 +112,12 @@ class HomeActivityTestRule(
             initialTouchMode: Boolean = false,
             launchActivity: Boolean = true,
             skipOnboarding: Boolean = false,
+            tabsTrayRewriteEnabled: Boolean = false,
         ) = HomeActivityTestRule(
             initialTouchMode = initialTouchMode,
             launchActivity = launchActivity,
             skipOnboarding = skipOnboarding,
+            tabsTrayRewriteEnabled = tabsTrayRewriteEnabled,
             isJumpBackInCFREnabled = false,
             isPWAsPromptEnabled = false,
             isTCPCFREnabled = false,
@@ -155,6 +162,7 @@ class HomeActivityIntentTestRule internal constructor(
         isCookieBannerReductionDialogEnabled: Boolean = !settings.userOptOutOfReEngageCookieBannerDialog,
         isOpenInAppBannerEnabled: Boolean = settings.shouldShowOpenInAppBanner,
         etpPolicy: ETPPolicy = getETPPolicy(settings),
+        tabsTrayRewriteEnabled: Boolean = false,
     ) : this(initialTouchMode, launchActivity, skipOnboarding) {
         this.isHomeOnboardingDialogEnabled = isHomeOnboardingDialogEnabled
         this.isPocketEnabled = isPocketEnabled
@@ -168,6 +176,7 @@ class HomeActivityIntentTestRule internal constructor(
         this.isCookieBannerReductionDialogEnabled = isCookieBannerReductionDialogEnabled
         this.isOpenInAppBannerEnabled = isOpenInAppBannerEnabled
         this.etpPolicy = etpPolicy
+        this.tabsTrayRewriteEnabled = tabsTrayRewriteEnabled
     }
 
     private val longTapUserPreference = getLongPressTimeout()
@@ -248,10 +257,12 @@ class HomeActivityIntentTestRule internal constructor(
             initialTouchMode: Boolean = false,
             launchActivity: Boolean = true,
             skipOnboarding: Boolean = false,
+            tabsTrayRewriteEnabled: Boolean = false,
         ) = HomeActivityIntentTestRule(
             initialTouchMode = initialTouchMode,
             launchActivity = launchActivity,
             skipOnboarding = skipOnboarding,
+            tabsTrayRewriteEnabled = tabsTrayRewriteEnabled,
             isJumpBackInCFREnabled = false,
             isPWAsPromptEnabled = false,
             isTCPCFREnabled = false,