Bug 1850730 - General settings TestRail matching

2024-11-05 21:20:45 +00:00 · 2023-08-23 16:57:09 +03:00 · 2023-08-23 16:57:09 +03:00 · d2a78f37df
commit d2a78f37df
parent cd8e2bfb27
8 changed files with 138 additions and 238 deletions
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/AddressAutofillTest.kt
@ -41,6 +41,7 @@ class AddressAutofillTest {
        mockWebServer.shutdown()
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836845
    @SmokeTest
    @Test
    fun verifyAddressAutofillTest() {
@ -81,6 +82,7 @@ class AddressAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836856
    @SmokeTest
    @Test
    fun deleteSavedAddressTest() {
@ -111,6 +113,7 @@ class AddressAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836840
    @Test
    fun verifyAddAddressViewTest() {
        homeScreen {
@ -124,6 +127,7 @@ class AddressAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836841
    @Test
    fun verifyEditAddressViewTest() {
        homeScreen {
@ -149,6 +153,7 @@ class AddressAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836839
    @Test
    fun verifyAddressAutofillToggleTest() {
        val addressFormPage =
@ -196,6 +201,7 @@ class AddressAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836847
    @Test
    fun verifyManageAddressesPromptOptionTest() {
        val addressFormPage =
@ -234,9 +240,10 @@ class AddressAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836849
    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1814032")
    @Test
-    fun verifyAddressAutofillSelectionTest() {
+    fun verifyMultipleAddressesSelectionTest() {
        val addressFormPage =
            TestAssetHelper.getAddressFormAsset(mockWebServer)

@ -301,6 +308,7 @@ class AddressAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836850
    @Test
    fun verifySavedAddressCanBeEditedTest() {
        homeScreen {
@ -339,6 +347,7 @@ class AddressAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836848
    @Test
    fun verifyStateFieldUpdatesInAccordanceWithCountryFieldTest() {
        homeScreen {
@ -355,6 +364,7 @@ class AddressAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836858
    @Test
    fun verifyFormFieldCanBeFilledManuallyTest() {
        val addressFormPage =
@ -397,6 +407,7 @@ class AddressAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1836838
    @Test
    fun verifyAutofillAddressSectionTest() {
        homeScreen {
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSmokeTest.kt
@ -299,19 +299,4 @@ class ComposeSmokeTest {
            assertPlaybackState(browserStore, MediaSession.PlaybackState.PAUSED)
        }
    }
-
-    // For API>23
-    // Verifies the default browser switch opens the system default apps menu.
-    @Test
-    fun changeDefaultBrowserSetting() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-            verifyDefaultBrowserToggle(false)
-            clickDefaultBrowserSwitch()
-            verifyAndroidDefaultAppsMenuAppears()
-        }
-        // Dismiss the request
-        mDevice.pressBack()
-    }
 }
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/CreditCardAutofillTest.kt
@ -7,7 +7,6 @@ package org.mozilla.fenix.ui
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
@ -62,6 +61,7 @@ class CreditCardAutofillTest {
        mockWebServer.shutdown()
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512792
    @SmokeTest
    @Test
    fun verifyCreditCardAutofillTest() {
@ -99,6 +99,7 @@ class CreditCardAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512798
    @SmokeTest
    @Test
    fun deleteSavedCreditCardUsingToolbarButtonTest() {
@ -117,34 +118,15 @@ class CreditCardAutofillTest {
            clickSecuredCreditCardsLaterButton()
            clickSavedCreditCard()
            clickDeleteCreditCardToolbarButton()
+            clickCancelDeleteCreditCardButton()
+            verifyEditCreditCardToolbarTitle()
+            clickDeleteCreditCardToolbarButton()
            clickConfirmDeleteCreditCardButton()
            verifyAddCreditCardsButton()
        }
    }

-    @SmokeTest
-    @Test
-    fun cancelDeleteSavedCreditCardUsingToolbarButtonTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openAutofillSubMenu {
-            clickAddCreditCardButton()
-            fillAndSaveCreditCard(
-                MockCreditCard1.MOCK_CREDIT_CARD_NUMBER,
-                MockCreditCard1.MOCK_NAME_ON_CARD,
-                MockCreditCard1.MOCK_EXPIRATION_MONTH,
-                MockCreditCard1.MOCK_EXPIRATION_YEAR,
-            )
-            clickManageSavedCreditCardsButton()
-            clickSecuredCreditCardsLaterButton()
-            clickSavedCreditCard()
-            clickDeleteCreditCardToolbarButton()
-            clickCancelDeleteCreditCardButton()
-            verifyEditCreditCardToolbarTitle()
-        }
-    }
-
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2271192
    @SmokeTest
    @Test
    fun deleteSavedCreditCardUsingMenuButtonTest() {
@ -163,34 +145,15 @@ class CreditCardAutofillTest {
            clickSecuredCreditCardsLaterButton()
            clickSavedCreditCard()
            clickDeleteCreditCardMenuButton()
+            clickCancelDeleteCreditCardButton()
+            verifyEditCreditCardToolbarTitle()
+            clickDeleteCreditCardMenuButton()
            clickConfirmDeleteCreditCardButton()
            verifyAddCreditCardsButton()
        }
    }

-    @SmokeTest
-    @Test
-    fun cancelDeleteSavedCreditCardUsingMenuButtonTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openAutofillSubMenu {
-            clickAddCreditCardButton()
-            fillAndSaveCreditCard(
-                MockCreditCard1.MOCK_CREDIT_CARD_NUMBER,
-                MockCreditCard1.MOCK_NAME_ON_CARD,
-                MockCreditCard1.MOCK_EXPIRATION_MONTH,
-                MockCreditCard1.MOCK_EXPIRATION_YEAR,
-            )
-            clickManageSavedCreditCardsButton()
-            clickSecuredCreditCardsLaterButton()
-            clickSavedCreditCard()
-            clickDeleteCreditCardMenuButton()
-            clickCancelDeleteCreditCardButton()
-            verifyEditCreditCardToolbarTitle()
-        }
-    }
-
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512788
    @Test
    fun verifyCreditCardsSectionTest() {
        homeScreen {
@ -214,6 +177,7 @@ class CreditCardAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1859917
    @Test
    fun verifyManageCreditCardsPromptOptionTest() {
        val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)
@ -243,6 +207,7 @@ class CreditCardAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512790
    @Test
    fun verifyCreditCardsAutofillToggleTest() {
        val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)
@ -283,6 +248,7 @@ class CreditCardAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512795
    @Test
    fun verifyEditCardsViewTest() {
        homeScreen {
@ -318,6 +284,7 @@ class CreditCardAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512796
    @Test
    fun verifyEditedCardIsSavedTest() {
        val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)
@ -365,8 +332,9 @@ class CreditCardAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512797
    @Test
-    fun verifyCreditCardCannotBeSavedWithoutCardNumberTest() {
+    fun verifyCreditCardCannotBeSavedWithoutCardNumberOrNameTest() {
        homeScreen {
        }.openThreeDotMenu {
        }.openSettings {
@ -390,29 +358,7 @@ class CreditCardAutofillTest {
            clickSaveCreditCardToolbarButton()
            verifyEditCreditCardToolbarTitle()
            verifyCreditCardNumberErrorMessage()
-        }
-    }
-
-    @Test
-    fun verifyCreditCardCannotBeSavedWithoutNameOnCardTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openAutofillSubMenu {
-            verifyCreditCardsAutofillSection(true, false)
-            clickAddCreditCardButton()
-            fillAndSaveCreditCard(
-                MockCreditCard1.MOCK_CREDIT_CARD_NUMBER,
-                MockCreditCard1.MOCK_NAME_ON_CARD,
-                MockCreditCard1.MOCK_EXPIRATION_MONTH,
-                MockCreditCard1.MOCK_EXPIRATION_YEAR,
-            )
-            clickManageSavedCreditCardsButton()
-            clickSecuredCreditCardsLaterButton()
-            verifySavedCreditCardsSection(
-                MockCreditCard1.MOCK_LAST_CARD_DIGITS,
-                MockCreditCard1.MOCK_EXPIRATION_MONTH_AND_YEAR,
-            )
+        }.goBackToSavedCreditCards {
            clickSavedCreditCard()
            clearNameOnCreditCard()
            clickSaveCreditCardToolbarButton()
@ -421,8 +367,9 @@ class CreditCardAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512794
    @Test
-    fun verifyMultipleCreditCardsCanBeSavedTest() {
+    fun verifyMultipleCreditCardsCanBeAddedTest() {
        val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)

        homeScreen {
@ -476,8 +423,9 @@ class CreditCardAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2271304
    @Test
-    fun verifyDoNotSaveCreditCardFromFormTest() {
+    fun verifyDoNotSaveCreditCardFromPromptTest() {
        val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)

        navigationToolbar {
@ -496,8 +444,9 @@ class CreditCardAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1779194
    @Test
-    fun verifySaveCreditCardFromFormTest() {
+    fun verifySaveCreditCardFromPromptTest() {
        val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)

        navigationToolbar {
@ -522,6 +471,7 @@ class CreditCardAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2271305
    @Test
    fun verifyCancelCreditCardUpdatePromptTest() {
        val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)
@ -572,6 +522,7 @@ class CreditCardAutofillTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1779195
    @Test
    fun verifyConfirmCreditCardUpdatePromptTest() {
        val creditCardFormPage = TestAssetHelper.getCreditCardFormAsset(mockWebServer)
@ -622,35 +573,9 @@ class CreditCardAutofillTest {
        }
    }

-    @Ignore("Failing, see https://bugzilla.mozilla.org/show_bug.cgi?id=1847774")
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1512791
    @Test
-    fun verifySavedCreditCardsRedirectionToAutofillAfterInterruptionTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openAutofillSubMenu {
-            verifyCreditCardsAutofillSection(true, false)
-            clickAddCreditCardButton()
-            fillAndSaveCreditCard(
-                MockCreditCard1.MOCK_CREDIT_CARD_NUMBER,
-                MockCreditCard1.MOCK_NAME_ON_CARD,
-                MockCreditCard1.MOCK_EXPIRATION_MONTH,
-                MockCreditCard1.MOCK_EXPIRATION_YEAR,
-            )
-            clickManageSavedCreditCardsButton()
-            clickSecuredCreditCardsLaterButton()
-            verifySavedCreditCardsSection(
-                MockCreditCard1.MOCK_LAST_CARD_DIGITS,
-                MockCreditCard1.MOCK_EXPIRATION_MONTH_AND_YEAR,
-            )
-            putAppToBackground()
-            bringAppToForeground()
-            verifyAutofillToolbarTitle()
-        }
-    }
-
-    @Test
-    fun verifyEditCreditCardRedirectionToAutofillAfterInterruptionTest() {
+    fun verifyCreditCardRedirectionsToAutofillSectionAfterInterruptionTest() {
        homeScreen {
        }.openThreeDotMenu {
        }.openSettings {
@ -669,6 +594,14 @@ class CreditCardAutofillTest {
            putAppToBackground()
            bringAppToForeground()
            verifyAutofillToolbarTitle()
+            clickManageSavedCreditCardsButton()
+            verifySavedCreditCardsSection(
+                MockCreditCard1.MOCK_LAST_CARD_DIGITS,
+                MockCreditCard1.MOCK_EXPIRATION_MONTH_AND_YEAR,
+            )
+            putAppToBackground()
+            bringAppToForeground()
+            verifyAutofillToolbarTitle()
        }
    }
 }
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/LoginsTest.kt
@ -67,6 +67,7 @@ class LoginsTest {
        mockWebServer.shutdown()
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2092713
    // Tests the Logins and passwords menu items and default values
    @Test
    fun loginsAndPasswordsSettingsItemsTest() {
@ -82,10 +83,11 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/517816
    // Tests only for initial state without signing in.
    // For tests after signing in, see SyncIntegration test suite
    @Test
-    fun savedLoginsMenuItemsTest() {
+    fun verifySavedLoginsListTest() {
        homeScreen {
        }.openThreeDotMenu {
        }.openSettings {
@ -101,8 +103,9 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2092925
    @Test
-    fun syncLoginsMenuItemsTest() {
+    fun verifySyncLoginsOptionsTest() {
        homeScreen {
        }.openThreeDotMenu {
        }.openSettings {
@ -115,8 +118,12 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/523839
    @Test
-    fun saveLoginsAndPasswordsOptionsItemsTest() {
+    fun saveLoginFromPromptTest() {
+        val saveLoginTest =
+            TestAssetHelper.getSaveLoginAsset(mockWebServer)
+
        homeScreen {
        }.openThreeDotMenu {
        }.openSettings {
@ -124,12 +131,8 @@ class LoginsTest {
        }.openSaveLoginsAndPasswordsOptions {
            verifySaveLoginsOptionsView()
        }
-    }

-    @Test
-    fun saveLoginFromPromptTest() {
-        val saveLoginTest =
-            TestAssetHelper.getSaveLoginAsset(mockWebServer)
+        exitMenu()

        navigationToolbar {
        }.enterURLAndEnterToBrowser(saveLoginTest.url) {
@ -152,8 +155,9 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/960412
    @Test
-    fun openWebsiteForSavedLoginTest() {
+    fun openLoginWebsiteInBrowserTest() {
        val loginPage = "https://mozilla-mobile.github.io/testapp/loginForm"
        val originWebsite = "mozilla-mobile.github.io"
        val userName = "test"
@ -179,6 +183,7 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/517817
    @Test
    fun neverSaveLoginFromPromptTest() {
        val saveLoginTest = TestAssetHelper.getSaveLoginAsset(mockWebServer)
@ -206,9 +211,10 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1508171
    @SmokeTest
    @Test
-    fun updateSavedLoginTest() {
+    fun verifyUpdatedLoginIsSavedTest() {
        val saveLoginTest =
            TestAssetHelper.getSaveLoginAsset(mockWebServer)

@ -241,6 +247,7 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1049971
    @SmokeTest
    @Test
    fun verifyMultipleLoginsSelectionsTest() {
@ -277,6 +284,7 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/875849
    @Test
    fun verifyEditLoginsViewTest() {
        val loginPage = "https://mozilla-mobile.github.io/testapp/loginForm"
@ -305,6 +313,7 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/875851
    @Test
    fun verifyEditedLoginsAreSavedTest() {
        val loginPage = "https://mozilla-mobile.github.io/testapp/v2.0/loginForm.html"
@ -342,6 +351,7 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2266452
    @Test
    fun verifyLoginWithNoUserNameCanNotBeSavedTest() {
        val loginPage = "https://mozilla-mobile.github.io/testapp/loginForm"
@ -371,6 +381,7 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2266453
    @Test
    fun verifyLoginWithoutPasswordCanNotBeSavedTest() {
        val loginPage = "https://mozilla-mobile.github.io/testapp/loginForm"
@ -401,6 +412,7 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/876531
    @Test
    fun verifyEditModeDismissalDoesNotSaveLoginCredentialsTest() {
        val loginPage = "https://mozilla-mobile.github.io/testapp/loginForm"
@ -431,6 +443,7 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/876532
    @Test
    fun verifyDeleteLoginButtonTest() {
        val loginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer)
@ -461,6 +474,7 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/517818
    @SmokeTest
    @Test
    fun verifyNeverSaveLoginOptionTest() {
@ -484,6 +498,7 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/517819
    @Test
    fun verifyAutofillToggleTest() {
        val loginPage = "https://mozilla-mobile.github.io/testapp/v2.0/loginForm.html"
@ -524,9 +539,10 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/593768
    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1812995")
    @Test
-    fun verifyLoginIsNotUpdatedTest() {
+    fun doNotSaveOptionWillNotUpdateALoginTest() {
        val loginPage = "https://mozilla-mobile.github.io/testapp/v2.0/loginForm.html"
        val originWebsite = "mozilla-mobile.github.io"

@ -572,6 +588,7 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2090455
    @Test
    fun searchLoginsByUsernameTest() {
        val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer)
@ -618,6 +635,7 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/608834
    @Test
    fun searchLoginsByUrlTest() {
        val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer)
@ -664,6 +682,7 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2266441
    @Test
    fun verifyLastUsedLoginSortingOptionTest() {
        val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer)
@ -710,6 +729,7 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2266442
    @Test
    fun verifyAlphabeticalLoginSortingOptionTest() {
        val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer)
@ -754,6 +774,7 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1518435
    @Test
    fun verifyAddLoginManuallyTest() {
        val loginPage = "https://mozilla-mobile.github.io/testapp/v2.0/loginForm.html"
@ -792,8 +813,9 @@ class LoginsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2068215
    @Test
-    fun verifyCopyUsernameTest() {
+    fun verifyCopyLoginCredentialsToClipboardTest() {
        val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer)

        navigationToolbar {
@ -809,24 +831,6 @@ class LoginsTest {
            viewSavedLoginDetails("test@example.com")
            clickCopyUserNameButton()
            verifySnackBarText("Username copied to clipboard")
-        }
-    }
-
-    @Test
-    fun verifyCopyPasswordTest() {
-        val firstLoginPage = TestAssetHelper.getSaveLoginAsset(mockWebServer)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(firstLoginPage.url) {
-            clickSubmitLoginButton()
-            verifySaveLoginPromptIsDisplayed()
-            clickPageObject(itemWithText("Save"))
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openLoginsAndPasswordSubMenu {
-        }.openSavedLogins {
-            tapSetupLater()
-            viewSavedLoginDetails("test@example.com")
            clickCopyPasswordButton()
            verifySnackBarText("Password copied to clipboard")
        }
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsCustomizeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsCustomizeTest.kt
@ -49,8 +49,9 @@ class SettingsCustomizeTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/344212
    @Test
-    fun changeThemeSettingTest() {
+    fun changeThemeOfTheAppTest() {
        // Goes through the settings and changes the default search engine, then verifies it changes.
        homeScreen {
        }.openThreeDotMenu {
@ -64,6 +65,7 @@ class SettingsCustomizeTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/466571
    @Test
    fun setToolbarPositionTest() {
        homeScreen {
@ -88,8 +90,9 @@ class SettingsCustomizeTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1058682
    @Test
-    fun swipeToolbarGesturePreferenceOffTest() {
+    fun turnOffSwipeToSwitchTabsPreferenceTest() {
        val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
        val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)

@ -114,6 +117,7 @@ class SettingsCustomizeTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1992289
    @Test
    fun pullToRefreshPreferenceTest() {
        homeScreen {
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsGeneralTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsGeneralTest.kt
@ -53,8 +53,9 @@ class SettingsGeneralTest {
        mockWebServer.shutdown()
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2092697
    @Test
-    fun settingsGeneralItemsTests() {
+    fun verifyGeneralSettingsItemsTest() {
        homeScreen {
        }.openThreeDotMenu {
        }.openSettings {
@ -76,9 +77,10 @@ class SettingsGeneralTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/344213
    @SmokeTest
    @Test
-    fun changeAccessibiltySettings() {
+    fun verifyFontSizingChangeTest() {
        // Goes through the settings and changes the default text on a webpage, then verifies if the text has changed.
        val fenixApp = activityIntentTestRule.activity.applicationContext as FenixApplication
        val webpage = getLoremIpsumAsset(mockWebServer).url
@ -107,9 +109,10 @@ class SettingsGeneralTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/516079
    @SmokeTest
    @Test
-    fun switchLanguageTest() {
+    fun setAppLanguageDifferentThanSystemLanguageTest() {
        val enLanguageHeaderText = getStringResource(R.string.preferences_language)

        homeScreen {
@ -132,6 +135,7 @@ class SettingsGeneralTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/516080
    @Test
    fun searchInLanguagesListTest() {
        val systemLocaleDefault = getStringResource(R.string.default_locale_text)
@ -153,10 +157,11 @@ class SettingsGeneralTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/516078
    // Because it requires changing system prefs, this test will run only on Debug builds
    @Ignore("Failing due to app translation bug, see: https://github.com/mozilla-mobile/fenix/issues/26729")
    @Test
-    fun frenchSystemLocaleTest() {
+    fun verifyFollowDeviceLanguageTest() {
        val frenchLocale = Locale("fr", "FR")

        runWithSystemLocaleChanged(frenchLocale, activityIntentTestRule) {
@ -172,47 +177,18 @@ class SettingsGeneralTest {
        }
    }

-    @SmokeTest
-    @Test
-    fun verifyHomepageOptionSummaryUpdatesTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-            verifySettingsOptionSummary("Homepage", "Open on homepage after four hours")
-        }.openHomepageSubMenu {
-            verifySelectedOpeningScreenOption("Homepage after four hours of inactivity")
-            clickOpeningScreenOption("Homepage")
-            verifySelectedOpeningScreenOption("Homepage")
-        }.goBack {
-            verifySettingsOptionSummary("Homepage", "Open on homepage")
-        }.openHomepageSubMenu {
-            clickOpeningScreenOption("Last tab")
-            verifySelectedOpeningScreenOption("Last tab")
-        }.goBack {
-            verifySettingsOptionSummary("Homepage", "Open on last tab")
-        }
-    }
-
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1360557
    @Test
    fun tabsSettingsMenuItemsTest() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openTabsSubMenu {
-            verifyTabViewOptions()
-            verifyCloseTabsOptions()
-            verifyMoveOldTabsToInactiveOptions()
-        }
-    }
-
-    @Test
-    fun verifyTabsOptionSummaryUpdatesTest() {
        homeScreen {
        }.openThreeDotMenu {
        }.openSettings {
            verifyTabsButton()
            verifySettingsOptionSummary("Tabs", "Close manually")
        }.openTabsSubMenu {
+            verifyTabViewOptions()
+            verifyCloseTabsOptions()
+            verifyMoveOldTabsToInactiveOptions()
            verifySelectedCloseTabsOption("Never")
            clickClosedTabsOption("After one day")
            verifySelectedCloseTabsOption("After one day")
@ -230,4 +206,21 @@ class SettingsGeneralTest {
            verifySettingsOptionSummary("Tabs", "Close after one month")
        }
    }
+
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/243583
+    // For API>23
+    // Verifies the default browser switch opens the system default apps menu.
+    @SmokeTest
+    @Test
+    fun changeDefaultBrowserSetting() {
+        homeScreen {
+        }.openThreeDotMenu {
+        }.openSettings {
+            verifyDefaultBrowserToggle(false)
+            clickDefaultBrowserSwitch()
+            verifyAndroidDefaultAppsMenuAppears()
+        }
+        // Dismiss the request
+        mDevice.pressBack()
+    }
 }
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHomepageTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsHomepageTest.kt
@ -49,6 +49,7 @@ class SettingsHomepageTest {
        mockWebServer.shutdown()
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1564843
    @Test
    fun verifyHomepageSettingsTest() {
        homeScreen {
@ -59,6 +60,7 @@ class SettingsHomepageTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1564859
    @Test
    fun verifyShortcutOptionTest() {
        // en-US defaults
@ -90,6 +92,7 @@ class SettingsHomepageTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1565003
    @Test
    fun verifyRecentlyVisitedOptionTest() {
        activityIntentTestRule.applySettingsExceptions {
@ -109,26 +112,7 @@ class SettingsHomepageTest {
        }
    }

-    @Test
-    fun verifyPocketOptionTest() {
-        activityIntentTestRule.applySettingsExceptions {
-            it.isRecentTabsFeatureEnabled = false
-            it.isRecentlyVisitedFeatureEnabled = false
-        }
-        val genericURL = getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(genericURL.url) {
-        }.goToHomescreen {
-            verifyPocketSectionIsDisplayed()
-        }.openThreeDotMenu {
-        }.openCustomizeHome {
-            clickPocketButton()
-        }.goBackToHomeScreen {
-            verifyPocketSectionIsNotDisplayed()
-        }
-    }
-
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1564999
    @SmokeTest
    @Test
    fun jumpBackInOptionTest() {
@ -146,6 +130,7 @@ class SettingsHomepageTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1565000
    @SmokeTest
    @Test
    fun recentBookmarksOptionTest() {
@ -165,48 +150,47 @@ class SettingsHomepageTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1569831
    @SmokeTest
    @Test
-    fun startOnHomepageTest() {
+    fun verifyOpeningScreenOptionsTest() {
        val genericURL = getGenericAsset(mockWebServer, 1)

        navigationToolbar {
        }.enterURLAndEnterToBrowser(genericURL.url) {
        }.openThreeDotMenu {
        }.openSettings {
+            verifySettingsOptionSummary("Homepage", "Open on homepage after four hours")
        }.openHomepageSubMenu {
+            verifySelectedOpeningScreenOption("Homepage after four hours of inactivity")
            clickOpeningScreenOption("Homepage")
+            verifySelectedOpeningScreenOption("Homepage")
        }

        restartApp(activityIntentTestRule)

        homeScreen {
            verifyHomeScreen()
-        }
-    }
-
-    @SmokeTest
-    @Test
-    fun startOnLastTabTest() {
-        val firstWebPage = getGenericAsset(mockWebServer, 1)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(firstWebPage.url) {
-        }.goToHomescreen {
        }.openThreeDotMenu {
-        }.openCustomizeHome {
+        }.openSettings {
+            verifySettingsOptionSummary("Homepage", "Open on homepage")
+        }.openHomepageSubMenu {
            clickOpeningScreenOption("Last tab")
+            verifySelectedOpeningScreenOption("Last tab")
+        }.goBack {
+            verifySettingsOptionSummary("Homepage", "Open on last tab")
        }

        restartApp(activityIntentTestRule)

        browserScreen {
-            verifyUrl(firstWebPage.url.toString())
+            verifyUrl(genericURL.url.toString())
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1569843
    @Test
-    fun ignoreStartOnHomeWhenLaunchedByExternalLinkTest() {
+    fun verifyOpeningScreenAfterLaunchingExternalLinkTest() {
        val genericPage = getGenericAsset(mockWebServer, 1)

        homeScreen {
@ -230,9 +214,10 @@ class SettingsHomepageTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1676359
    @Ignore("Intermittent test: https://github.com/mozilla-mobile/fenix/issues/26559")
    @Test
-    fun setWallpaperTest() {
+    fun verifyWallpaperChangeTest() {
        val wallpapers = listOf(
            "Wallpaper Item: amethyst",
            "Wallpaper Item: cerulean",
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
@ -295,19 +295,4 @@ class SmokeTest {
            assertPlaybackState(browserStore, MediaSession.PlaybackState.PAUSED)
        }
    }
-
-    // For API>23
-    // Verifies the default browser switch opens the system default apps menu.
-    @Test
-    fun changeDefaultBrowserSetting() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openSettings {
-            verifyDefaultBrowserToggle(false)
-            clickDefaultBrowserSwitch()
-            verifyAndroidDefaultAppsMenuAppears()
-        }
-        // Dismiss the request
-        mDevice.pressBack()
-    }
 }