Merge branch 'main' into performance/mozilla-mobile#20634-remove-unus…

…ed-resources-part-1
jonalmeida · Sep 14, 2021 · 95ee20f · 95ee20f
2 parents 74b1364 + d33df2b
commit 95ee20f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt
@@ -364,6 +364,7 @@ class SettingsPrivacyTest {
         }.openThreeDotMenu {
         }.openSettings {
         }.openPrivateBrowsingSubMenu {
+            cancelPrivateShortcutAddition()
             addPrivateShortcutToHomescreen()
             verifyPrivateBrowsingShortcutIcon()
         }.openPrivateBrowsingShortcut {

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuPrivateBrowsingRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuPrivateBrowsingRobot.kt
@@ -51,6 +51,18 @@ class SettingsSubMenuPrivateBrowsingRobot {
 
     fun clickOpenLinksInPrivateTabSwitch() = openLinksInPrivateTabSwitch().click()
 
+    fun cancelPrivateShortcutAddition() {
+        mDevice.wait(
+            Until.findObject(text("Add private browsing shortcut")),
+            waitingTime
+        )
+        addPrivateBrowsingShortcutButton().click()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            mDevice.wait(Until.findObject(By.textContains("CANCEL")), waitingTime)
+            cancelShortcutAdditionButton().click()
+        }
+    }
+
     fun addPrivateShortcutToHomescreen() {
         mDevice.wait(
             Until.findObject(text("Add private browsing shortcut")),
@@ -105,6 +117,9 @@ private fun goBackButton() = onView(withContentDescription("Navigate up"))
 private fun addAutomaticallyButton() =
     mDevice.findObject(UiSelector().textStartsWith("add automatically"))
 
+private fun cancelShortcutAdditionButton() =
+    mDevice.findObject(UiSelector().textContains("CANCEL"))
+
 private fun privateBrowsingShortcutIcon() = mDevice.findObject(text("Private $appName"))
 
 private fun assertAddPrivateBrowsingShortcutButton() {