Bug 1857171 - Normal and private browsing TestRail matching

8 months ago · 8136b96237
parent f919ee7d84
commit 8136b96237
13 changed files with 81 additions and 112 deletions
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHistoryTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHistoryTest.kt
@ -417,4 +417,24 @@ class ComposeHistoryTest {
            verifySuggestionsAreNotDisplayed(activityTestRule, thirdWebPage.url.toString())
        }
    }
+
+    // Test running on beta/release builds in CI:
+    // caution when making changes to it, so they don't block the builds
+    @SmokeTest
+    @Test
+    fun noHistoryInPrivateBrowsingTest() {
+        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        homeScreen {
+        }.togglePrivateBrowsingMode()
+
+        homeScreen {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(website.url) {
+            mDevice.waitForIdle()
+        }.openThreeDotMenu {
+        }.openHistory {
+            verifyEmptyHistoryView()
+        }
+    }
 }
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeMediaNotificationTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeMediaNotificationTest.kt
@ -71,7 +71,7 @@ class ComposeMediaNotificationTest {

    @SmokeTest
    @Test
-    fun videoPlaybackSystemNotificationTest() {
+    fun verifyVideoPlaybackSystemNotificationTest() {
        val videoTestPage = TestAssetHelper.getVideoPageAsset(mockWebServer)

        navigationToolbar {
@ -105,7 +105,7 @@ class ComposeMediaNotificationTest {

    @SmokeTest
    @Test
-    fun audioPlaybackSystemNotificationTest() {
+    fun verifyAudioPlaybackSystemNotificationTest() {
        val audioTestPage = TestAssetHelper.getAudioPageAsset(mockWebServer)

        navigationToolbar {
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeSmokeTest.kt
@ -141,25 +141,6 @@ class ComposeSmokeTest {
        }
    }

-    // Test running on beta/release builds in CI:
-    // caution when making changes to it, so they don't block the builds
-    @Test
-    fun noHistoryInPrivateBrowsingTest() {
-        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        homeScreen {
-        }.togglePrivateBrowsingMode()
-
-        homeScreen {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(website.url) {
-            mDevice.waitForIdle()
-        }.openThreeDotMenu {
-        }.openHistory {
-            verifyEmptyHistoryView()
-        }
-    }
-
    @Test
    fun mainMenuInstallPWATest() {
        val pwaPage = "https://mozilla-mobile.github.io/testapp/"
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeTabbedBrowsingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeTabbedBrowsingTest.kt
@ -269,7 +269,7 @@ class ComposeTabbedBrowsingTest {

    @SmokeTest
    @Test
-    fun closePrivateTabsNotificationTest() {
+    fun verifyCloseAllPrivateTabsNotificationTest() {
        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)

        homeScreen {
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
@ -445,4 +445,25 @@ class HistoryTest {
            verifySuggestionsAreNotDisplayed(activityTestRule, thirdWebPage.url.toString())
        }
    }
+
+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/903590
+    // Test running on beta/release builds in CI:
+    // caution when making changes to it, so they don't block the builds
+    @SmokeTest
+    @Test
+    fun noHistoryInPrivateBrowsingTest() {
+        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
+
+        homeScreen {
+        }.togglePrivateBrowsingMode()
+
+        homeScreen {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(website.url) {
+            mDevice.waitForIdle()
+        }.openThreeDotMenu {
+        }.openHistory {
+            verifyEmptyHistoryView()
+        }
+    }
 }
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt
@ -62,9 +62,10 @@ class MediaNotificationTest {
        mockWebServer.shutdown()
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1347033
    @SmokeTest
    @Test
-    fun videoPlaybackSystemNotificationTest() {
+    fun verifyVideoPlaybackSystemNotificationTest() {
        val videoTestPage = TestAssetHelper.getVideoPageAsset(mockWebServer)

        navigationToolbar {
@ -96,9 +97,10 @@ class MediaNotificationTest {
        mDevice.pressBack()
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2316010
    @SmokeTest
    @Test
-    fun audioPlaybackSystemNotificationTest() {
+    fun verifyAudioPlaybackSystemNotificationTest() {
        val audioTestPage = TestAssetHelper.getAudioPageAsset(mockWebServer)

        navigationToolbar {
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivateBrowsingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivateBrowsingTest.kt
@ -14,6 +14,7 @@ import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.mDevice
+import org.mozilla.fenix.helpers.TestHelper.restartApp
 import org.mozilla.fenix.ui.robots.addToHomeScreen
 import org.mozilla.fenix.ui.robots.browserScreen
 import org.mozilla.fenix.ui.robots.homeScreen
@ -54,8 +55,9 @@ class SettingsPrivateBrowsingTest {
        }
    }

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

@ -82,8 +84,9 @@ class SettingsPrivateBrowsingTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/555776
    @Test
-    fun launchPageShortcutInPrivateModeTest() {
+    fun launchPageShortcutInPrivateBrowsingTest() {
        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)

        setOpenLinksInPrivateOn()
@ -100,9 +103,11 @@ class SettingsPrivateBrowsingTest {

        mDevice.waitForIdle()
        // We need to close the existing tab here, to open a different session
-        TestHelper.restartApp(activityTestRule)
+        restartApp(activityTestRule)
+
        browserScreen {
        }.openTabDrawer {
+            verifyNormalModeSelected()
            closeTab()
        }

@ -110,39 +115,15 @@ class SettingsPrivateBrowsingTest {
        }.searchAndOpenHomeScreenShortcut(pageShortcutName) {
        }.openTabDrawer {
            verifyPrivateModeSelected()
+            closeTab()
        }
-    }
-
-    @Test
-    fun launchLinksInPrivateToggleOffStateDoesntChangeTest() {
-        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        setOpenLinksInPrivateOn()
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-        }.openThreeDotMenu {
-            expandMenu()
-        }.openAddToHomeScreen {
-            addShortcutName(pageShortcutName)
-            clickAddShortcutButton()
-            clickAddAutomaticallyButton()
-        }.openHomeScreenShortcut(pageShortcutName) {
-        }.goToHomescreen { }

        setOpenLinksInPrivateOff()
-        TestHelper.restartApp(activityTestRule)
-        mDevice.waitForIdle()

        addToHomeScreen {
        }.searchAndOpenHomeScreenShortcut(pageShortcutName) {
        }.openTabDrawer {
            verifyNormalModeSelected()
-        }.closeTabDrawer {
-        }.openThreeDotMenu {
-        }.openSettings {
-        }.openPrivateBrowsingSubMenu {
-            verifyOpenLinksInPrivateTabOff()
        }
    }

--- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
@ -139,25 +139,6 @@ class SmokeTest {
        }
    }

-    // Test running on beta/release builds in CI:
-    // caution when making changes to it, so they don't block the builds
-    @Test
-    fun noHistoryInPrivateBrowsingTest() {
-        val website = TestAssetHelper.getGenericAsset(mockWebServer, 1)
-
-        homeScreen {
-        }.togglePrivateBrowsingMode()
-
-        homeScreen {
-        }.openNavigationToolbar {
-        }.enterURLAndEnterToBrowser(website.url) {
-            mDevice.waitForIdle()
-        }.openThreeDotMenu {
-        }.openHistory {
-            verifyEmptyHistoryView()
-        }
-    }
-
    @Test
    fun mainMenuInstallPWATest() {
        val pwaPage = "https://mozilla-mobile.github.io/testapp/"
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
@ -91,6 +91,7 @@ class TabbedBrowsingTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/233629
    @Test
    fun openNewPrivateTabTest() {
        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@ -256,9 +257,10 @@ class TabbedBrowsingTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/903592
    @SmokeTest
    @Test
-    fun closePrivateTabsNotificationTest() {
+    fun verifyCloseAllPrivateTabsNotificationTest() {
        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)

        homeScreen {
@ -397,6 +399,7 @@ class TabbedBrowsingTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/526244
    @Test
    fun privateModeStaysAsDefaultAfterRestartTest() {
        val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@ -415,6 +418,7 @@ class TabbedBrowsingTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2228470
    @SmokeTest
    @Test
    fun privateTabsDoNotPersistAfterClosingAppTest() {
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/WebControlsTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/WebControlsTest.kt
@ -56,21 +56,9 @@ class WebControlsTest {
        mockWebServer.shutdown()
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2316067
    @Test
-    fun cancelCalendarFormTest() {
-        val htmlControlsPage = getHTMLControlsFormAsset(mockWebServer)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(htmlControlsPage.url) {
-            clickPageObject(itemWithResId("calendar"))
-            clickPageObject(itemContainingText("CANCEL"))
-            clickPageObject(itemWithResId("submitDate"))
-            verifyNoDateIsSelected()
-        }
-    }
-
-    @Test
-    fun setAndClearCalendarFormTest() {
+    fun verifyCalendarFormInteractionsTest() {
        val currentDate = LocalDate.now()
        val currentDay = currentDate.dayOfMonth
        val currentMonth = currentDate.month
@ -79,6 +67,10 @@ class WebControlsTest {

        navigationToolbar {
        }.enterURLAndEnterToBrowser(htmlControlsPage.url) {
+            clickPageObject(itemWithResId("calendar"))
+            clickPageObject(itemContainingText("CANCEL"))
+            clickPageObject(itemWithResId("submitDate"))
+            verifyNoDateIsSelected()
            clickPageObject(itemWithResId("calendar"))
            clickPageObject(itemWithDescription("$currentDay $currentMonth $currentYear"))
            clickPageObject(itemContainingText("OK"))
@ -91,8 +83,9 @@ class WebControlsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2316069
    @Test
-    fun cancelClockFormTest() {
+    fun verifyClockFormInteractionsTest() {
        val htmlControlsPage = getHTMLControlsFormAsset(mockWebServer)

        navigationToolbar {
@ -101,15 +94,6 @@ class WebControlsTest {
            clickPageObject(itemContainingText("CANCEL"))
            clickPageObject(itemWithResId("submitTime"))
            verifyNoTimeIsSelected(hour, minute)
-        }
-    }
-
-    @Test
-    fun setAndClearClockFormTest() {
-        val htmlControlsPage = getHTMLControlsFormAsset(mockWebServer)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(htmlControlsPage.url) {
            clickPageObject(itemWithResId("clock"))
            selectTime(hour, minute)
            clickPageObject(itemContainingText("OK"))
@ -122,8 +106,9 @@ class WebControlsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2316068
    @Test
-    fun cancelColorFormTest() {
+    fun verifyColorPickerInteractionsTest() {
        val htmlControlsPage = getHTMLControlsFormAsset(mockWebServer)

        navigationToolbar {
@ -133,15 +118,6 @@ class WebControlsTest {
            clickPageObject(itemContainingText("CANCEL"))
            clickPageObject(itemWithResId("submitColor"))
            verifyColorIsNotSelected(colorHexValue)
-        }
-    }
-
-    @Test
-    fun setColorFormTest() {
-        val htmlControlsPage = getHTMLControlsFormAsset(mockWebServer)
-
-        navigationToolbar {
-        }.enterURLAndEnterToBrowser(htmlControlsPage.url) {
            clickPageObject(itemWithResId("colorPicker"))
            clickPageObject(itemWithDescription(colorHexValue))
            clickPageObject(itemContainingText("SET"))
@ -150,8 +126,9 @@ class WebControlsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2316070
    @Test
-    fun verifyDropdownMenuTest() {
+    fun verifyDropdownMenuInteractionsTest() {
        val htmlControlsPage = getHTMLControlsFormAsset(mockWebServer)

        navigationToolbar {
@ -163,8 +140,9 @@ class WebControlsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2316071
    @Test
-    fun emailLinkTest() {
+    fun verifyEmailLinkTest() {
        val externalLinksPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)

        navigationToolbar {
@ -175,8 +153,9 @@ class WebControlsTest {
        }
    }

+    // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/834205
    @Test
-    fun telephoneLinkTest() {
+    fun verifyTelephoneLinkTest() {
        val externalLinksPage = TestAssetHelper.getExternalLinksAsset(mockWebServer)

        navigationToolbar {
--- a/automation/taskcluster/androidTest/flank-arm-beta.yml
+++ b/automation/taskcluster/androidTest/flank-arm-beta.yml
@ -23,7 +23,7 @@ gcloud:
    - class org.mozilla.fenix.ui.HistoryTest#verifyHistoryMenuWithHistoryItemsTest
    - class org.mozilla.fenix.ui.SettingsSearchTest#verifyShowSearchSuggestionsToggleTest
    - class org.mozilla.fenix.ui.CollectionTest#deleteCollectionTest
-    - class org.mozilla.fenix.ui.SmokeTest#noHistoryInPrivateBrowsingTest
+    - class org.mozilla.fenix.ui.HistoryTest#noHistoryInPrivateBrowsingTest
    - class org.mozilla.fenix.ui.NoNetworkAccessStartupTests#noNetworkConnectionStartupTest

  device:
--- a/automation/taskcluster/androidTest/flank-arm-legacy-api-tests.yml
+++ b/automation/taskcluster/androidTest/flank-arm-legacy-api-tests.yml
@ -28,7 +28,7 @@ gcloud:
    - class org.mozilla.fenix.ui.HistoryTest#verifyHistoryMenuWithHistoryItemsTest
    - class org.mozilla.fenix.ui.SettingsSearchTest#verifyShowSearchSuggestionsToggleTest
    - class org.mozilla.fenix.ui.CollectionTest#deleteCollectionTest
-    - class org.mozilla.fenix.ui.SmokeTest#noHistoryInPrivateBrowsingTest
+    - class org.mozilla.fenix.ui.HistoryTest#noHistoryInPrivateBrowsingTest
    - class org.mozilla.fenix.ui.TabbedBrowsingTest#openNewTabTest
    - class org.mozilla.fenix.ui.TabbedBrowsingTest#openNewPrivateTabTest
    - class org.mozilla.fenix.ui.TopSitesTest#verifyOpenTopSiteNormalTab
--- a/automation/taskcluster/androidTest/flank-arm-start-test.yml
+++ b/automation/taskcluster/androidTest/flank-arm-start-test.yml
@ -23,7 +23,7 @@ gcloud:
   - class org.mozilla.fenix.ui.HistoryTest#verifyHistoryMenuWithHistoryItemsTest
   - class org.mozilla.fenix.ui.SettingsSearchTest#verifyShowSearchSuggestionsToggleTest
   - class org.mozilla.fenix.ui.CollectionTest#deleteCollectionTest
-   - class org.mozilla.fenix.ui.SmokeTest#noHistoryInPrivateBrowsingTest
+   - class org.mozilla.fenix.ui.HistoryTest#noHistoryInPrivateBrowsingTest
   - class org.mozilla.fenix.ui.NoNetworkAccessStartupTests#noNetworkConnectionStartupTest

  device: