From 48ef6cefa57679c0206ec99e9c79e83609ea5f34 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Wed, 21 Dec 2022 19:44:33 +0200
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/28182 fix disabled
 verifySearchEnginesWithRTLLocale and toggleSearchEnginesShortcutListTest UI
 tests

---
 .../java/org/mozilla/fenix/ui/SettingsSearchTest.kt      | 3 +--
 .../java/org/mozilla/fenix/ui/robots/SearchRobot.kt      | 9 +--------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSearchTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSearchTest.kt
index 747514dbf2..c7c43da2fd 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSearchTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSearchTest.kt
@@ -390,7 +390,6 @@ class SettingsSearchTest {
 
     // Expected for app language set to Arabic
     @Test
-    @Ignore("See: https://github.com/mozilla-mobile/fenix/issues/28257")
     fun verifySearchEnginesWithRTLLocale() {
         homeScreen {
         }.openThreeDotMenu {
@@ -431,7 +430,6 @@ class SettingsSearchTest {
 
     // Expected for en-us defaults
     @Test
-    @Ignore("Failing after changing SearchDialog homescreen interaction. See: https://github.com/mozilla-mobile/fenix/issues/28182")
     fun toggleSearchEnginesShortcutListTest() {
         homeScreen {
         }.openThreeDotMenu {
@@ -455,6 +453,7 @@ class SettingsSearchTest {
                 "eBay",
                 "Wikipedia",
             )
+            scrollToSearchEngineSettings(activityTestRule)
         }.clickSearchEngineSettings(activityTestRule) {
             toggleShowSearchShortcuts()
             verifyShowSearchEnginesToggleState(false)
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
index 97f282caeb..b636beea88 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
@@ -282,10 +282,6 @@ class SearchRobot {
         assertTranslatedFocusedNavigationToolbar(toolbarHintString)
 
     fun verifySearchEngineShortcuts(rule: ComposeTestRule, vararg searchEngines: String) {
-        mDevice.findObject(
-            UiSelector().resourceId("$packageName:id/awesome_bar"),
-        ).swipeUp(3)
-
         for (searchEngine in searchEngines) {
             rule.waitForIdle()
             rule.onNodeWithText(searchEngine).assertIsDisplayed()
@@ -365,10 +361,7 @@ class SearchRobot {
             rule: ComposeTestRule,
             interact: SettingsSubMenuSearchRobot.() -> Unit,
         ): SettingsSubMenuSearchRobot.Transition {
-            rule.onNodeWithText("Search engine settings")
-                .assertIsDisplayed()
-                .assertHasClickAction()
-                .performClick()
+            rule.onNodeWithText("Search engine settings").performClick()
 
             SettingsSubMenuSearchRobot().interact()
             return SettingsSubMenuSearchRobot.Transition()