Bug 1845039 - Create new UI Tests for Compose Top Sites
Since the old UI tests don't work for the new Compose Top Sites elements, new tests have been created.fenix/119.0
DreVla
10 months ago
committed by
mergify[bot]
parent
079347af06
commit
db09db8d2e
@ -0,0 +1,260 @@
|
||||
/* 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.RetryTestRule
|
||||
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 }
|
||||
|
||||
@get:Rule
|
||||
val retryTestRule = RetryTestRule(3)
|
||||
|
||||
@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()
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,171 @@
|
||||
/* 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 android.widget.EditText
|
||||
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 androidx.test.espresso.Espresso
|
||||
import androidx.test.espresso.action.ViewActions
|
||||
import androidx.test.espresso.matcher.ViewMatchers
|
||||
import org.hamcrest.CoreMatchers
|
||||
import org.hamcrest.Matchers
|
||||
import org.mozilla.fenix.R
|
||||
import org.mozilla.fenix.helpers.HomeActivityComposeTestRule
|
||||
import org.mozilla.fenix.helpers.MatcherHelper.itemContainingText
|
||||
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
|
||||
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 ->
|
||||
itemContainingText(title).waitForExists(waitingTime)
|
||||
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()
|
||||
Espresso.onView(
|
||||
Matchers.allOf(
|
||||
ViewMatchers.withId(R.id.top_site_title),
|
||||
CoreMatchers.instanceOf(EditText::class.java),
|
||||
),
|
||||
)
|
||||
.perform(ViewActions.replaceText(title))
|
||||
Espresso.onView(ViewMatchers.withId(android.R.id.button1))
|
||||
.perform((ViewActions.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()
|
||||
@ -0,0 +1,18 @@
|
||||
/* 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.home.topsites
|
||||
|
||||
internal object TopSitesTestTag {
|
||||
const val topSites = "top_sites_list"
|
||||
|
||||
const val topSiteItemRoot = "$topSites.top_site_item"
|
||||
const val topSiteTitle = "$topSiteItemRoot.top_site_title"
|
||||
|
||||
// Contextual/DropDown menu
|
||||
const val topSiteContextualMenu = "$topSites.top_site_contextual_menu"
|
||||
const val openInPrivateTab = "$topSiteContextualMenu.open_in_private_tab"
|
||||
const val rename = "$topSiteContextualMenu.rename"
|
||||
const val remove = "$topSiteContextualMenu.remove"
|
||||
}
|
||||
Loading…
Reference in New Issue