Bug 1841143 - Convert `CollectionTest` to support Tabs Tray rewrite
Noah Bond
11 months ago
committed by
mergify[bot]
parent
41b5b60608
commit
14d036e6d7
@ -0,0 +1,501 @@
|
||||
/* 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.customannotations.SmokeTest
|
||||
import org.mozilla.fenix.helpers.AndroidAssetDispatcher
|
||||
import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
|
||||
import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
|
||||
import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
|
||||
import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
|
||||
import org.mozilla.fenix.ui.robots.browserScreen
|
||||
import org.mozilla.fenix.ui.robots.collectionRobot
|
||||
import org.mozilla.fenix.ui.robots.composeTabDrawer
|
||||
import org.mozilla.fenix.ui.robots.homeScreen
|
||||
import org.mozilla.fenix.ui.robots.navigationToolbar
|
||||
|
||||
/**
|
||||
* Tests for verifying basic functionality of tab collections
|
||||
*
|
||||
*/
|
||||
|
||||
class ComposeCollectionTest {
|
||||
private lateinit var mDevice: UiDevice
|
||||
private lateinit var mockWebServer: MockWebServer
|
||||
private val firstCollectionName = "testcollection_1"
|
||||
private val secondCollectionName = "testcollection_2"
|
||||
private val collectionName = "First Collection"
|
||||
|
||||
@get:Rule
|
||||
val composeTestRule =
|
||||
AndroidComposeTestRule(
|
||||
HomeActivityIntentTestRule(
|
||||
isHomeOnboardingDialogEnabled = false,
|
||||
isJumpBackInCFREnabled = false,
|
||||
isRecentTabsFeatureEnabled = false,
|
||||
isRecentlyVisitedFeatureEnabled = false,
|
||||
isPocketEnabled = false,
|
||||
isWallpaperOnboardingEnabled = false,
|
||||
isTCPCFREnabled = false,
|
||||
tabsTrayRewriteEnabled = 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 createFirstCollectionTest() {
|
||||
val firstWebPage = getGenericAsset(mockWebServer, 1)
|
||||
val secondWebPage = getGenericAsset(mockWebServer, 2)
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||
mDevice.waitForIdle()
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
}.openNewTab {
|
||||
}.submitQuery(secondWebPage.url.toString()) {
|
||||
mDevice.waitForIdle()
|
||||
}.goToHomescreen {
|
||||
}.clickSaveTabsToCollectionButton(composeTestRule) {
|
||||
longClickTab(firstWebPage.title)
|
||||
selectTab(secondWebPage.title)
|
||||
verifyTabsMultiSelectionCounter(2)
|
||||
}.clickSaveCollection {
|
||||
typeCollectionNameAndSave(collectionName)
|
||||
}
|
||||
|
||||
composeTabDrawer(composeTestRule) {
|
||||
verifySnackBarText("Collection saved!")
|
||||
clickSnackbarButton("VIEW")
|
||||
}
|
||||
|
||||
homeScreen {
|
||||
verifyCollectionIsDisplayed(collectionName)
|
||||
}
|
||||
}
|
||||
|
||||
@SmokeTest
|
||||
@Test
|
||||
fun verifyExpandedCollectionItemsTest() {
|
||||
val webPage = getGenericAsset(mockWebServer, 1)
|
||||
val webPageUrl = webPage.url.host.toString()
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(webPage.url) {
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
createCollection(webPage.title, collectionName = collectionName)
|
||||
clickSnackbarButton("VIEW")
|
||||
}
|
||||
|
||||
homeScreen {
|
||||
verifyCollectionIsDisplayed(collectionName)
|
||||
}.expandCollection(collectionName) {
|
||||
verifyTabSavedInCollection(webPage.title)
|
||||
verifyCollectionTabUrl(true, webPageUrl)
|
||||
verifyShareCollectionButtonIsVisible(true)
|
||||
verifyCollectionMenuIsVisible(true, composeTestRule)
|
||||
verifyCollectionItemRemoveButtonIsVisible(webPage.title, true)
|
||||
}.collapseCollection(collectionName) {}
|
||||
|
||||
collectionRobot {
|
||||
verifyTabSavedInCollection(webPage.title, false)
|
||||
verifyShareCollectionButtonIsVisible(false)
|
||||
verifyCollectionMenuIsVisible(false, composeTestRule)
|
||||
verifyCollectionTabUrl(false, webPageUrl)
|
||||
verifyCollectionItemRemoveButtonIsVisible(webPage.title, false)
|
||||
}
|
||||
|
||||
homeScreen {
|
||||
verifyCollectionIsDisplayed(collectionName)
|
||||
}.expandCollection(collectionName) {
|
||||
verifyTabSavedInCollection(webPage.title)
|
||||
verifyCollectionTabUrl(true, webPageUrl)
|
||||
verifyShareCollectionButtonIsVisible(true)
|
||||
verifyCollectionMenuIsVisible(true, composeTestRule)
|
||||
verifyCollectionItemRemoveButtonIsVisible(webPage.title, true)
|
||||
}.collapseCollection(collectionName) {}
|
||||
|
||||
collectionRobot {
|
||||
verifyTabSavedInCollection(webPage.title, false)
|
||||
verifyShareCollectionButtonIsVisible(false)
|
||||
verifyCollectionMenuIsVisible(false, composeTestRule)
|
||||
verifyCollectionTabUrl(false, webPageUrl)
|
||||
verifyCollectionItemRemoveButtonIsVisible(webPage.title, false)
|
||||
}
|
||||
}
|
||||
|
||||
@SmokeTest
|
||||
@Test
|
||||
fun openAllTabsInCollectionTest() {
|
||||
val firstTestPage = getGenericAsset(mockWebServer, 1)
|
||||
val secondTestPage = getGenericAsset(mockWebServer, 2)
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(firstTestPage.url) {
|
||||
waitForPageToLoad()
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
}.openNewTab {
|
||||
}.submitQuery(secondTestPage.url.toString()) {
|
||||
waitForPageToLoad()
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
createCollection(
|
||||
firstTestPage.title,
|
||||
secondTestPage.title,
|
||||
collectionName = collectionName,
|
||||
)
|
||||
}.openThreeDotMenu {
|
||||
}.closeAllTabs {
|
||||
}
|
||||
|
||||
homeScreen {
|
||||
verifyCollectionIsDisplayed(collectionName)
|
||||
}.expandCollection(collectionName) {
|
||||
clickCollectionThreeDotButton(composeTestRule)
|
||||
selectOpenTabs(composeTestRule)
|
||||
}
|
||||
composeTabDrawer(composeTestRule) {
|
||||
verifyExistingOpenTabs(firstTestPage.title, secondTestPage.title)
|
||||
}
|
||||
}
|
||||
|
||||
@SmokeTest
|
||||
@Test
|
||||
fun shareCollectionTest() {
|
||||
val firstWebsite = getGenericAsset(mockWebServer, 1)
|
||||
val secondWebsite = getGenericAsset(mockWebServer, 2)
|
||||
val sharingApp = "Gmail"
|
||||
val urlString = "${secondWebsite.url}\n\n${firstWebsite.url}"
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(firstWebsite.url) {
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
}.openNewTab {
|
||||
}.submitQuery(secondWebsite.url.toString()) {
|
||||
waitForPageToLoad()
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
createCollection(firstWebsite.title, secondWebsite.title, collectionName = collectionName)
|
||||
verifySnackBarText("Collection saved!")
|
||||
}.openThreeDotMenu {
|
||||
}.closeAllTabs {
|
||||
verifyCollectionIsDisplayed(collectionName)
|
||||
}.expandCollection(collectionName) {
|
||||
}.clickShareCollectionButton {
|
||||
verifyShareTabsOverlay(firstWebsite.title, secondWebsite.title)
|
||||
verifySharingWithSelectedApp(sharingApp, urlString, collectionName)
|
||||
}
|
||||
}
|
||||
|
||||
// Test running on beta/release builds in CI:
|
||||
// caution when making changes to it, so they don't block the builds
|
||||
@SmokeTest
|
||||
@Test
|
||||
fun deleteCollectionTest() {
|
||||
val webPage = getGenericAsset(mockWebServer, 1)
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(webPage.url) {
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
createCollection(webPage.title, collectionName = collectionName)
|
||||
clickSnackbarButton("VIEW")
|
||||
}
|
||||
|
||||
homeScreen {
|
||||
verifyCollectionIsDisplayed(collectionName)
|
||||
}.expandCollection(collectionName) {
|
||||
clickCollectionThreeDotButton(composeTestRule)
|
||||
selectDeleteCollection(composeTestRule)
|
||||
}
|
||||
|
||||
homeScreen {
|
||||
verifySnackBarText("Collection deleted")
|
||||
verifyNoCollectionsText()
|
||||
}
|
||||
}
|
||||
|
||||
// open a webpage, and add currently opened tab to existing collection
|
||||
@Test
|
||||
fun mainMenuSaveToExistingCollection() {
|
||||
val firstWebPage = getGenericAsset(mockWebServer, 1)
|
||||
val secondWebPage = getGenericAsset(mockWebServer, 2)
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
createCollection(firstWebPage.title, collectionName = collectionName)
|
||||
verifySnackBarText("Collection saved!")
|
||||
}.closeTabDrawer {}
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(secondWebPage.url) {
|
||||
verifyPageContent(secondWebPage.content)
|
||||
}.openThreeDotMenu {
|
||||
}.openSaveToCollection {
|
||||
}.selectExistingCollection(collectionName) {
|
||||
verifySnackBarText("Tab saved!")
|
||||
}.goToHomescreen {
|
||||
verifyCollectionIsDisplayed(collectionName)
|
||||
}.expandCollection(collectionName) {
|
||||
verifyTabSavedInCollection(firstWebPage.title)
|
||||
verifyTabSavedInCollection(secondWebPage.title)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun verifyAddTabButtonOfCollectionMenu() {
|
||||
val firstWebPage = getGenericAsset(mockWebServer, 1)
|
||||
val secondWebPage = getGenericAsset(mockWebServer, 2)
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
createCollection(firstWebPage.title, collectionName = collectionName)
|
||||
verifySnackBarText("Collection saved!")
|
||||
closeTab()
|
||||
}
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(secondWebPage.url) {
|
||||
}.goToHomescreen {
|
||||
verifyCollectionIsDisplayed(collectionName)
|
||||
}.expandCollection(collectionName) {
|
||||
clickCollectionThreeDotButton(composeTestRule)
|
||||
selectAddTabToCollection(composeTestRule)
|
||||
verifyTabsSelectedCounterText(1)
|
||||
saveTabsSelectedForCollection()
|
||||
verifySnackBarText("Tab saved!")
|
||||
verifyTabSavedInCollection(secondWebPage.title)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun renameCollectionTest() {
|
||||
val webPage = getGenericAsset(mockWebServer, 1)
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(webPage.url) {
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
createCollection(webPage.title, collectionName = firstCollectionName)
|
||||
verifySnackBarText("Collection saved!")
|
||||
}.closeTabDrawer {
|
||||
}.goToHomescreen {
|
||||
verifyCollectionIsDisplayed(firstCollectionName)
|
||||
}.expandCollection(firstCollectionName) {
|
||||
clickCollectionThreeDotButton(composeTestRule)
|
||||
selectRenameCollection(composeTestRule)
|
||||
}.typeCollectionNameAndSave(secondCollectionName) {}
|
||||
|
||||
homeScreen {
|
||||
verifyCollectionIsDisplayed(secondCollectionName)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun createSecondCollectionTest() {
|
||||
val webPage = getGenericAsset(mockWebServer, 1)
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(webPage.url) {
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
createCollection(webPage.title, collectionName = firstCollectionName)
|
||||
verifySnackBarText("Collection saved!")
|
||||
createCollection(
|
||||
webPage.title,
|
||||
collectionName = secondCollectionName,
|
||||
firstCollection = false,
|
||||
)
|
||||
verifySnackBarText("Collection saved!")
|
||||
}.closeTabDrawer {
|
||||
}.goToHomescreen {
|
||||
verifyCollectionIsDisplayed(firstCollectionName)
|
||||
verifyCollectionIsDisplayed(secondCollectionName)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun removeTabFromCollectionTest() {
|
||||
val webPage = getGenericAsset(mockWebServer, 1)
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(webPage.url) {
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
createCollection(webPage.title, collectionName = collectionName)
|
||||
closeTab()
|
||||
}
|
||||
|
||||
homeScreen {
|
||||
verifyCollectionIsDisplayed(collectionName)
|
||||
}.expandCollection(collectionName) {
|
||||
verifyTabSavedInCollection(webPage.title, true)
|
||||
removeTabFromCollection(webPage.title)
|
||||
verifyTabSavedInCollection(webPage.title, false)
|
||||
}
|
||||
homeScreen {
|
||||
verifyCollectionIsDisplayed(collectionName, false)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun swipeLeftToRemoveTabFromCollectionTest() {
|
||||
val testPage = getGenericAsset(mockWebServer, 1)
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(testPage.url) {
|
||||
waitForPageToLoad()
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
createCollection(
|
||||
testPage.title,
|
||||
collectionName = collectionName,
|
||||
)
|
||||
closeTab()
|
||||
}
|
||||
|
||||
homeScreen {
|
||||
verifyCollectionIsDisplayed(collectionName)
|
||||
}.expandCollection(collectionName) {
|
||||
swipeTabLeft(testPage.title, composeTestRule)
|
||||
verifyTabSavedInCollection(testPage.title, false)
|
||||
}
|
||||
homeScreen {
|
||||
verifyCollectionIsDisplayed(collectionName, false)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun swipeRightToRemoveTabFromCollectionTest() {
|
||||
val testPage = getGenericAsset(mockWebServer, 1)
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(testPage.url) {
|
||||
waitForPageToLoad()
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
createCollection(
|
||||
testPage.title,
|
||||
collectionName = collectionName,
|
||||
)
|
||||
closeTab()
|
||||
}
|
||||
|
||||
homeScreen {
|
||||
verifyCollectionIsDisplayed(collectionName)
|
||||
}.expandCollection(collectionName) {
|
||||
swipeTabRight(testPage.title, composeTestRule)
|
||||
verifyTabSavedInCollection(testPage.title, false)
|
||||
}
|
||||
homeScreen {
|
||||
verifyCollectionIsDisplayed(collectionName, false)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun selectTabOnLongTapTest() {
|
||||
val firstWebPage = getGenericAsset(mockWebServer, 1)
|
||||
val secondWebPage = getGenericAsset(mockWebServer, 2)
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||
waitForPageToLoad()
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
}.openNewTab {
|
||||
}.submitQuery(secondWebPage.url.toString()) {
|
||||
waitForPageToLoad()
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
verifyExistingOpenTabs(firstWebPage.title, secondWebPage.title)
|
||||
longClickTab(firstWebPage.title)
|
||||
verifyTabsMultiSelectionCounter(1)
|
||||
selectTab(secondWebPage.title)
|
||||
verifyTabsMultiSelectionCounter(2)
|
||||
}.clickSaveCollection {
|
||||
typeCollectionNameAndSave(collectionName)
|
||||
verifySnackBarText("Tabs saved!")
|
||||
}
|
||||
|
||||
composeTabDrawer(composeTestRule) {
|
||||
}.closeTabDrawer {
|
||||
}.goToHomescreen {
|
||||
}.expandCollection(collectionName) {
|
||||
verifyTabSavedInCollection(firstWebPage.title)
|
||||
verifyTabSavedInCollection(secondWebPage.title)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun navigateBackInCollectionFlowTest() {
|
||||
val webPage = getGenericAsset(mockWebServer, 1)
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(webPage.url) {
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
createCollection(webPage.title, collectionName = collectionName)
|
||||
verifySnackBarText("Collection saved!")
|
||||
}.closeTabDrawer {
|
||||
}.openThreeDotMenu {
|
||||
}.openSaveToCollection {
|
||||
verifySelectCollectionScreen()
|
||||
goBackInCollectionFlow()
|
||||
}
|
||||
|
||||
browserScreen {
|
||||
}.openThreeDotMenu {
|
||||
}.openSaveToCollection {
|
||||
verifySelectCollectionScreen()
|
||||
clickAddNewCollection()
|
||||
verifyCollectionNameTextField()
|
||||
goBackInCollectionFlow()
|
||||
verifySelectCollectionScreen()
|
||||
goBackInCollectionFlow()
|
||||
}
|
||||
// verify the browser layout is visible
|
||||
browserScreen {
|
||||
verifyMenuButton()
|
||||
}
|
||||
}
|
||||
|
||||
@SmokeTest
|
||||
@Test
|
||||
fun undoDeleteCollectionTest() {
|
||||
val webPage = getGenericAsset(mockWebServer, 1)
|
||||
|
||||
navigationToolbar {
|
||||
}.enterURLAndEnterToBrowser(webPage.url) {
|
||||
}.openComposeTabDrawer(composeTestRule) {
|
||||
createCollection(webPage.title, collectionName = collectionName)
|
||||
clickSnackbarButton("VIEW")
|
||||
}
|
||||
|
||||
homeScreen {
|
||||
verifyCollectionIsDisplayed(collectionName)
|
||||
}.expandCollection(collectionName) {
|
||||
clickCollectionThreeDotButton(composeTestRule)
|
||||
selectDeleteCollection(composeTestRule)
|
||||
}
|
||||
|
||||
homeScreen {
|
||||
verifySnackBarText("Collection deleted")
|
||||
clickSnackbarButton("UNDO")
|
||||
verifyCollectionIsDisplayed(collectionName, true)
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue