run #3

mozilla-mobile · Oct 27, 2021 · 9a3b248 · 9a3b248
1 parent a0be15a
commit 9a3b248
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelper.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelper.kt
@@ -30,5 +30,4 @@ class FeatureSettingsHelper {
         settings.shouldShowJumpBackInCFR = isJumpBackInCFREnabled
         settings.showRecentTabsFeature = isRecentTabsFeatureEnabled
     }
-
-}
+}
diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/HomeActivityTestRule.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/HomeActivityTestRule.kt
@@ -40,7 +40,8 @@ class HomeActivityTestRule(
         super.afterActivityFinished()
         setLongTapTimeout(longTapUserPreference)
         closeNotificationShade()
-        // resetting the default values of feature flags in case they are modified but not reset in a test.
+        /* resetting the default values of a selection of feature flags,
+        in case they are modified but not reset in a test.*/
         featureSettings.resetAllFeatureFlags()
     }
 }
@@ -72,7 +73,8 @@ class HomeActivityIntentTestRule(
         super.afterActivityFinished()
         setLongTapTimeout(longTapUserPreference)
         closeNotificationShade()
-        // resetting the default values of feature flags in case they are modified but not reset in a test.
+        /* resetting the default values of a selection of feature flags,
+        in case they are modified but not reset in a test.*/
         featureSettings.resetAllFeatureFlags()
     }
 }

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
@@ -149,28 +149,31 @@ class TabbedBrowsingTest {
         }.openTabDrawer {
             verifyExistingOpenTabs("Test_Page_1")
             closeTab()
+        }
+        homeScreen {
             verifySnackBarText("Tab closed")
             snackBarButtonClick("UNDO")
         }
-
         browserScreen {
             verifyTabCounter("1")
         }.openTabDrawer {
             verifyExistingOpenTabs("Test_Page_1")
             swipeTabRight("Test_Page_1")
+        }
+        homeScreen {
             verifySnackBarText("Tab closed")
             snackBarButtonClick("UNDO")
         }
-
         browserScreen {
             verifyTabCounter("1")
         }.openTabDrawer {
             verifyExistingOpenTabs("Test_Page_1")
             swipeTabLeft("Test_Page_1")
+        }
+        homeScreen {
             verifySnackBarText("Tab closed")
             snackBarButtonClick("UNDO")
         }
-
         browserScreen {
             verifyTabCounter("1")
         }.openTabDrawer {

diff --git a/automation/taskcluster/androidTest/flank-x86.yml b/automation/taskcluster/androidTest/flank-x86.yml
@@ -41,7 +41,6 @@ gcloud:
 #   - notPackage org.mozilla.fenix.screenshots
 #   - notPackage org.mozilla.fenix.syncintegration
     - class org.mozilla.fenix.ui.TabbedBrowsingTest#closeTabTest
-    - class org.mozilla.fenix.ui.TabbedBrowsingTest#closePrivateTabTest
 
   device:
    - model: Pixel2
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,5 +30,4 @@ class FeatureSettingsHelper { @@
             settings.shouldShowJumpBackInCFR = isJumpBackInCFREnabled
             settings.showRecentTabsFeature = isRecentTabsFeatureEnabled
         }
-    }
+    }