From 7b6650a151843e692510800f846a5d393853734f Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 25 May 2023 15:31:10 +0300
Subject: [PATCH] Bug 1835055 - Re-enable noSearchGroupFromPrivateBrowsingTest
 UI test

---
 .../java/org/mozilla/fenix/ui/SearchTest.kt         |  1 -
 .../org/mozilla/fenix/ui/robots/TabDrawerRobot.kt   | 13 ++++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
index 49484ddd8b..14b7f1fc6a 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
@@ -283,7 +283,6 @@ class SearchTest {
         }
     }
 
-    @Ignore("Test run timing out: https://github.com/mozilla-mobile/fenix/issues/27704")
     @SmokeTest
     @Test
     fun noSearchGroupFromPrivateBrowsingTest() {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt
index 043c8b5ded..2fe3224e03 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt
@@ -347,15 +347,14 @@ class TabDrawerRobot {
             tabPosition: Int,
             interact: BrowserRobot.() -> Unit,
         ): BrowserRobot.Transition {
-            val tab = mDevice.findObject(
+            mDevice.findObject(
                 UiSelector()
-                    .className("androidx.compose.ui.platform.ComposeView")
+                    .resourceId("$packageName:id/tab_tray_grid_item")
                     .index(tabPosition),
-            )
-
-            UiScrollable(UiSelector().resourceId("$packageName:id/tray_list_item")).scrollIntoView(tab)
-            tab.waitForExists(waitingTime)
-            tab.click()
+            ).also {
+                it.waitForExists(waitingTime)
+                it.click()
+            }
 
             BrowserRobot().interact()
             return BrowserRobot.Transition()