From 2b15591bc74e3ec2d05539a66a71673f399b6130 Mon Sep 17 00:00:00 2001 From: AndiAJ Date: Thu, 10 Aug 2023 16:59:54 +0300 Subject: [PATCH] Bug 1848142 - Homescreen TestRail matching --- .../mozilla/fenix/ui/ComposeHomeScreenTest.kt | 37 ++++++++++++++++--- .../mozilla/fenix/ui/ContextualHintsTest.kt | 15 -------- .../org/mozilla/fenix/ui/HomeScreenTest.kt | 21 ++++++++--- .../fenix/ui/robots/HomeScreenRobot.kt | 14 +++---- 4 files changed, 51 insertions(+), 36 deletions(-) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHomeScreenTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHomeScreenTest.kt index 4fa4e525f..bd180ecb7 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHomeScreenTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ComposeHomeScreenTest.kt @@ -60,6 +60,7 @@ class ComposeHomeScreenTest { mockWebServer.shutdown() } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/235396 @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1844580") @Test fun homeScreenItemsTest() { @@ -83,8 +84,9 @@ class ComposeHomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/244199 @Test - fun privateModeScreenItemsTest() { + fun privateBrowsingHomeScreenItemsTest() { homeScreen { }.dismissOnboarding() homeScreen { }.togglePrivateBrowsingMode() @@ -95,6 +97,7 @@ class ComposeHomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1364362 @Test fun verifyJumpBackInSectionTest() { activityTestRule.activityRule.applySettingsExceptions { @@ -145,9 +148,26 @@ class ComposeHomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1569867 + @Test + fun verifyJumpBackInContextualHintTest() { + activityTestRule.activityRule.applySettingsExceptions { + it.isJumpBackInCFREnabled = true + } + + val genericPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + + navigationToolbar { + }.enterURLAndEnterToBrowser(genericPage.url) { + }.goToHomescreen { + verifyJumpBackInMessage(activityTestRule) + } + } + + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2252509 @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1844580") @Test - fun verifyPocketHomepageStoriesTest() { + fun verifyPocketSectionTest() { activityTestRule.activityRule.applySettingsExceptions { it.isRecentTabsFeatureEnabled = false it.isRecentlyVisitedFeatureEnabled = false @@ -175,6 +195,7 @@ class ComposeHomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2252513 @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1844580") @Test fun openPocketStoryItemTest() { @@ -195,8 +216,9 @@ class ComposeHomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2252514 @Test - fun openPocketDiscoverMoreTest() { + fun pocketDiscoverMoreButtonTest() { activityTestRule.activityRule.applySettingsExceptions { it.isRecentTabsFeatureEnabled = false it.isRecentlyVisitedFeatureEnabled = false @@ -213,9 +235,10 @@ class ComposeHomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2252515 @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1844580") @Test - fun selectStoriesByTopicItemTest() { + fun selectPocketStoriesByTopicTest() { activityTestRule.activityRule.applySettingsExceptions { it.isRecentTabsFeatureEnabled = false it.isRecentlyVisitedFeatureEnabled = false @@ -231,8 +254,9 @@ class ComposeHomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2252516 @Test - fun verifyPocketLearnMoreLinkTest() { + fun pocketLearnMoreButtonTest() { activityTestRule.activityRule.applySettingsExceptions { it.isRecentTabsFeatureEnabled = false it.isRecentlyVisitedFeatureEnabled = false @@ -248,8 +272,9 @@ class ComposeHomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1569839 @Test - fun verifyCustomizeHomepageTest() { + fun verifyCustomizeHomepageButtonTest() { val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) navigationToolbar { diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextualHintsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextualHintsTest.kt index 5b0dc415a..1cc1db5b6 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextualHintsTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextualHintsTest.kt @@ -17,7 +17,6 @@ import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText import org.mozilla.fenix.helpers.MatcherHelper.itemWithDescription import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset import org.mozilla.fenix.helpers.TestHelper.getStringResource -import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.ui.robots.clickPageObject import org.mozilla.fenix.ui.robots.navigationToolbar @@ -51,20 +50,6 @@ class ContextualHintsTest { mockWebServer.shutdown() } - @Test - fun jumpBackInCFRTest() { - val genericPage = getGenericAsset(mockWebServer, 1) - - navigationToolbar { - }.enterURLAndEnterToBrowser(genericPage.url) { - verifyCookiesProtectionHintIsDisplayed(true) - // One back press to dismiss the TCP hint - mDevice.pressBack() - }.goToHomescreen { - verifyJumpBackInMessage() - } - } - @SmokeTest @Test fun openTotalCookieProtectionLearnMoreLinkTest() { diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt index eaa55e433..d215f7e28 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt @@ -55,6 +55,7 @@ class HomeScreenTest { mockWebServer.shutdown() } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/235396 @Test fun homeScreenItemsTest() { homeScreen {}.dismissOnboarding() @@ -77,8 +78,9 @@ class HomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/244199 @Test - fun privateModeScreenItemsTest() { + fun privateBrowsingHomeScreenItemsTest() { homeScreen { }.dismissOnboarding() homeScreen { }.togglePrivateBrowsingMode() @@ -89,6 +91,7 @@ class HomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1364362 @Test fun verifyJumpBackInSectionTest() { activityTestRule.activityRule.applySettingsExceptions { @@ -139,8 +142,9 @@ class HomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2252509 @Test - fun verifyPocketHomepageStoriesTest() { + fun verifyPocketSectionTest() { activityTestRule.activityRule.applySettingsExceptions { it.isRecentTabsFeatureEnabled = false it.isRecentlyVisitedFeatureEnabled = false @@ -168,6 +172,7 @@ class HomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2252513 @Test fun openPocketStoryItemTest() { activityTestRule.activityRule.applySettingsExceptions { @@ -187,8 +192,9 @@ class HomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2252514 @Test - fun openPocketDiscoverMoreTest() { + fun pocketDiscoverMoreButtonTest() { activityTestRule.activityRule.applySettingsExceptions { it.isRecentTabsFeatureEnabled = false it.isRecentlyVisitedFeatureEnabled = false @@ -205,8 +211,9 @@ class HomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2252515 @Test - fun selectStoriesByTopicItemTest() { + fun selectPocketStoriesByTopicTest() { activityTestRule.activityRule.applySettingsExceptions { it.isRecentTabsFeatureEnabled = false it.isRecentlyVisitedFeatureEnabled = false @@ -222,8 +229,9 @@ class HomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2252516 @Test - fun verifyPocketLearnMoreLinkTest() { + fun pocketLearnMoreButtonTest() { activityTestRule.activityRule.applySettingsExceptions { it.isRecentTabsFeatureEnabled = false it.isRecentlyVisitedFeatureEnabled = false @@ -239,8 +247,9 @@ class HomeScreenTest { } } + // TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/1569839 @Test - fun verifyCustomizeHomepageTest() { + fun verifyCustomizeHomepageButtonTest() { val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) navigationToolbar { diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt index d7311bf6b..eb0b88766 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt @@ -501,15 +501,11 @@ class HomeScreenRobot { } } - fun verifyJumpBackInMessage() { - assertTrue( - mDevice.findObject( - UiSelector().text( - getStringResource(R.string.onboarding_home_screen_jump_back_contextual_hint_2), - ), - ).waitForExists(waitingTime), - ) - } + fun verifyJumpBackInMessage(composeTestRule: ComposeTestRule) = + composeTestRule + .onNodeWithText( + getStringResource(R.string.onboarding_home_screen_jump_back_contextual_hint_2), + ).assertExists() fun getProvokingStoryPublisher(position: Int): String { val publisher = mDevice.findObject(