Bug 1807302 - New set desktop site before page load UI tests

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

@@ -141,7 +141,7 @@ class ReaderViewTest {
             verifyReaderViewDetected(true)
         }.openThreeDotMenu {
             verifyReaderViewAppearance(false)
-        }.close { }
+        }.closeBrowserMenuToBrowser { }
     }
 
     @Test

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

@@ -11,6 +11,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule
+import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.ui.robots.homeScreen
 
 /**
@@ -138,4 +139,61 @@ class ThreeDotMenuMainTest {
             verifySettingsView()
         }
     }
+
+    @Test
+    fun setDesktopSiteBeforePageLoadTest() {
+        val webPage = TestAssetHelper.getGenericAsset(mockWebServer, 4)
+
+        homeScreen {
+        }.openThreeDotMenu {
+            verifyDesktopSiteModeEnabled(false)
+        }.switchDesktopSiteMode {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(webPage.url) {
+        }.openThreeDotMenu {
+            verifyDesktopSiteModeEnabled(true)
+        }.closeBrowserMenuToBrowser {
+            clickLinkMatchingText("Link 1")
+        }.openThreeDotMenu {
+            verifyDesktopSiteModeEnabled(true)
+        }.closeBrowserMenuToBrowser {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(webPage.url) {
+            longClickLink("Link 2")
+            clickContextOpenLinkInNewTab()
+            snackBarButtonClick()
+        }.openThreeDotMenu {
+            verifyDesktopSiteModeEnabled(false)
+        }
+    }
+
+    @Test
+    fun privateBrowsingSetDesktopSiteBeforePageLoadTest() {
+        val webPage = TestAssetHelper.getGenericAsset(mockWebServer, 4)
+
+        homeScreen {
+        }.togglePrivateBrowsingMode()
+
+        homeScreen {
+        }.openThreeDotMenu {
+            verifyDesktopSiteModeEnabled(false)
+        }.switchDesktopSiteMode {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(webPage.url) {
+        }.openThreeDotMenu {
+            verifyDesktopSiteModeEnabled(true)
+        }.closeBrowserMenuToBrowser {
+            clickLinkMatchingText("Link 1")
+        }.openThreeDotMenu {
+            verifyDesktopSiteModeEnabled(true)
+        }.closeBrowserMenuToBrowser {
+        }.openNavigationToolbar {
+        }.enterURLAndEnterToBrowser(webPage.url) {
+            longClickLink("Link 2")
+            clickContextOpenLinkInPrivateTab()
+            snackBarButtonClick()
+        }.openThreeDotMenu {
+            verifyDesktopSiteModeEnabled(false)
+        }
+    }
 }

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

@@ -274,14 +274,6 @@ class ThreeDotMenuMainRobot {
             return ShareOverlayRobot.Transition()
         }
 
-        fun close(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
-            // Close three dot
-            mDevice.pressBack()
-
-            HomeScreenRobot().interact()
-            return HomeScreenRobot.Transition()
-        }
-
         fun closeBrowserMenuToBrowser(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
             // Close three dot
             mDevice.pressBack()