Bug 1851543 - Cleanup old Onboarding UI test code

app/src/androidTest/java/org/mozilla/fenix/ui/AddToHomeScreenTest.kt

@@ -79,9 +79,6 @@ class AddToHomeScreenTest {
     @SmokeTest
     @Test
     fun addPrivateBrowsingShortcutTest() {
-        homeScreen {
-        }.dismissOnboarding()
-
         homeScreen {
         }.triggerPrivateBrowsingShortcutPrompt {
             verifyNoThanksPrivateBrowsingShortcutButton()

app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHomeScreenTest.kt

@@ -63,7 +63,6 @@ class ComposeHomeScreenTest {
     @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1844580")
     @Test
     fun homeScreenItemsTest() {
-        homeScreen {}.dismissOnboarding()
         homeScreen {
             verifyHomeWordmark()
             verifyHomePrivateBrowsingButton()
@@ -86,7 +85,6 @@ class ComposeHomeScreenTest {
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/244199
     @Test
     fun privateBrowsingHomeScreenItemsTest() {
-        homeScreen { }.dismissOnboarding()
         homeScreen { }.togglePrivateBrowsingMode()
 
         homeScreen {

app/src/androidTest/java/org/mozilla/fenix/ui/DeepLinkTest.kt

@@ -91,7 +91,6 @@ class DeepLinkTest {
 
     @Test
     fun openCollections() {
-        robot.openHomeScreen { /* do nothing */ }.dismissOnboarding()
         robot.openCollections {
             verifyCollectionsHeader()
         }

app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt

@@ -57,8 +57,11 @@ class HomeScreenTest {
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/235396
     @Test
     fun homeScreenItemsTest() {
-        homeScreen {}.dismissOnboarding()
+        // Workaround to make sure the Pocket articles are populated before starting the test.
         homeScreen {
+        }.openThreeDotMenu {
+        }.openSettings {
+        }.goBack {
             verifyHomeWordmark()
             verifyHomePrivateBrowsingButton()
             verifyExistingTopSitesTabs("Wikipedia")
@@ -80,7 +83,6 @@ class HomeScreenTest {
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/244199
     @Test
     fun privateBrowsingHomeScreenItemsTest() {
-        homeScreen { }.dismissOnboarding()
         homeScreen { }.togglePrivateBrowsingMode()
 
         homeScreen {

app/src/androidTest/java/org/mozilla/fenix/ui/NimbusEventTest.kt

@@ -22,7 +22,6 @@ import org.mozilla.fenix.helpers.Experimentation
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.RetryTestRule
 import org.mozilla.fenix.helpers.TestHelper.appContext
-import org.mozilla.fenix.ui.robots.homeScreen
 
 class NimbusEventTest {
     private lateinit var mDevice: UiDevice
@@ -56,8 +55,6 @@ class NimbusEventTest {
 
     @Test
     fun homeScreenNimbusEventsTest() {
-        homeScreen { }.dismissOnboarding()
-
         Experimentation.withHelper {
             assertTrue(evalJexl("'app_opened'|eventSum('Days', 28, 0) > 0"))
         }

app/src/androidTest/java/org/mozilla/fenix/ui/NoNetworkAccessStartupTests.kt

@@ -43,8 +43,6 @@ class NoNetworkAccessStartupTests {
 
         activityTestRule.launchActivity(null)
 
-        homeScreen {
-        }.dismissOnboarding()
         homeScreen {
             verifyHomeScreen()
         }

app/src/androidTest/java/org/mozilla/fenix/ui/PocketTest.kt

@@ -30,6 +30,12 @@ class PocketTest {
     @Before
     fun setUp() {
         mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+
+        // Workaround to make sure the Pocket articles are populated before starting the tests.
+        homeScreen {
+        }.openThreeDotMenu {
+        }.openSettings {
+        }.goBack {}
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2252509
@@ -40,9 +46,6 @@ class PocketTest {
             it.isRecentlyVisitedFeatureEnabled = false
         }
 
-        homeScreen {
-        }.dismissOnboarding()
-
         homeScreen {
             verifyThoughtProvokingStories(true)
             scrollToPocketProvokingStories()
@@ -70,9 +73,6 @@ class PocketTest {
             it.isRecentlyVisitedFeatureEnabled = false
         }
 
-        homeScreen {
-        }.dismissOnboarding()
-
         homeScreen {
             verifyThoughtProvokingStories(true)
             scrollToPocketProvokingStories()
@@ -90,9 +90,6 @@ class PocketTest {
             it.isRecentlyVisitedFeatureEnabled = false
         }
 
-        homeScreen {
-        }.dismissOnboarding()
-
         homeScreen {
             scrollToPocketProvokingStories()
             verifyDiscoverMoreStoriesButton()
@@ -109,9 +106,6 @@ class PocketTest {
             it.isRecentlyVisitedFeatureEnabled = false
         }
 
-        homeScreen {
-        }.dismissOnboarding()
-
         homeScreen {
             verifyStoriesByTopicItemState(activityTestRule, false, 1)
             clickStoriesByTopicItem(activityTestRule, 1)
@@ -127,9 +121,6 @@ class PocketTest {
             it.isRecentlyVisitedFeatureEnabled = false
         }
 
-        homeScreen {
-        }.dismissOnboarding()
-
         homeScreen {
             verifyPoweredByPocket()
         }.clickPocketLearnMoreLink(activityTestRule) {

app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt

@@ -218,8 +218,6 @@ class TopSitesTest {
     // Expected for en-us defaults
     @Test
     fun verifyDefaultTopSitesList() {
-        homeScreen { }.dismissOnboarding()
-
         homeScreen {
             verifyExistingTopSitesList()
             defaultTopSitesList.values.forEach { value ->

app/src/androidTest/java/org/mozilla/fenix/ui/robots/CustomTabRobot.kt

@@ -167,13 +167,6 @@ class CustomTabRobot {
             ShareOverlayRobot().interact()
             return ShareOverlayRobot.Transition()
         }
-
-        fun goBackToOnboardingScreen(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
-            mDevice.pressBack()
-
-            HomeScreenRobot().interact()
-            return HomeScreenRobot.Transition()
-        }
     }
 }
 

app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt

@@ -494,10 +494,6 @@ class HomeScreenRobot {
             return SearchRobot.Transition()
         }
 
-        fun dismissOnboarding() {
-            openThreeDotMenu { }.openSettings { }.goBack { }
-        }
-
         fun clickUpgradingUserOnboardingSignInButton(
             testRule: ComposeTestRule,
             interact: SyncSignInRobot.() -> Unit,