|
|
|
@ -4,19 +4,24 @@
|
|
|
|
|
|
|
|
|
|
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.Ignore
|
|
|
|
|
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.FeatureSettingsHelper
|
|
|
|
|
import org.mozilla.fenix.helpers.HomeActivityTestRule
|
|
|
|
|
import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
|
|
|
|
|
import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
|
|
|
|
|
import org.mozilla.fenix.ui.robots.browserScreen
|
|
|
|
|
import org.mozilla.fenix.ui.robots.collectionRobot
|
|
|
|
|
import org.mozilla.fenix.ui.robots.homeScreen
|
|
|
|
|
import org.mozilla.fenix.ui.robots.navigationToolbar
|
|
|
|
|
import org.mozilla.fenix.ui.robots.tabDrawer
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Tests for verifying basic functionality of tab collections
|
|
|
|
@ -24,24 +29,27 @@ import org.mozilla.fenix.ui.robots.navigationToolbar
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
class CollectionTest {
|
|
|
|
|
/* ktlint-disable no-blank-line-before-rbrace */
|
|
|
|
|
// This imposes unreadable grouping.
|
|
|
|
|
|
|
|
|
|
private val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
|
|
|
|
|
private lateinit var mockWebServer: MockWebServer
|
|
|
|
|
private val firstCollectionName = "testcollection_1"
|
|
|
|
|
private val secondCollectionName = "testcollection_2"
|
|
|
|
|
private val collectionName = "First Collection"
|
|
|
|
|
private val featureSettingsHelper = FeatureSettingsHelper()
|
|
|
|
|
|
|
|
|
|
@get:Rule
|
|
|
|
|
val activityTestRule = HomeActivityTestRule()
|
|
|
|
|
val composeTestRule = AndroidComposeTestRule(
|
|
|
|
|
HomeActivityIntentTestRule(),
|
|
|
|
|
{ it.activity }
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
@Before
|
|
|
|
|
fun setUp() {
|
|
|
|
|
// disabling these features to have better visibility of Collections
|
|
|
|
|
// disabling these features to have better visibility of Collections,
|
|
|
|
|
// and to avoid multiple matches on tab items
|
|
|
|
|
featureSettingsHelper.setRecentTabsFeatureEnabled(false)
|
|
|
|
|
featureSettingsHelper.setPocketEnabled(false)
|
|
|
|
|
featureSettingsHelper.setJumpBackCFREnabled(false)
|
|
|
|
|
featureSettingsHelper.setRecentlyVisitedFeatureEnabled(false)
|
|
|
|
|
|
|
|
|
|
mockWebServer = MockWebServer().apply {
|
|
|
|
|
dispatcher = AndroidAssetDispatcher()
|
|
|
|
@ -57,6 +65,171 @@ class CollectionTest {
|
|
|
|
|
featureSettingsHelper.resetAllFeatureFlags()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@SmokeTest
|
|
|
|
|
@Test
|
|
|
|
|
fun createFirstCollectionTest() {
|
|
|
|
|
val firstWebPage = getGenericAsset(mockWebServer, 1)
|
|
|
|
|
val secondWebPage = getGenericAsset(mockWebServer, 2)
|
|
|
|
|
|
|
|
|
|
navigationToolbar {
|
|
|
|
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
|
|
|
|
mDevice.waitForIdle()
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
}.openNewTab {
|
|
|
|
|
}.submitQuery(secondWebPage.url.toString()) {
|
|
|
|
|
mDevice.waitForIdle()
|
|
|
|
|
}.goToHomescreen {
|
|
|
|
|
swipeToBottom()
|
|
|
|
|
}.clickSaveTabsToCollectionButton {
|
|
|
|
|
longClickTab(firstWebPage.title)
|
|
|
|
|
selectTab(secondWebPage.title, numOfTabs = 2)
|
|
|
|
|
}.clickSaveCollection {
|
|
|
|
|
typeCollectionNameAndSave(collectionName)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tabDrawer {
|
|
|
|
|
verifySnackBarText("Collection saved!")
|
|
|
|
|
snackBarButtonClick("VIEW")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
homeScreen {
|
|
|
|
|
verifyCollectionIsDisplayed(collectionName)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@SmokeTest
|
|
|
|
|
@Test
|
|
|
|
|
fun verifyExpandedCollectionItemsTest() {
|
|
|
|
|
val webPage = getGenericAsset(mockWebServer, 1)
|
|
|
|
|
val webPageUrl = webPage.url.host.toString()
|
|
|
|
|
|
|
|
|
|
navigationToolbar {
|
|
|
|
|
}.enterURLAndEnterToBrowser(webPage.url) {
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
createCollection(webPage.title, collectionName = collectionName)
|
|
|
|
|
snackBarButtonClick("VIEW")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
homeScreen {
|
|
|
|
|
verifyCollectionIsDisplayed(collectionName)
|
|
|
|
|
}.expandCollection(collectionName, composeTestRule) {
|
|
|
|
|
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 {
|
|
|
|
|
}.expandCollection(collectionName, composeTestRule) {
|
|
|
|
|
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()
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
}.openNewTab {
|
|
|
|
|
}.submitQuery(secondTestPage.url.toString()) {
|
|
|
|
|
waitForPageToLoad()
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
createCollection(
|
|
|
|
|
firstTestPage.title,
|
|
|
|
|
secondTestPage.title,
|
|
|
|
|
collectionName = collectionName
|
|
|
|
|
)
|
|
|
|
|
closeTab()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
homeScreen {
|
|
|
|
|
}.expandCollection(collectionName, composeTestRule) {
|
|
|
|
|
clickCollectionThreeDotButton(composeTestRule)
|
|
|
|
|
selectOpenTabs(composeTestRule)
|
|
|
|
|
}
|
|
|
|
|
tabDrawer {
|
|
|
|
|
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) {
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
}.openNewTab {
|
|
|
|
|
}.submitQuery(secondWebsite.url.toString()) {
|
|
|
|
|
waitForPageToLoad()
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
createCollection(firstWebsite.title, secondWebsite.title, collectionName = collectionName)
|
|
|
|
|
verifySnackBarText("Collection saved!")
|
|
|
|
|
}.openTabsListThreeDotMenu {
|
|
|
|
|
}.closeAllTabs {
|
|
|
|
|
}.expandCollection(collectionName, composeTestRule) {
|
|
|
|
|
}.clickShareCollectionButton {
|
|
|
|
|
verifyShareTabsOverlay(firstWebsite.title, secondWebsite.title)
|
|
|
|
|
verifySharingWithSelectedApp(sharingApp, urlString, collectionName)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@SmokeTest
|
|
|
|
|
@Test
|
|
|
|
|
// Test running on beta/release builds in CI:
|
|
|
|
|
// caution when making changes to it, so they don't block the builds
|
|
|
|
|
fun deleteCollectionTest() {
|
|
|
|
|
val webPage = getGenericAsset(mockWebServer, 1)
|
|
|
|
|
|
|
|
|
|
navigationToolbar {
|
|
|
|
|
}.enterURLAndEnterToBrowser(webPage.url) {
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
createCollection(webPage.title, collectionName = collectionName)
|
|
|
|
|
snackBarButtonClick("VIEW")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
homeScreen {
|
|
|
|
|
}.expandCollection(collectionName, composeTestRule) {
|
|
|
|
|
clickCollectionThreeDotButton(composeTestRule)
|
|
|
|
|
selectDeleteCollection(composeTestRule)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
homeScreen {
|
|
|
|
|
verifySnackBarText("Collection deleted")
|
|
|
|
|
verifyNoCollectionsText()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
// open a webpage, and add currently opened tab to existing collection
|
|
|
|
|
fun mainMenuSaveToExistingCollection() {
|
|
|
|
@ -66,7 +239,7 @@ class CollectionTest {
|
|
|
|
|
navigationToolbar {
|
|
|
|
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
createCollection(firstWebPage.title, firstCollectionName)
|
|
|
|
|
createCollection(firstWebPage.title, collectionName = collectionName)
|
|
|
|
|
verifySnackBarText("Collection saved!")
|
|
|
|
|
}.closeTabDrawer {}
|
|
|
|
|
|
|
|
|
@ -75,12 +248,12 @@ class CollectionTest {
|
|
|
|
|
verifyPageContent(secondWebPage.content)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openSaveToCollection {
|
|
|
|
|
}.selectExistingCollection(firstCollectionName) {
|
|
|
|
|
}.selectExistingCollection(collectionName) {
|
|
|
|
|
verifySnackBarText("Tab saved!")
|
|
|
|
|
// }.goToHomescreen {
|
|
|
|
|
// }.expandCollection(firstCollectionName) {
|
|
|
|
|
// verifyTabSavedInCollection(firstWebPage.title)
|
|
|
|
|
// verifyTabSavedInCollection(secondWebPage.title)
|
|
|
|
|
}.goToHomescreen {
|
|
|
|
|
}.expandCollection(collectionName, composeTestRule) {
|
|
|
|
|
verifyTabSavedInCollection(firstWebPage.title)
|
|
|
|
|
verifyTabSavedInCollection(secondWebPage.title)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -92,7 +265,7 @@ class CollectionTest {
|
|
|
|
|
navigationToolbar {
|
|
|
|
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
createCollection(firstWebPage.title, firstCollectionName)
|
|
|
|
|
createCollection(firstWebPage.title, collectionName = collectionName)
|
|
|
|
|
verifySnackBarText("Collection saved!")
|
|
|
|
|
closeTab()
|
|
|
|
|
}
|
|
|
|
@ -100,117 +273,131 @@ class CollectionTest {
|
|
|
|
|
navigationToolbar {
|
|
|
|
|
}.enterURLAndEnterToBrowser(secondWebPage.url) {
|
|
|
|
|
}.goToHomescreen {
|
|
|
|
|
// }.expandCollection(firstCollectionName) {
|
|
|
|
|
// clickCollectionThreeDotButton()
|
|
|
|
|
// selectAddTabToCollection()
|
|
|
|
|
// verifyTabsSelectedCounterText(1)
|
|
|
|
|
// saveTabsSelectedForCollection()
|
|
|
|
|
// verifySnackBarText("Tab saved!")
|
|
|
|
|
// verifyTabSavedInCollection(secondWebPage.title)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// @Test
|
|
|
|
|
// fun renameCollectionTest() {
|
|
|
|
|
// val webPage = getGenericAsset(mockWebServer, 1)
|
|
|
|
|
//
|
|
|
|
|
// navigationToolbar {
|
|
|
|
|
// }.enterURLAndEnterToBrowser(webPage.url) {
|
|
|
|
|
// }.openTabDrawer {
|
|
|
|
|
// createCollection(webPage.title, firstCollectionName)
|
|
|
|
|
// verifySnackBarText("Collection saved!")
|
|
|
|
|
// }.closeTabDrawer {
|
|
|
|
|
// }.goToHomescreen {
|
|
|
|
|
// }.expandCollection(firstCollectionName) {
|
|
|
|
|
// clickCollectionThreeDotButton()
|
|
|
|
|
// selectRenameCollection()
|
|
|
|
|
// }.typeCollectionNameAndSave("renamed_collection") {}
|
|
|
|
|
//
|
|
|
|
|
// homeScreen {
|
|
|
|
|
// verifyCollectionIsDisplayed("renamed_collection")
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// @Test
|
|
|
|
|
// fun createSecondCollectionTest() {
|
|
|
|
|
// val webPage = getGenericAsset(mockWebServer, 1)
|
|
|
|
|
//
|
|
|
|
|
// navigationToolbar {
|
|
|
|
|
// }.enterURLAndEnterToBrowser(webPage.url) {
|
|
|
|
|
// }.openTabDrawer {
|
|
|
|
|
// createCollection(webPage.title, firstCollectionName)
|
|
|
|
|
// verifySnackBarText("Collection saved!")
|
|
|
|
|
// createCollection(webPage.title, secondCollectionName, false)
|
|
|
|
|
// verifySnackBarText("Collection saved!")
|
|
|
|
|
// }.closeTabDrawer {
|
|
|
|
|
// }.goToHomescreen {}
|
|
|
|
|
//
|
|
|
|
|
// homeScreen {
|
|
|
|
|
// verifyCollectionIsDisplayed(firstCollectionName)
|
|
|
|
|
// verifyCollectionIsDisplayed(secondCollectionName)
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// @Test
|
|
|
|
|
// fun removeTabFromCollectionTest() {
|
|
|
|
|
// val webPage = getGenericAsset(mockWebServer, 1)
|
|
|
|
|
//
|
|
|
|
|
// navigationToolbar {
|
|
|
|
|
// }.enterURLAndEnterToBrowser(webPage.url) {
|
|
|
|
|
// }.openTabDrawer {
|
|
|
|
|
// createCollection(webPage.title, firstCollectionName)
|
|
|
|
|
// verifySnackBarText("Collection saved!")
|
|
|
|
|
// closeTab()
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// homeScreen {
|
|
|
|
|
// }.expandCollection(firstCollectionName) {
|
|
|
|
|
// removeTabFromCollection(webPage.title)
|
|
|
|
|
// verifyTabSavedInCollection(webPage.title, false)
|
|
|
|
|
// }
|
|
|
|
|
// // To add this step when https://github.com/mozilla-mobile/fenix/issues/13177 is fixed
|
|
|
|
|
// // homeScreen {
|
|
|
|
|
// // verifyCollectionIsDisplayed(firstCollectionName, false)
|
|
|
|
|
// // }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// @Test
|
|
|
|
|
// fun swipeToRemoveTabFromCollectionTest() {
|
|
|
|
|
// val firstWebPage = getGenericAsset(mockWebServer, 1)
|
|
|
|
|
// val secondWebPage = getGenericAsset(mockWebServer, 2)
|
|
|
|
|
//
|
|
|
|
|
// navigationToolbar {
|
|
|
|
|
// }.enterURLAndEnterToBrowser(firstWebPage.url) {
|
|
|
|
|
// }.openTabDrawer {
|
|
|
|
|
// createCollection(firstWebPage.title, firstCollectionName)
|
|
|
|
|
// verifySnackBarText("Collection saved!")
|
|
|
|
|
// closeTab()
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// navigationToolbar {
|
|
|
|
|
// }.enterURLAndEnterToBrowser(secondWebPage.url) {
|
|
|
|
|
// }.openThreeDotMenu {
|
|
|
|
|
// }.openSaveToCollection {
|
|
|
|
|
// }.selectExistingCollection(firstCollectionName) {
|
|
|
|
|
// }.openTabDrawer {
|
|
|
|
|
// closeTab()
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// homeScreen {
|
|
|
|
|
// }.expandCollection(firstCollectionName) {
|
|
|
|
|
// swipeToBottom()
|
|
|
|
|
// swipeCollectionItemLeft(firstWebPage.title)
|
|
|
|
|
// verifyTabSavedInCollection(firstWebPage.title, false)
|
|
|
|
|
// swipeCollectionItemRight(secondWebPage.title)
|
|
|
|
|
// verifyTabSavedInCollection(secondWebPage.title, false)
|
|
|
|
|
// }
|
|
|
|
|
// To add this step when https://github.com/mozilla-mobile/fenix/issues/13177 is fixed
|
|
|
|
|
// homeScreen {
|
|
|
|
|
// verifyCollectionIsDisplayed(firstCollectionName, false)
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
@Ignore("Failing, see: https://github.com/mozilla-mobile/fenix/issues/24997")
|
|
|
|
|
}.expandCollection(collectionName, composeTestRule) {
|
|
|
|
|
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) {
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
createCollection(webPage.title, collectionName = firstCollectionName)
|
|
|
|
|
verifySnackBarText("Collection saved!")
|
|
|
|
|
}.closeTabDrawer {
|
|
|
|
|
}.goToHomescreen {
|
|
|
|
|
}.expandCollection(firstCollectionName, composeTestRule) {
|
|
|
|
|
clickCollectionThreeDotButton(composeTestRule)
|
|
|
|
|
selectRenameCollection(composeTestRule)
|
|
|
|
|
}.typeCollectionNameAndSave(secondCollectionName) {}
|
|
|
|
|
homeScreen {
|
|
|
|
|
verifyCollectionIsDisplayed(secondCollectionName)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
fun createSecondCollectionTest() {
|
|
|
|
|
val webPage = getGenericAsset(mockWebServer, 1)
|
|
|
|
|
|
|
|
|
|
navigationToolbar {
|
|
|
|
|
}.enterURLAndEnterToBrowser(webPage.url) {
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
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) {
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
createCollection(webPage.title, collectionName = collectionName)
|
|
|
|
|
closeTab()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
homeScreen {
|
|
|
|
|
}.expandCollection(collectionName, composeTestRule) {
|
|
|
|
|
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()
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
createCollection(
|
|
|
|
|
testPage.title,
|
|
|
|
|
collectionName = collectionName
|
|
|
|
|
)
|
|
|
|
|
closeTab()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
homeScreen {
|
|
|
|
|
}.expandCollection(collectionName, composeTestRule) {
|
|
|
|
|
swipeToBottom()
|
|
|
|
|
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()
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
createCollection(
|
|
|
|
|
testPage.title,
|
|
|
|
|
collectionName = collectionName
|
|
|
|
|
)
|
|
|
|
|
closeTab()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
homeScreen {
|
|
|
|
|
}.expandCollection(collectionName, composeTestRule) {
|
|
|
|
|
swipeToBottom()
|
|
|
|
|
swipeTabRight(testPage.title, composeTestRule)
|
|
|
|
|
verifyTabSavedInCollection(testPage.title, false)
|
|
|
|
|
}
|
|
|
|
|
homeScreen {
|
|
|
|
|
verifyCollectionIsDisplayed(collectionName, false)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
fun selectTabOnLongTapTest() {
|
|
|
|
|
val firstWebPage = getGenericAsset(mockWebServer, 1)
|
|
|
|
@ -218,83 +405,84 @@ class CollectionTest {
|
|
|
|
|
|
|
|
|
|
navigationToolbar {
|
|
|
|
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
|
|
|
|
waitForPageToLoad()
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
}.openNewTab {
|
|
|
|
|
}.submitQuery(secondWebPage.url.toString()) {
|
|
|
|
|
mDevice.waitForIdle()
|
|
|
|
|
waitForPageToLoad()
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
verifyExistingOpenTabs(firstWebPage.title, secondWebPage.title)
|
|
|
|
|
longClickTab(firstWebPage.title)
|
|
|
|
|
verifyTabsMultiSelectionCounter(1)
|
|
|
|
|
selectTab(secondWebPage.title)
|
|
|
|
|
verifyTabsMultiSelectionCounter(2)
|
|
|
|
|
selectTab(secondWebPage.title, numOfTabs = 2)
|
|
|
|
|
}.clickSaveCollection {
|
|
|
|
|
typeCollectionNameAndSave(firstCollectionName)
|
|
|
|
|
typeCollectionNameAndSave(collectionName)
|
|
|
|
|
verifySnackBarText("Tabs saved!")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// tabDrawer {
|
|
|
|
|
// }.closeTabDrawer {
|
|
|
|
|
// }.goToHomescreen {
|
|
|
|
|
// }.expandCollection(firstCollectionName) {
|
|
|
|
|
// verifyTabSavedInCollection(firstWebPage.title)
|
|
|
|
|
// verifyTabSavedInCollection(secondWebPage.title)
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// @Test
|
|
|
|
|
// fun navigateBackInCollectionFlowTest() {
|
|
|
|
|
// val webPage = getGenericAsset(mockWebServer, 1)
|
|
|
|
|
//
|
|
|
|
|
// navigationToolbar {
|
|
|
|
|
// }.enterURLAndEnterToBrowser(webPage.url) {
|
|
|
|
|
// }.openTabDrawer {
|
|
|
|
|
// createCollection(webPage.title, firstCollectionName)
|
|
|
|
|
// 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 = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
|
|
|
|
//
|
|
|
|
|
// navigationToolbar {
|
|
|
|
|
// }.enterURLAndEnterToBrowser(webPage.url) {
|
|
|
|
|
// }.openTabDrawer {
|
|
|
|
|
// createCollection(webPage.title, firstCollectionName)
|
|
|
|
|
// snackBarButtonClick("VIEW")
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// homeScreen {
|
|
|
|
|
// }.expandCollection(firstCollectionName) {
|
|
|
|
|
// clickCollectionThreeDotButton()
|
|
|
|
|
// selectDeleteCollection()
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// homeScreen {
|
|
|
|
|
// verifySnackBarText("Collection deleted")
|
|
|
|
|
// clickUndoCollectionDeletion("UNDO")
|
|
|
|
|
// verifyCollectionIsDisplayed(firstCollectionName, true)
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
tabDrawer {
|
|
|
|
|
}.closeTabDrawer {
|
|
|
|
|
}.goToHomescreen {
|
|
|
|
|
}.expandCollection(collectionName, composeTestRule) {
|
|
|
|
|
verifyTabSavedInCollection(firstWebPage.title)
|
|
|
|
|
verifyTabSavedInCollection(secondWebPage.title)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
fun navigateBackInCollectionFlowTest() {
|
|
|
|
|
val webPage = getGenericAsset(mockWebServer, 1)
|
|
|
|
|
|
|
|
|
|
navigationToolbar {
|
|
|
|
|
}.enterURLAndEnterToBrowser(webPage.url) {
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
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) {
|
|
|
|
|
}.openTabDrawer {
|
|
|
|
|
createCollection(webPage.title, collectionName = collectionName)
|
|
|
|
|
snackBarButtonClick("VIEW")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
homeScreen {
|
|
|
|
|
}.expandCollection(collectionName, composeTestRule) {
|
|
|
|
|
clickCollectionThreeDotButton(composeTestRule)
|
|
|
|
|
selectDeleteCollection(composeTestRule)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
homeScreen {
|
|
|
|
|
verifySnackBarText("Collection deleted")
|
|
|
|
|
clickUndoCollectionDeletion("UNDO")
|
|
|
|
|
verifyCollectionIsDisplayed(collectionName, true)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|