From 936966596a8b714f94d26d265af4042307ac4fb9 Mon Sep 17 00:00:00 2001
From: Andrei Joltan <51314259+AndiAJ@users.noreply.github.com>
Date: Thu, 4 Feb 2021 18:42:58 +0200
Subject: [PATCH] For #16020 Fix Intermittent tests caused by the Menu Button
 (#17829)

---
 .../java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt  | 10 ++++++----
 .../org/mozilla/fenix/ui/robots/HomeScreenRobot.kt     |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
index ca48ce5b6..088136fcd 100644
--- 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 {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
index 7c156b5b2..4c42f3276 100644
--- 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()