From 1e7faa693fcb87fdac6e3432cde7eacb180cd62b Mon Sep 17 00:00:00 2001
From: Oana Horvath <oana.horvath@softvision.ro>
Date: Mon, 31 Aug 2020 15:55:58 +0300
Subject: [PATCH] Closes #14522: item 'Open link in apps' moved

---
 .../org/mozilla/fenix/ui/SettingsAdvancedTest.kt    |  2 ++
 .../org/mozilla/fenix/ui/SettingsPrivacyTest.kt     |  4 ----
 .../org/mozilla/fenix/ui/robots/SettingsRobot.kt    | 13 +++++++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt
index c0a87fe13..381cc9862 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt
@@ -52,6 +52,8 @@ class SettingsAdvancedTest {
             // ADVANCED
             verifyAdvancedHeading()
             verifyAddons()
+            verifyOpenLinksInAppsButton()
+            verifyOpenLinksInAppsSwitchDefault()
             verifyRemoteDebug()
             verifyLeakCanaryButton()
         }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt
index a963f5c51..a61808773 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt
@@ -147,10 +147,6 @@ class SettingsPrivacyTest {
             verifyNavigationToolBarHeader()
             verifyDataCollectionSubMenuItems()
         }.goBack {
-
-            // OPEN LINKS IN APPS
-            verifyOpenLinksInAppsButton()
-            verifyOpenLinksInAppsSwitchDefault()
         }.goBack {
             verifyHomeComponent()
         }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
index 073148cde..5976ed4ac 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
@@ -345,11 +345,16 @@ private fun assertDataCollectionButton() = onView(withText("Data collection"))
 
 private fun openLinksInAppsButton() = onView(withText("Open links in apps"))
 
-private fun assertOpenLinksInAppsButton() = openLinksInAppsButton()
-    .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+private fun assertOpenLinksInAppsButton() {
+    scrollToElementByText("Open links in apps")
+    openLinksInAppsButton()
+        .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+}
 
-private fun assertOpenLinksInAppsValue() = openLinksInAppsButton()
-    .assertIsEnabled(isEnabled = true)
+private fun assertOpenLinksInAppsValue() {
+    scrollToElementByText("Open links in apps")
+    openLinksInAppsButton().assertIsEnabled(isEnabled = true)
+}
 
 // DEVELOPER TOOLS SECTION
 private fun assertDeveloperToolsHeading() {