For mozilla-mobile#20814 fix flaky tabMediaControlButtonTest UI test

fork-maintainers · Oct 5, 2021 · 8a8bbd9 · 8a8bbd9
1 parent 6faafe4
commit 8a8bbd9
Showing 1 changed file with 11 additions and 9 deletions.
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
@@ -148,16 +148,18 @@ class TabDrawerRobot {
     }
 
     fun verifyTabMediaControlButtonState(action: String) {
-        mDevice.waitNotNull(
-            findObject(
-                By
-                    .res("$packageName:id/play_pause_button")
-                    .desc(action)
-            ),
-            waitingTime
-        )
+        mDevice.waitForIdle()
 
-        tabMediaControlButton().check(matches(withContentDescription(action)))
+        mDevice.findObject(
+            UiSelector()
+                .resourceId("$packageName:id/play_pause_button")
+        ).waitForExists(waitingTime)
+
+        assertTrue(
+            mDevice.findObject(
+                UiSelector().descriptionContains(action)
+            ).waitForExists(waitingTime)
+        )
     }
 
     fun clickTabMediaControlButton() = tabMediaControlButton().click()