Merge remote-tracking branch 'origin/fenix/119.0' into iceraven
@ -1,4 +1,4 @@
|
|||||||
[pytest]
|
[pytest]
|
||||||
addopts = --verbose --html=results/index.html --self-contained-html
|
addopts = --verbose --html=results/index.html --self-contained-html --variables=variables.yaml
|
||||||
log_cli = true
|
log_cli = true
|
||||||
log_cli_level = info
|
log_cli_level = info
|
||||||
|
@ -1,3 +1,12 @@
|
|||||||
def test_survey_navigates_correctly(setup_experiment, gradlewbuild):
|
import pytest
|
||||||
setup_experiment()
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("load_branches", [("branch")], indirect=True)
|
||||||
|
def test_survey_navigates_correctly(setup_experiment, gradlewbuild, load_branches):
|
||||||
|
setup_experiment(load_branches)
|
||||||
gradlewbuild.test("SurveyExperimentIntegrationTest#checkSurveyNavigatesCorrectly")
|
gradlewbuild.test("SurveyExperimentIntegrationTest#checkSurveyNavigatesCorrectly")
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("load_branches", [("branch")], indirect=True)
|
||||||
|
def test_survey_no_thanks_navigates_correctly(setup_experiment, gradlewbuild, load_branches):
|
||||||
|
setup_experiment(load_branches)
|
||||||
|
gradlewbuild.test("SurveyExperimentIntegrationTest#checkSurveyNoThanksNavigatesCorrectly")
|
||||||
|
@ -0,0 +1,3 @@
|
|||||||
|
urls:
|
||||||
|
stage_server: "https://stage.experimenter.nonprod.dataops.mozgcp.net"
|
||||||
|
prod_server: "https://experimenter.services.mozilla.com"
|
@ -0,0 +1,256 @@
|
|||||||
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
package org.mozilla.fenix.ui
|
||||||
|
|
||||||
|
import androidx.compose.ui.test.junit4.AndroidComposeTestRule
|
||||||
|
import androidx.test.platform.app.InstrumentationRegistry
|
||||||
|
import androidx.test.uiautomator.UiDevice
|
||||||
|
import okhttp3.mockwebserver.MockWebServer
|
||||||
|
import org.junit.After
|
||||||
|
import org.junit.Before
|
||||||
|
import org.junit.Rule
|
||||||
|
import org.junit.Test
|
||||||
|
import org.mozilla.fenix.R
|
||||||
|
import org.mozilla.fenix.customannotations.SmokeTest
|
||||||
|
import org.mozilla.fenix.helpers.AndroidAssetDispatcher
|
||||||
|
import org.mozilla.fenix.helpers.HomeActivityTestRule
|
||||||
|
import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
|
||||||
|
import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
|
||||||
|
import org.mozilla.fenix.helpers.TestHelper.generateRandomString
|
||||||
|
import org.mozilla.fenix.helpers.TestHelper.getStringResource
|
||||||
|
import org.mozilla.fenix.helpers.TestHelper.waitUntilSnackbarGone
|
||||||
|
import org.mozilla.fenix.ui.robots.browserScreen
|
||||||
|
import org.mozilla.fenix.ui.robots.homeScreenWithComposeTopSites
|
||||||
|
import org.mozilla.fenix.ui.robots.navigationToolbar
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests Top Sites functionality
|
||||||
|
*
|
||||||
|
* - Verifies 'Add to Firefox Home' UI functionality
|
||||||
|
* - Verifies 'Top Sites' context menu UI functionality
|
||||||
|
* - Verifies 'Top Site' usage UI functionality
|
||||||
|
* - Verifies existence of default top sites available on the home-screen
|
||||||
|
*/
|
||||||
|
|
||||||
|
class ComposeTopSitesTest {
|
||||||
|
private lateinit var mDevice: UiDevice
|
||||||
|
private lateinit var mockWebServer: MockWebServer
|
||||||
|
|
||||||
|
@get:Rule
|
||||||
|
val composeTestRule =
|
||||||
|
AndroidComposeTestRule(
|
||||||
|
HomeActivityTestRule.withDefaultSettingsOverrides(
|
||||||
|
composeTopSitesEnabled = true,
|
||||||
|
),
|
||||||
|
) { it.activity }
|
||||||
|
|
||||||
|
@Before
|
||||||
|
fun setUp() {
|
||||||
|
mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
|
||||||
|
mockWebServer = MockWebServer().apply {
|
||||||
|
dispatcher = AndroidAssetDispatcher()
|
||||||
|
start()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
fun tearDown() {
|
||||||
|
mockWebServer.shutdown()
|
||||||
|
}
|
||||||
|
|
||||||
|
@SmokeTest
|
||||||
|
@Test
|
||||||
|
fun verifyAddToFirefoxHome() {
|
||||||
|
val defaultWebPage = getGenericAsset(mockWebServer, 1)
|
||||||
|
|
||||||
|
navigationToolbar {
|
||||||
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
expandMenu()
|
||||||
|
verifyAddToShortcutsButton(true)
|
||||||
|
}.addToFirefoxHome {
|
||||||
|
verifySnackBarText(getStringResource(R.string.snackbar_added_to_shortcuts))
|
||||||
|
}.goToHomescreenWithComposeTopSites(composeTestRule) {
|
||||||
|
verifyExistingTopSitesList()
|
||||||
|
verifyExistingTopSiteItem(defaultWebPage.title)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun verifyOpenTopSiteNormalTab() {
|
||||||
|
val defaultWebPage = getGenericAsset(mockWebServer, 1)
|
||||||
|
|
||||||
|
navigationToolbar {
|
||||||
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
expandMenu()
|
||||||
|
verifyAddToShortcutsButton(true)
|
||||||
|
}.addToFirefoxHome {
|
||||||
|
verifySnackBarText(getStringResource(R.string.snackbar_added_to_shortcuts))
|
||||||
|
}.goToHomescreenWithComposeTopSites(composeTestRule) {
|
||||||
|
verifyExistingTopSitesList()
|
||||||
|
verifyExistingTopSiteItem(defaultWebPage.title)
|
||||||
|
}.openTopSiteTabWithTitle(title = defaultWebPage.title) {
|
||||||
|
verifyUrl(defaultWebPage.url.toString().replace("http://", ""))
|
||||||
|
}.goToHomescreenWithComposeTopSites(composeTestRule) {
|
||||||
|
verifyExistingTopSitesList()
|
||||||
|
verifyExistingTopSiteItem(defaultWebPage.title)
|
||||||
|
}.openContextMenuOnTopSitesWithTitle(defaultWebPage.title) {
|
||||||
|
verifyTopSiteContextMenuItems()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Dismiss context menu popup
|
||||||
|
mDevice.pressBack()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun verifyOpenTopSitePrivateTab() {
|
||||||
|
val defaultWebPage = getGenericAsset(mockWebServer, 1)
|
||||||
|
|
||||||
|
navigationToolbar {
|
||||||
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
expandMenu()
|
||||||
|
verifyAddToShortcutsButton(true)
|
||||||
|
}.addToFirefoxHome {
|
||||||
|
verifySnackBarText(getStringResource(R.string.snackbar_added_to_shortcuts))
|
||||||
|
}.goToHomescreenWithComposeTopSites(composeTestRule) {
|
||||||
|
verifyExistingTopSitesList()
|
||||||
|
verifyExistingTopSiteItem(defaultWebPage.title)
|
||||||
|
}.openContextMenuOnTopSitesWithTitle(defaultWebPage.title) {
|
||||||
|
verifyTopSiteContextMenuItems()
|
||||||
|
}.openTopSiteInPrivate() {
|
||||||
|
verifyCurrentPrivateSession(composeTestRule.activity.applicationContext)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun verifyRenameTopSite() {
|
||||||
|
val defaultWebPage = getGenericAsset(mockWebServer, 1)
|
||||||
|
val newPageTitle = generateRandomString(5)
|
||||||
|
|
||||||
|
navigationToolbar {
|
||||||
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
|
waitForPageToLoad()
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
expandMenu()
|
||||||
|
verifyAddToShortcutsButton(true)
|
||||||
|
}.addToFirefoxHome {
|
||||||
|
verifySnackBarText(getStringResource(R.string.snackbar_added_to_shortcuts))
|
||||||
|
}.goToHomescreenWithComposeTopSites(composeTestRule) {
|
||||||
|
verifyExistingTopSitesList()
|
||||||
|
verifyExistingTopSiteItem(defaultWebPage.title)
|
||||||
|
}.openContextMenuOnTopSitesWithTitle(defaultWebPage.title) {
|
||||||
|
verifyTopSiteContextMenuItems()
|
||||||
|
}.renameTopSite(newPageTitle) {
|
||||||
|
verifyExistingTopSitesList()
|
||||||
|
verifyExistingTopSiteItem(newPageTitle)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun verifyRemoveTopSite() {
|
||||||
|
val defaultWebPage = getGenericAsset(mockWebServer, 1)
|
||||||
|
|
||||||
|
navigationToolbar {
|
||||||
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
expandMenu()
|
||||||
|
verifyAddToShortcutsButton(true)
|
||||||
|
}.addToFirefoxHome {
|
||||||
|
verifySnackBarText(getStringResource(R.string.snackbar_added_to_shortcuts))
|
||||||
|
}.goToHomescreenWithComposeTopSites(composeTestRule) {
|
||||||
|
verifyExistingTopSitesList()
|
||||||
|
verifyExistingTopSiteItem(defaultWebPage.title)
|
||||||
|
}.openContextMenuOnTopSitesWithTitle(defaultWebPage.title) {
|
||||||
|
verifyTopSiteContextMenuItems()
|
||||||
|
}.removeTopSite {
|
||||||
|
verifyNotExistingTopSiteItem(defaultWebPage.title)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun verifyUndoRemoveTopSite() {
|
||||||
|
val defaultWebPage = getGenericAsset(mockWebServer, 1)
|
||||||
|
|
||||||
|
navigationToolbar {
|
||||||
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
expandMenu()
|
||||||
|
verifyAddToShortcutsButton(true)
|
||||||
|
}.addToFirefoxHome {
|
||||||
|
verifySnackBarText(getStringResource(R.string.snackbar_added_to_shortcuts))
|
||||||
|
}.goToHomescreenWithComposeTopSites(composeTestRule) {
|
||||||
|
verifyExistingTopSitesList()
|
||||||
|
verifyExistingTopSiteItem(defaultWebPage.title)
|
||||||
|
}.openContextMenuOnTopSitesWithTitle(defaultWebPage.title) {
|
||||||
|
verifyTopSiteContextMenuItems()
|
||||||
|
}.removeTopSite {
|
||||||
|
clickSnackbarButton("UNDO")
|
||||||
|
verifyExistingTopSiteItem(defaultWebPage.title)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun verifyRemoveTopSiteFromMainMenu() {
|
||||||
|
val defaultWebPage = getGenericAsset(mockWebServer, 1)
|
||||||
|
|
||||||
|
navigationToolbar {
|
||||||
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
expandMenu()
|
||||||
|
verifyAddToShortcutsButton(true)
|
||||||
|
}.addToFirefoxHome {
|
||||||
|
verifySnackBarText(getStringResource(R.string.snackbar_added_to_shortcuts))
|
||||||
|
}.goToHomescreenWithComposeTopSites(composeTestRule) {
|
||||||
|
verifyExistingTopSitesList()
|
||||||
|
verifyExistingTopSiteItem(defaultWebPage.title)
|
||||||
|
}.openTopSiteTabWithTitle(defaultWebPage.title) {
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
verifyRemoveFromShortcutsButton()
|
||||||
|
}.clickRemoveFromShortcuts {
|
||||||
|
}.goToHomescreenWithComposeTopSites(composeTestRule) {
|
||||||
|
verifyNotExistingTopSiteItem(defaultWebPage.title)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Expected for en-us defaults
|
||||||
|
@Test
|
||||||
|
fun verifyDefaultTopSitesList() {
|
||||||
|
homeScreenWithComposeTopSites(composeTestRule) {
|
||||||
|
verifyExistingTopSitesList()
|
||||||
|
val topSitesTitles = arrayListOf("Google", "Top Articles", "Wikipedia")
|
||||||
|
topSitesTitles.forEach { value ->
|
||||||
|
verifyExistingTopSiteItem(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SmokeTest
|
||||||
|
@Test
|
||||||
|
fun addAndRemoveMostViewedTopSiteTest() {
|
||||||
|
val defaultWebPage = getGenericAsset(mockWebServer, 1)
|
||||||
|
|
||||||
|
for (i in 0..1) {
|
||||||
|
navigationToolbar {
|
||||||
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
|
waitForPageToLoad()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
browserScreen {
|
||||||
|
}.goToHomescreenWithComposeTopSites(composeTestRule) {
|
||||||
|
verifyExistingTopSitesList()
|
||||||
|
verifyExistingTopSiteItem(defaultWebPage.title)
|
||||||
|
}.openContextMenuOnTopSitesWithTitle(defaultWebPage.title) {
|
||||||
|
}.deleteTopSiteFromHistory {
|
||||||
|
verifySnackBarText(getStringResource(R.string.snackbar_top_site_removed))
|
||||||
|
waitUntilSnackbarGone()
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
}.openHistory {
|
||||||
|
verifyEmptyHistoryView()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,203 +0,0 @@
|
|||||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
package org.mozilla.fenix.ui
|
|
||||||
|
|
||||||
import okhttp3.mockwebserver.MockWebServer
|
|
||||||
import org.junit.After
|
|
||||||
import org.junit.Before
|
|
||||||
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.MatcherHelper.itemContainingText
|
|
||||||
import org.mozilla.fenix.helpers.MatcherHelper.itemWithText
|
|
||||||
import org.mozilla.fenix.helpers.TestAssetHelper
|
|
||||||
import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
|
|
||||||
import org.mozilla.fenix.ui.robots.clickContextMenuItem
|
|
||||||
import org.mozilla.fenix.ui.robots.clickPageObject
|
|
||||||
import org.mozilla.fenix.ui.robots.homeScreen
|
|
||||||
import org.mozilla.fenix.ui.robots.longClickPageObject
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tests for verifying the main three dot menu options
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
class ThreeDotMenuMainTest {
|
|
||||||
private lateinit var mockWebServer: MockWebServer
|
|
||||||
|
|
||||||
@get:Rule
|
|
||||||
val activityTestRule = HomeActivityTestRule.withDefaultSettingsOverrides()
|
|
||||||
|
|
||||||
@Before
|
|
||||||
fun setUp() {
|
|
||||||
mockWebServer = MockWebServer().apply {
|
|
||||||
dispatcher = AndroidAssetDispatcher()
|
|
||||||
start()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@After
|
|
||||||
fun tearDown() {
|
|
||||||
mockWebServer.shutdown()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Verifies the list of items in the homescreen's 3 dot main menu
|
|
||||||
@Test
|
|
||||||
fun homeThreeDotMenuItemsTest() {
|
|
||||||
homeScreen {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
verifyHomeThreeDotMainMenuItems(isRequestDesktopSiteEnabled = false)
|
|
||||||
}.openBookmarks {
|
|
||||||
verifyBookmarksMenuView()
|
|
||||||
}.goBack {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.openHistory {
|
|
||||||
verifyHistoryMenuView()
|
|
||||||
}.goBack {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.openDownloadsManager {
|
|
||||||
verifyEmptyDownloadsList()
|
|
||||||
}.goBack {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.openAddonsManagerMenu {
|
|
||||||
verifyAddonsItems()
|
|
||||||
}.goBack {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.openSyncSignIn {
|
|
||||||
verifyTurnOnSyncMenu()
|
|
||||||
}.goBack {
|
|
||||||
// Desktop toggle
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.switchDesktopSiteMode {
|
|
||||||
}
|
|
||||||
homeScreen {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
verifyDesktopSiteModeEnabled(isRequestDesktopSiteEnabled = true)
|
|
||||||
}.openWhatsNew {
|
|
||||||
verifyWhatsNewURL()
|
|
||||||
}.goToHomescreen {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.openHelp {
|
|
||||||
verifyHelpUrl()
|
|
||||||
}.goToHomescreen {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.openCustomizeHome {
|
|
||||||
verifyHomePageView()
|
|
||||||
}.goBackToHomeScreen {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.openSettings {
|
|
||||||
verifySettingsView()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Verifies the list of items in the homescreen's 3 dot main menu in private browsing
|
|
||||||
@Test
|
|
||||||
fun privateHomeThreeDotMenuItemsTest() {
|
|
||||||
homeScreen {
|
|
||||||
}.togglePrivateBrowsingMode()
|
|
||||||
homeScreen {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
verifyHomeThreeDotMainMenuItems(isRequestDesktopSiteEnabled = false)
|
|
||||||
}.openBookmarks {
|
|
||||||
verifyBookmarksMenuView()
|
|
||||||
}.goBack {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.openHistory {
|
|
||||||
verifyHistoryMenuView()
|
|
||||||
}.goBack {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.openDownloadsManager {
|
|
||||||
verifyEmptyDownloadsList()
|
|
||||||
}.goBack {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.openAddonsManagerMenu {
|
|
||||||
verifyAddonsItems()
|
|
||||||
}.goBack {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.openSyncSignIn {
|
|
||||||
verifyTurnOnSyncMenu()
|
|
||||||
}.goBack {
|
|
||||||
// Desktop toggle
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.switchDesktopSiteMode {
|
|
||||||
}
|
|
||||||
homeScreen {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
verifyDesktopSiteModeEnabled(isRequestDesktopSiteEnabled = true)
|
|
||||||
}.openWhatsNew {
|
|
||||||
verifyWhatsNewURL()
|
|
||||||
}.goToHomescreen {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.openHelp {
|
|
||||||
verifyHelpUrl()
|
|
||||||
}.goToHomescreen {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.openCustomizeHome {
|
|
||||||
verifyHomePageView()
|
|
||||||
}.goBackToHomeScreen {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
}.openSettings {
|
|
||||||
verifySettingsView()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun setDesktopSiteBeforePageLoadTest() {
|
|
||||||
val webPage = TestAssetHelper.getGenericAsset(mockWebServer, 4)
|
|
||||||
|
|
||||||
homeScreen {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
verifyDesktopSiteModeEnabled(false)
|
|
||||||
}.switchDesktopSiteMode {
|
|
||||||
}.openNavigationToolbar {
|
|
||||||
}.enterURLAndEnterToBrowser(webPage.url) {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
verifyDesktopSiteModeEnabled(true)
|
|
||||||
}.closeBrowserMenuToBrowser {
|
|
||||||
clickPageObject(itemContainingText("Link 1"))
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
verifyDesktopSiteModeEnabled(true)
|
|
||||||
}.closeBrowserMenuToBrowser {
|
|
||||||
}.openNavigationToolbar {
|
|
||||||
}.enterURLAndEnterToBrowser(webPage.url) {
|
|
||||||
longClickPageObject(itemWithText("Link 2"))
|
|
||||||
clickContextMenuItem("Open link in new tab")
|
|
||||||
clickSnackbarButton("SWITCH")
|
|
||||||
}.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 {
|
|
||||||
clickPageObject(itemContainingText("Link 1"))
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
verifyDesktopSiteModeEnabled(true)
|
|
||||||
}.closeBrowserMenuToBrowser {
|
|
||||||
}.openNavigationToolbar {
|
|
||||||
}.enterURLAndEnterToBrowser(webPage.url) {
|
|
||||||
longClickPageObject(itemWithText("Link 2"))
|
|
||||||
clickContextMenuItem("Open link in private tab")
|
|
||||||
clickSnackbarButton("SWITCH")
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
verifyDesktopSiteModeEnabled(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -0,0 +1,164 @@
|
|||||||
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
package org.mozilla.fenix.ui.robots
|
||||||
|
|
||||||
|
import androidx.compose.ui.test.ExperimentalTestApi
|
||||||
|
import androidx.compose.ui.test.filter
|
||||||
|
import androidx.compose.ui.test.hasAnyChild
|
||||||
|
import androidx.compose.ui.test.hasTestTag
|
||||||
|
import androidx.compose.ui.test.hasText
|
||||||
|
import androidx.compose.ui.test.junit4.ComposeTestRule
|
||||||
|
import androidx.compose.ui.test.longClick
|
||||||
|
import androidx.compose.ui.test.onAllNodesWithTag
|
||||||
|
import androidx.compose.ui.test.onFirst
|
||||||
|
import androidx.compose.ui.test.onNodeWithTag
|
||||||
|
import androidx.compose.ui.test.performClick
|
||||||
|
import androidx.compose.ui.test.performScrollTo
|
||||||
|
import androidx.compose.ui.test.performTouchInput
|
||||||
|
import org.mozilla.fenix.helpers.HomeActivityComposeTestRule
|
||||||
|
import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
|
||||||
|
import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId
|
||||||
|
import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdContainingText
|
||||||
|
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
|
||||||
|
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
|
||||||
|
import org.mozilla.fenix.helpers.TestHelper.packageName
|
||||||
|
import org.mozilla.fenix.home.topsites.TopSitesTestTag
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of Robot Pattern for the Compose Top Sites.
|
||||||
|
*/
|
||||||
|
class ComposeTopSitesRobot(private val composeTestRule: HomeActivityComposeTestRule) {
|
||||||
|
|
||||||
|
fun verifyExistingTopSitesList() =
|
||||||
|
composeTestRule.onNodeWithTag(TopSitesTestTag.topSites).assertExists()
|
||||||
|
|
||||||
|
@OptIn(ExperimentalTestApi::class)
|
||||||
|
fun verifyExistingTopSiteItem(vararg titles: String) {
|
||||||
|
titles.forEach { title ->
|
||||||
|
composeTestRule.waitUntilAtLeastOneExists(hasText(title), waitingTime)
|
||||||
|
composeTestRule.topSiteItem(title).assertExists()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun verifyNotExistingTopSiteItem(vararg titles: String) {
|
||||||
|
titles.forEach { title ->
|
||||||
|
itemContainingText(title).waitForExists(waitingTime)
|
||||||
|
composeTestRule.topSiteItem(title).assertDoesNotExist()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun verifyTopSiteContextMenuItems() {
|
||||||
|
verifyTopSiteContextMenuOpenInPrivateTabButton()
|
||||||
|
verifyTopSiteContextMenuRemoveButton()
|
||||||
|
verifyTopSiteContextMenuRenameButton()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun verifyTopSiteContextMenuOpenInPrivateTabButton() {
|
||||||
|
composeTestRule.contextMenuItemOpenInPrivateTab().assertExists()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun verifyTopSiteContextMenuRenameButton() {
|
||||||
|
composeTestRule.contextMenuItemRename().assertExists()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun verifyTopSiteContextMenuRemoveButton() {
|
||||||
|
composeTestRule.contextMenuItemRemove().assertExists()
|
||||||
|
}
|
||||||
|
|
||||||
|
class Transition(private val composeTestRule: HomeActivityComposeTestRule) {
|
||||||
|
|
||||||
|
fun openTopSiteTabWithTitle(
|
||||||
|
title: String,
|
||||||
|
interact: BrowserRobot.() -> Unit,
|
||||||
|
): BrowserRobot.Transition {
|
||||||
|
composeTestRule.topSiteItem(title).performScrollTo().performClick()
|
||||||
|
|
||||||
|
BrowserRobot().interact()
|
||||||
|
return BrowserRobot.Transition()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun openTopSiteInPrivate(
|
||||||
|
interact: BrowserRobot.() -> Unit,
|
||||||
|
): BrowserRobot.Transition {
|
||||||
|
composeTestRule.contextMenuItemOpenInPrivateTab().performClick()
|
||||||
|
composeTestRule.waitForIdle()
|
||||||
|
|
||||||
|
BrowserRobot().interact()
|
||||||
|
return BrowserRobot.Transition()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun openContextMenuOnTopSitesWithTitle(
|
||||||
|
title: String,
|
||||||
|
interact: ComposeTopSitesRobot.() -> Unit,
|
||||||
|
): Transition {
|
||||||
|
composeTestRule.topSiteItem(title).performScrollTo().performTouchInput {
|
||||||
|
longClick()
|
||||||
|
}
|
||||||
|
|
||||||
|
ComposeTopSitesRobot(composeTestRule).interact()
|
||||||
|
return Transition(composeTestRule)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun renameTopSite(
|
||||||
|
title: String,
|
||||||
|
interact: ComposeTopSitesRobot.() -> Unit,
|
||||||
|
): Transition {
|
||||||
|
composeTestRule.contextMenuItemRename().performClick()
|
||||||
|
itemWithResId("$packageName:id/top_site_title")
|
||||||
|
.also {
|
||||||
|
it.waitForExists(waitingTimeShort)
|
||||||
|
it.setText(title)
|
||||||
|
}
|
||||||
|
itemWithResIdContainingText("android:id/button1", "OK").click()
|
||||||
|
|
||||||
|
ComposeTopSitesRobot(composeTestRule).interact()
|
||||||
|
return Transition(composeTestRule)
|
||||||
|
}
|
||||||
|
|
||||||
|
@OptIn(ExperimentalTestApi::class)
|
||||||
|
fun removeTopSite(
|
||||||
|
interact: ComposeTopSitesRobot.() -> Unit,
|
||||||
|
): Transition {
|
||||||
|
composeTestRule.contextMenuItemRemove().performClick()
|
||||||
|
composeTestRule.waitUntilDoesNotExist(hasTestTag(TopSitesTestTag.remove), waitingTime)
|
||||||
|
|
||||||
|
ComposeTopSitesRobot(composeTestRule).interact()
|
||||||
|
return Transition(composeTestRule)
|
||||||
|
}
|
||||||
|
|
||||||
|
@OptIn(ExperimentalTestApi::class)
|
||||||
|
fun deleteTopSiteFromHistory(
|
||||||
|
interact: BrowserRobot.() -> Unit,
|
||||||
|
): BrowserRobot.Transition {
|
||||||
|
composeTestRule.contextMenuItemRemove().performClick()
|
||||||
|
composeTestRule.waitUntilDoesNotExist(hasTestTag(TopSitesTestTag.remove), waitingTime)
|
||||||
|
|
||||||
|
BrowserRobot().interact()
|
||||||
|
return BrowserRobot.Transition()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Obtains the top site with the provided [title].
|
||||||
|
*/
|
||||||
|
private fun ComposeTestRule.topSiteItem(title: String) =
|
||||||
|
onAllNodesWithTag(TopSitesTestTag.topSiteItemRoot).filter(hasAnyChild(hasText(title))).onFirst()
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Obtains the option to open in private tab the top site
|
||||||
|
*/
|
||||||
|
private fun ComposeTestRule.contextMenuItemOpenInPrivateTab() =
|
||||||
|
onAllNodesWithTag(TopSitesTestTag.openInPrivateTab).onFirst()
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Obtains the option to rename the top site
|
||||||
|
*/
|
||||||
|
private fun ComposeTestRule.contextMenuItemRename() = onAllNodesWithTag(TopSitesTestTag.rename).onFirst()
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Obtains the option to remove the top site
|
||||||
|
*/
|
||||||
|
private fun ComposeTestRule.contextMenuItemRemove() = onAllNodesWithTag(TopSitesTestTag.remove).onFirst()
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 9.8 KiB After Width: | Height: | Size: 9.1 KiB |
Before Width: | Height: | Size: 9.8 KiB After Width: | Height: | Size: 8.4 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 66 KiB |
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 63 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 1.6 KiB |