From c3cf484b8a9e0bddd958a3897416bcbf5d633f73 Mon Sep 17 00:00:00 2001
From: "oana.horvath" <ohorvath@mozilla.com>
Date: Fri, 5 May 2023 14:00:08 +0300
Subject: [PATCH] Bug 1821993 - Fix SearchTest#scanButtonDenyPermissionTest

---
 .../java/org/mozilla/fenix/helpers/TestHelper.kt | 16 ++--------------
 .../java/org/mozilla/fenix/ui/SearchTest.kt      |  1 -
 .../mozilla/fenix/ui/robots/HomeScreenRobot.kt   |  1 +
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
index 0c912c25bc..a57eabde88 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt
@@ -76,7 +76,6 @@ import org.mozilla.fenix.utils.IntentUtils
 import org.mozilla.gecko.util.ThreadUtils
 import java.io.File
 import java.util.Locale
-import java.util.regex.Pattern
 
 object TestHelper {
 
@@ -363,19 +362,8 @@ object TestHelper {
 
     // Permission deny dialogs differ on various Android APIs
     fun denyPermission() {
-        if (Build.VERSION.SDK_INT >= 23) {
-            mDevice.findObject(
-                By.text(
-                    when (Build.VERSION.SDK_INT) {
-                        Build.VERSION_CODES.R -> Pattern.compile(
-                            "DENY",
-                            Pattern.CASE_INSENSITIVE,
-                        )
-                        else -> Pattern.compile("Deny", Pattern.CASE_INSENSITIVE)
-                    },
-                ),
-            ).click()
-        }
+        mDevice.findObject(UiSelector().textContains("Deny")).waitForExists(waitingTime)
+        mDevice.findObject(UiSelector().textContains("Deny")).click()
     }
 
     fun isTestLab(): Boolean {
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 a1223cd8f1..49484ddd8b 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt
@@ -93,7 +93,6 @@ class SearchTest {
         }
     }
 
-    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1821993")
     @SmokeTest
     @Test
     fun scanButtonDenyPermissionTest() {
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 7fcf9d3796..7d185d5625 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
@@ -570,6 +570,7 @@ class HomeScreenRobot {
         fun openSearch(interact: SearchRobot.() -> Unit): SearchRobot.Transition {
             navigationToolbar.waitForExists(waitingTime)
             navigationToolbar.click()
+            mDevice.waitForIdle()
 
             SearchRobot().interact()
             return SearchRobot.Transition()