For #18591 - Update tests

Some tests trying to "Add to top sites" may fail because of the sticky navbar
now covering that menu item -> scroll the menu up a little.

Some tests that previously were trying to scroll to the bottom of the menu to
interact with navbar options now don't have to. Them trying to interact with
navbar option with the menu opened as collapsed is a good test for the navbar
stickyness.

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

@@ -321,7 +321,6 @@ class SmokeTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
         }.openThreeDotMenu {
-            expandMenu()
         }.openSaveToCollection {
             verifyCollectionNameTextField()
         }

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

@@ -54,6 +54,7 @@ class TopSitesTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
         }.openThreeDotMenu {
+            expandMenu()
             verifyAddToTopSitesButton()
         }.addToFirefoxHome {
             verifySnackBarText("Added to top sites!")
@@ -73,6 +74,7 @@ class TopSitesTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
         }.openThreeDotMenu {
+            expandMenu()
             verifyAddToTopSitesButton()
         }.addToFirefoxHome {
             verifySnackBarText("Added to top sites!")
@@ -104,6 +106,7 @@ class TopSitesTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
         }.openThreeDotMenu {
+            expandMenu()
             verifyAddToTopSitesButton()
         }.addToFirefoxHome {
             verifySnackBarText("Added to top sites!")
@@ -128,6 +131,7 @@ class TopSitesTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
         }.openThreeDotMenu {
+            expandMenu()
             verifyAddToTopSitesButton()
         }.addToFirefoxHome {
             verifySnackBarText("Added to top sites!")
@@ -152,6 +156,7 @@ class TopSitesTest {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
         }.openThreeDotMenu {
+            expandMenu()
             verifyAddToTopSitesButton()
         }.addToFirefoxHome {
             verifySnackBarText("Added to top sites!")

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

@@ -203,11 +203,6 @@ class ThreeDotMenuMainRobot {
         }
 
         fun sharePage(interact: LibrarySubMenusMultipleSelectionToolbarRobot.() -> Unit): LibrarySubMenusMultipleSelectionToolbarRobot.Transition {
-            var maxSwipes = 3
-            while (!shareButton().exists() && maxSwipes != 0) {
-                threeDotMenuRecyclerView().perform(swipeUp())
-                maxSwipes--
-            }
             shareButton().click()
             LibrarySubMenusMultipleSelectionToolbarRobot().interact()
             return LibrarySubMenusMultipleSelectionToolbarRobot.Transition()
@@ -222,11 +217,6 @@ class ThreeDotMenuMainRobot {
         }
 
         fun goForward(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
-            var maxSwipes = 3
-            while (!forwardButton().exists() && maxSwipes != 0) {
-                threeDotMenuRecyclerView().perform(swipeUp())
-                maxSwipes--
-            }
             forwardButton().click()
 
             BrowserRobot().interact()
@@ -260,11 +250,6 @@ class ThreeDotMenuMainRobot {
         }
 
         fun refreshPage(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
-            var maxSwipes = 3
-            while (!refreshButton().exists() && maxSwipes != 0) {
-                threeDotMenuRecyclerView().perform(swipeUp())
-                maxSwipes--
-            }
             assertRefreshButton()
             refreshButton().click()
 
@@ -379,6 +364,11 @@ class ThreeDotMenuMainRobot {
         }
 
         fun openSaveToCollection(interact: ThreeDotMenuMainRobot.() -> Unit): ThreeDotMenuMainRobot.Transition {
+            // Ensure the menu is expanded and fully scrolled to the bottom.
+            for (i in 0..3) {
+                threeDotMenuRecyclerView().perform(swipeUp())
+            }
+
             mDevice.waitNotNull(Until.findObject(By.text("Save to collection")), waitingTime)
             saveCollectionButton().click()
             ThreeDotMenuMainRobot().interact()