From b1b3ef89001f70923c2d1241ca7807ed4154ae1d Mon Sep 17 00:00:00 2001 From: Roger Yang Date: Mon, 24 Jul 2023 18:43:30 -0400 Subject: [PATCH] Bug 1830348 - Use do not intercept cache in app links interceptor (cherry picked from commit 04295bc67168afe3514dd195a91916527a197c00) --- .../mozilla/fenix/ui/SettingsAdvancedTest.kt | 55 +++++++++++++++++-- 1 file changed, 49 insertions(+), 6 deletions(-) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt index c63d7c595..d1b76d72c 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAdvancedTest.kt @@ -138,7 +138,7 @@ class SettingsAdvancedTest { // Assumes Youtube is installed and enabled @SmokeTest @Test - fun askBeforeOpeningLinkInAppTest() { + fun askBeforeOpeningLinkInAppCancelTest() { val defaultWebPage = TestAssetHelper.getExternalLinksAsset(mockWebServer) homeScreen { @@ -163,9 +163,29 @@ class SettingsAdvancedTest { clickPageObject(itemWithResIdAndText("android:id/button2", "CANCEL")) waitForPageToLoad() verifyUrl("youtube.com") - }.openTabDrawer { - closeTab() } + } + + // Assumes Youtube is installed and enabled + @SmokeTest + @Test + fun askBeforeOpeningLinkInAppOpenTest() { + val defaultWebPage = TestAssetHelper.getExternalLinksAsset(mockWebServer) + + homeScreen { + }.openThreeDotMenu { + }.openSettings { + verifyOpenLinksInAppsButton() + verifySettingsOptionSummary("Open links in apps", "Never") + }.openOpenLinksInAppsMenu { + verifyOpenLinksInAppsView("Never") + clickOpenLinkInAppOption("Ask before opening") + verifySelectedOpenLinksInAppOption("Ask before opening") + }.goBack { + verifySettingsOptionSummary("Open links in apps", "Ask before opening") + } + + exitMenu() navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) { @@ -180,7 +200,7 @@ class SettingsAdvancedTest { // Assumes Youtube is installed and enabled @SmokeTest @Test - fun privateBrowsingAskBeforeOpeningLinkInAppTest() { + fun privateBrowsingAskBeforeOpeningLinkInAppCancelTest() { val defaultWebPage = TestAssetHelper.getExternalLinksAsset(mockWebServer) homeScreen { @@ -208,9 +228,32 @@ class SettingsAdvancedTest { clickPageObject(itemWithResIdAndText("android:id/button2", "CANCEL")) waitForPageToLoad() verifyUrl("youtube.com") - }.openTabDrawer { - closeTab() } + } + + // Assumes Youtube is installed and enabled + @SmokeTest + @Test + fun privateBrowsingAskBeforeOpeningLinkInAppOpenTest() { + val defaultWebPage = TestAssetHelper.getExternalLinksAsset(mockWebServer) + + homeScreen { + }.togglePrivateBrowsingMode() + + homeScreen { + }.openThreeDotMenu { + }.openSettings { + verifyOpenLinksInAppsButton() + verifySettingsOptionSummary("Open links in apps", "Never") + }.openOpenLinksInAppsMenu { + verifyPrivateOpenLinksInAppsView("Never") + clickOpenLinkInAppOption("Ask before opening") + verifySelectedOpenLinksInAppOption("Ask before opening") + }.goBack { + verifySettingsOptionSummary("Open links in apps", "Ask before opening") + } + + exitMenu() navigationToolbar { }.enterURLAndEnterToBrowser(defaultWebPage.url) {