For #16020 Fix Intermittent tests caused by the Menu Button (#17829)

3 years ago · 936966596a
parent e1d6fa527c
commit 936966596a
2 changed files with 7 additions and 4 deletions
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
@ -68,14 +68,16 @@ class ThreeDotMenuMainTest {
        }.openHelp {
            verifyHelpUrl()
        }.openTabDrawer {
-        }.openNewTab {
-        }.dismissSearchBar {
+            closeTab()
+        }
+
+        homeScreen {
        }.openThreeDotMenu {
        }.openWhatsNew {
            verifyWhatsNewURL()
        }.openTabDrawer {
-        }.openNewTab {
-        }.dismissSearchBar { }
+            closeTab()
+        }

        homeScreen {
        }.openThreeDotMenu {
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
@ -309,6 +309,7 @@ class HomeScreenRobot {
        }

        fun openThreeDotMenu(interact: ThreeDotMenuMainRobot.() -> Unit): ThreeDotMenuMainRobot.Transition {
+            mDevice.waitNotNull(Until.findObject(By.res("$packageName:id/menuButton")), waitingTime)
            threeDotButton().perform(click())

            ThreeDotMenuMainRobot().interact()