From 3646becb5448d5853f1dc230f32f4473af7bc144 Mon Sep 17 00:00:00 2001
From: Oana Horvath <oana.horvath@softvision.ro>
Date: Tue, 8 Jun 2021 12:47:33 +0300
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/18986: re-enable
 changeAccessibiltySettings UI test, not failing anymore

---
 .../java/org/mozilla/fenix/ui/SettingsBasicsTest.kt         | 1 -
 .../java/org/mozilla/fenix/ui/robots/SettingsRobot.kt       | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsBasicsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsBasicsTest.kt
index be1366a855..3681f64872 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsBasicsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsBasicsTest.kt
@@ -161,7 +161,6 @@ class SettingsBasicsTest {
         }
     }
 
-    @Ignore("Failing, see: https://github.com/mozilla-mobile/fenix/issues/18986")
     @Test
     fun changeAccessibiltySettings() {
         // Goes through the settings and changes the default text on a webpage, then verifies if the text has changed.
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
index fc02dd5baa..34c6a998fc 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
@@ -148,15 +148,19 @@ class SettingsRobot {
         }
 
         fun openAccessibilitySubMenu(interact: SettingsSubMenuAccessibilityRobot.() -> Unit): SettingsSubMenuAccessibilityRobot.Transition {
+            scrollToElementByText("Accessibility")
 
             fun accessibilityButton() = onView(withText("Accessibility"))
-            accessibilityButton().click()
+            accessibilityButton()
+                .check(matches(isDisplayed()))
+                .click()
 
             SettingsSubMenuAccessibilityRobot().interact()
             return SettingsSubMenuAccessibilityRobot.Transition()
         }
 
         fun openLanguageSubMenu(interact: SettingsSubMenuLanguageRobot.() -> Unit): SettingsSubMenuLanguageRobot.Transition {
+            scrollToElementByText("Language")
 
             fun languageButton() = onView(withText("Language"))
             languageButton().click()