Merge pull request #5070 from vector-im/feature/bma/test_screens

Test screens in the settings

vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt

@@ -69,12 +69,11 @@ class UiAllScreensSanityTest {
             preferences { crawl() }
             voiceAndVideo()
             ignoredUsers()
-            // TODO Test analytics
             securityAndPrivacy { crawl() }
             labs()
             advancedSettings { crawl() }
-            // TODO Rework this part (Legals, etc.)
+            helpAndAbout { crawl() }
-            // helpAndAbout { crawl() }
+            legals { crawl() }
         }
 
         elementRobot.newDirectMessage {

vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsHelpRobot.kt

@@ -16,10 +16,6 @@
 
 package im.vector.app.ui.robot.settings
 
-import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
-import com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton
-import im.vector.app.R
-
 class SettingsHelpRobot {
 
     fun crawl() {
@@ -34,7 +30,5 @@ class SettingsHelpRobot {
         clickOn(R.string.settings_privacy_policy)
         pressBack()
          */
-        clickOn(R.string.settings_third_party_notices)
-        clickDialogPositiveButton()
     }
 }

vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsLegalsRobot.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.ui.robot.settings
+
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton
+import im.vector.app.R
+
+class SettingsLegalsRobot {
+
+    fun crawl() {
+        clickOn(R.string.settings_third_party_notices)
+        clickDialogPositiveButton()
+    }
+}

vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt

@@ -64,4 +64,8 @@ class SettingsRobot {
     fun helpAndAbout(block: SettingsHelpRobot.() -> Unit) {
         clickOnAndGoBack(R.string.preference_root_help_about) { block(SettingsHelpRobot()) }
     }
+
+    fun legals(block: SettingsLegalsRobot.() -> Unit) {
+        clickOnAndGoBack(R.string.preference_root_legals) { block(SettingsLegalsRobot()) }
+    }
 }

vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt

@@ -33,5 +33,8 @@ class SettingsSecurityRobot {
         clickOnPreference(R.string.encryption_export_e2e_room_keys)
         pressBack()
          */
+
+        clickOnPreference(R.string.settings_opt_in_of_analytics)
+        Espresso.pressBack()
     }
 }