Bug 1853382 - SettingsAboutTest TestRail matching

app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAboutTest.kt

@@ -49,23 +49,22 @@ class SettingsAboutTest {
         mockWebServer.shutdown()
     }
 
-    // Walks through settings menu and sub-menus to ensure all items are present
+    // Walks through the About settings menu to ensure all items are present
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2092700
     @Test
-    fun settingsAboutItemsTest() {
+    fun verifyAboutSettingsItemsTest() {
-        // ABOUT
         homeScreen {
         }.openThreeDotMenu {
         }.openSettings {
-            // ABOUT
             verifyAboutHeading()
             verifyRateOnGooglePlay()
             verifyAboutFirefoxPreview()
         }
     }
 
-    // ABOUT
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/246966
     @Test
-    fun verifyRateOnGooglePlayRedirect() {
+    fun verifyRateOnGooglePlayButton() {
         activityIntentTestRule.applySettingsExceptions {
             it.isTCPCFREnabled = false
         }
@@ -81,8 +80,9 @@ class SettingsAboutTest {
         }
     }
 
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/246961
     @Test
-    fun verifyAboutFirefoxPreview() {
+    fun verifyAboutFirefoxMenuItems() {
         activityIntentTestRule.applySettingsExceptions {
             it.isJumpBackInCFREnabled = false
             it.isTCPCFREnabled = false
@@ -91,7 +91,7 @@ class SettingsAboutTest {
         }.openThreeDotMenu {
         }.openSettings {
         }.openAboutFirefoxPreview {
-            verifyAboutFirefoxPreview()
+            verifyAboutFirefoxPreviewInfo()
         }
     }
 }

app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt

@@ -35,7 +35,6 @@ import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.appName
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.packageName
-import org.mozilla.fenix.helpers.click
 import org.mozilla.fenix.settings.SupportUtils
 import java.text.SimpleDateFormat
 import java.time.LocalDateTime
@@ -48,8 +47,12 @@ import java.util.Date
  * Implementation of Robot Pattern for the settings search sub menu.
  */
 class SettingsSubMenuAboutRobot {
-
+    fun verifyAboutFirefoxPreviewInfo() {
-    fun verifyAboutFirefoxPreview() = assertFirefoxPreviewPage()
+        assertVersionNumber()
+        assertProductCompany()
+        assertCurrentTimestamp()
+        verifyTheLinksList()
+    }
 
     class Transition {
         fun goBack(interact: SettingsRobot.() -> Unit): SettingsRobot.Transition {
@@ -61,13 +64,6 @@ class SettingsSubMenuAboutRobot {
     }
 }
 
-private fun assertFirefoxPreviewPage() {
-    assertVersionNumber()
-    assertProductCompany()
-    assertCurrentTimestamp()
-    verifyListElements()
-}
-
 private fun navigateBackToAboutPage(itemToInteract: () -> Unit) {
     navigationToolbar {
     }.openThreeDotMenu {
@@ -77,7 +73,7 @@ private fun navigateBackToAboutPage(itemToInteract: () -> Unit) {
     }
 }
 
-private fun verifyListElements() {
+private fun verifyTheLinksList() {
     assertAboutToolbar()
     assertWhatIsNewInFirefoxPreview()
     navigateBackToAboutPage(::assertSupport)