From b9391c141b2a084befd8c099eea7196ce6552cbc Mon Sep 17 00:00:00 2001
From: Aaron Train <aaron.train@gmail.com>
Date: Wed, 5 Aug 2020 11:43:13 -0400
Subject: [PATCH] For #13218: Fix settingsAddonsItemsTest

---
 .../java/org/mozilla/fenix/ui/SettingsAddonsTest.kt       | 1 -
 .../org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt  | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt
index a310457bb..05b3b82fc 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt
@@ -44,7 +44,6 @@ class SettingsAddonsTest {
     }
 
     // Walks through settings add-ons menu to ensure all items are present
-    @Ignore("Failing, see: https://github.com/mozilla-mobile/fenix/issues/13218")
     @Test
     fun settingsAddonsItemsTest() {
         homeScreen {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
index fe335c79c..47ab12921 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
@@ -31,6 +31,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers.allOf
@@ -350,10 +351,9 @@ class ThreeDotMenuMainRobot {
 
         fun openAddonsManagerMenu(interact: SettingsSubMenuAddonsManagerRobot.() -> Unit): SettingsSubMenuAddonsManagerRobot.Transition {
             clickAddonsManagerButton()
-            mDevice.waitNotNull(
-                Until.findObject(By.text("Recommended")),
-                waitingTime
-            )
+            mDevice.findObject(
+                UiSelector().text("Recommended")
+            ).waitForExists(waitingTime)
 
             SettingsSubMenuAddonsManagerRobot().interact()
             return SettingsSubMenuAddonsManagerRobot.Transition()