From 1f9067f2b4fa3b161b3d5d459602bea411b4ea73 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Wed, 13 Dec 2023 13:31:52 +0200
Subject: [PATCH] Bug 1815395 - Re-enable audio and video permissions tests

---
 .../org/mozilla/fenix/ui/SettingsSitePermissionsTest.kt    | 1 -
 .../java/org/mozilla/fenix/ui/SitePermissionsTest.kt       | 7 -------
 .../org/mozilla/fenix/ui/robots/SitePermissionsRobot.kt    | 4 ++--
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSitePermissionsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSitePermissionsTest.kt
index 8dcfdc573..3f6b57929 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSitePermissionsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSitePermissionsTest.kt
@@ -450,7 +450,6 @@ class SettingsSitePermissionsTest {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1923417
-    @Ignore("Flaky, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1829889")
     @Test
     fun verifyDRMControlledContentPermissionSettingsTest() {
         navigationToolbar {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SitePermissionsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SitePermissionsTest.kt
index d03c36f25..394638625 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SitePermissionsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SitePermissionsTest.kt
@@ -15,7 +15,6 @@ import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Assume.assumeTrue
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
@@ -98,7 +97,6 @@ class SitePermissionsTest {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2334294
-    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1815395")
     @Test
     fun blockAudioVideoPermissionRememberingTheDecisionTest() {
         assumeTrue(cameraManager.cameraIdList.isNotEmpty())
@@ -122,7 +120,6 @@ class SitePermissionsTest {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/251388
-    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1815395")
     @Test
     fun allowAudioVideoPermissionRememberingTheDecisionTest() {
         assumeTrue(cameraManager.cameraIdList.isNotEmpty())
@@ -164,7 +161,6 @@ class SitePermissionsTest {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2334190
-    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1815395")
     @Test
     fun blockMicrophonePermissionRememberingTheDecisionTest() {
         assumeTrue(micManager.microphones.isNotEmpty())
@@ -187,7 +183,6 @@ class SitePermissionsTest {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/251387
-    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1815395")
     @Test
     fun allowMicrophonePermissionRememberingTheDecisionTest() {
         assumeTrue(micManager.microphones.isNotEmpty())
@@ -228,7 +223,6 @@ class SitePermissionsTest {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2334077
-    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1815395")
     @Test
     fun blockCameraPermissionRememberingTheDecisionTest() {
         assumeTrue(cameraManager.cameraIdList.isNotEmpty())
@@ -251,7 +245,6 @@ class SitePermissionsTest {
     }
 
     // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/251386
-    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1815395")
     @Test
     fun allowCameraPermissionRememberingTheDecisionTest() {
         assumeTrue(cameraManager.cameraIdList.isNotEmpty())
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SitePermissionsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SitePermissionsRobot.kt
index 54a347fbf..40582b1d3 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SitePermissionsRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SitePermissionsRobot.kt
@@ -119,7 +119,7 @@ class SitePermissionsRobot {
 
     fun verifyDRMContentPermissionPrompt(url: String) {
         try {
-            assertUIObjectExists(itemWithText("Allow $url to store data in persistent storage?"))
+            assertUIObjectExists(itemWithText("Allow $url to play DRM-controlled content?"))
             assertItemTextEquals(denyPagePermissionButton, expectedText = "Don’t allow")
             assertItemTextEquals(allowPagePermissionButton, expectedText = "Allow")
         } catch (e: AssertionError) {
@@ -127,7 +127,7 @@ class SitePermissionsRobot {
             }.openThreeDotMenu {
             }.refreshPage {
             }.clickRequestDRMControlledContentAccessButton {
-                assertUIObjectExists(itemWithText("Allow $url to store data in persistent storage?"))
+                assertUIObjectExists(itemWithText("Allow $url to play DRM-controlled content?"))
                 assertItemTextEquals(denyPagePermissionButton, expectedText = "Don’t allow")
                 assertItemTextEquals(allowPagePermissionButton, expectedText = "Allow")
             }