ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move collections tests to CollectionTest class

This commit is contained in:
sv-ohorvath 2022-05-30 16:50:52 +03:00 committed by mergify[bot]
parent fff15ea331
commit 9b35c6fd45
3 changed files with 16 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
View File

@ -67,7 +67,6 @@ class SmokeTest {
private var addonsListIdlingResource: RecyclerViewIdlingResource? = null
private var recentlyClosedTabsListIdlingResource: RecyclerViewIdlingResource? = null
private var readerViewNotification: ViewVisibilityIdlingResource? = null
private val collectionName = "First Collection"
private var bookmarksListIdlingResource: RecyclerViewIdlingResource? = null
private var localeListIdlingResource: RecyclerViewIdlingResource? = null
private val customMenuItem = "TestMenuItem"
@ -346,18 +345,18 @@ class SmokeTest {
}
}
// @Test
// // Verifies the Add to collection option in a tab's 3 dot menu
// fun openMainMenuAddToCollectionTest() {
// val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
//
// navigationToolbar {
// }.enterURLAndEnterToBrowser(defaultWebPage.url) {
// }.openThreeDotMenu {
// }.openSaveToCollection {
// verifyCollectionNameTextField()
// }
// }
@Test
// Verifies the Add to collection option in a tab's 3 dot menu
fun openMainMenuAddToCollectionTest() {
val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
navigationToolbar {
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
}.openThreeDotMenu {
}.openSaveToCollection {
verifyCollectionNameTextField()
}
}
@Test
// Verifies the Bookmark button in a tab's 3 dot menu
@ -616,172 +615,6 @@ class SmokeTest {
}
}
// @Test
// fun createFirstCollectionTest() {
// // disabling these features to have better visibility of Collections
// featureSettingsHelper.setRecentTabsFeatureEnabled(false)
// featureSettingsHelper.setPocketEnabled(false)
//
// val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
// val secondWebPage = TestAssetHelper.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)
// }.clickSaveCollection {
// typeCollectionNameAndSave(collectionName)
// }
//
// tabDrawer {
// verifySnackBarText("Collection saved!")
// snackBarButtonClick("VIEW")
// }
//
// homeScreen {
// verifyCollectionIsDisplayed(collectionName)
// verifyCollectionIcon()
// }
// }
// @Test
// fun verifyExpandedCollectionItemsTest() {
// // disabling these features to have better visibility of Collections
// featureSettingsHelper.setRecentTabsFeatureEnabled(false)
// featureSettingsHelper.setPocketEnabled(false)
//
// val webPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
//
// navigationToolbar {
// }.enterURLAndEnterToBrowser(webPage.url) {
// }.openTabDrawer {
// createCollection(webPage.title, collectionName)
// snackBarButtonClick("VIEW")
// }
//
// homeScreen {
// verifyCollectionIsDisplayed(collectionName)
// verifyCollectionIcon()
// }.expandCollection(collectionName) {
// verifyTabSavedInCollection(webPage.title)
// verifyCollectionTabLogo(true)
// verifyCollectionTabUrl(true)
// verifyShareCollectionButtonIsVisible(true)
// verifyCollectionMenuIsVisible(true)
// verifyCollectionItemRemoveButtonIsVisible(webPage.title, true)
// }.collapseCollection(collectionName) {}
//
// collectionRobot {
// verifyTabSavedInCollection(webPage.title, false)
// verifyShareCollectionButtonIsVisible(false)
// verifyCollectionMenuIsVisible(false)
// verifyCollectionTabLogo(false)
// verifyCollectionTabUrl(false)
// verifyCollectionItemRemoveButtonIsVisible(webPage.title, false)
// }
//
// homeScreen {
// }.expandCollection(collectionName) {
// verifyTabSavedInCollection(webPage.title)
// verifyCollectionTabLogo(true)
// verifyCollectionTabUrl(true)
// verifyShareCollectionButtonIsVisible(true)
// verifyCollectionMenuIsVisible(true)
// verifyCollectionItemRemoveButtonIsVisible(webPage.title, true)
// }.collapseCollection(collectionName) {}
//
// collectionRobot {
// verifyTabSavedInCollection(webPage.title, false)
// verifyShareCollectionButtonIsVisible(false)
// verifyCollectionMenuIsVisible(false)
// verifyCollectionTabLogo(false)
// verifyCollectionTabUrl(false)
// verifyCollectionItemRemoveButtonIsVisible(webPage.title, false)
// }
// }
//
// @Test
// fun openAllTabsInCollectionTest() {
// val webPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
//
// navigationToolbar {
// }.enterURLAndEnterToBrowser(webPage.url) {
// }.openTabDrawer {
// createCollection(webPage.title, collectionName)
// verifySnackBarText("Collection saved!")
// closeTab()
// }
//
// homeScreen {
// }.expandCollection(collectionName) {
// clickCollectionThreeDotButton()
// selectOpenTabs()
// }
// tabDrawer {
// verifyExistingOpenTabs(webPage.title)
// }
// }
//
// @Test
// fun shareCollectionTest() {
// val firstWebsite = TestAssetHelper.getGenericAsset(mockWebServer, 1)
// val secondWebsite = TestAssetHelper.getGenericAsset(mockWebServer, 2)
// val sharingApp = "Gmail"
// val urlString = "${secondWebsite.url}\n\n${firstWebsite.url}"
//
// navigationToolbar {
// }.enterURLAndEnterToBrowser(firstWebsite.url) {
// verifyPageContent(firstWebsite.content)
// }.openTabDrawer {
// createCollection(firstWebsite.title, collectionName)
// }.openNewTab {
// }.submitQuery(secondWebsite.url.toString()) {
// verifyPageContent(secondWebsite.content)
// }.openThreeDotMenu {
// }.openSaveToCollection {
// }.selectExistingCollection(collectionName) {
// }.goToHomescreen {
// }.expandCollection(collectionName) {
// }.clickShareCollectionButton {
// verifyShareTabsOverlay(firstWebsite.title, secondWebsite.title)
// selectAppToShareWith(sharingApp)
// verifySharedTabsIntent(urlString, collectionName)
// }
// }
//
// @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 = TestAssetHelper.getGenericAsset(mockWebServer, 1)
//
// navigationToolbar {
// }.enterURLAndEnterToBrowser(webPage.url) {
// }.openTabDrawer {
// createCollection(webPage.title, collectionName)
// snackBarButtonClick("VIEW")
// }
//
// homeScreen {
// }.expandCollection(collectionName) {
// clickCollectionThreeDotButton()
// selectDeleteCollection()
// }
//
// homeScreen {
// verifySnackBarText("Collection deleted")
// verifyNoCollectionsText()
// }
// }
@Test
// Verifies that deleting a Bookmarks folder also removes the item from inside it.
fun deleteNonEmptyBookmarkFolderTest() {
@ -852,9 +685,8 @@ class SmokeTest {
verifyShareAllTabsButton()
}.clickShareAllTabsButton {
verifyShareTabsOverlay(firstWebsiteTitle, secondWebsiteTitle)
selectAppToShareWith(sharingApp)
verifySharedTabsIntent(
sharedUrlsString,
verifySharingWithSelectedApp(
sharingApp, sharedUrlsString,
"$firstWebsiteTitle, $secondWebsiteTitle"
)
}

2
automation/taskcluster/androidTest/flank-x86-beta.yml
View File

@ -42,7 +42,7 @@ gcloud:
- class org.mozilla.fenix.ui.HistoryTest#visitedUrlHistoryTest
- class org.mozilla.fenix.ui.SmokeTest#openMainMenuSettingsItemTest
- class org.mozilla.fenix.ui.SettingsSearchTest#toggleSearchSuggestionsTest
- class org.mozilla.fenix.ui.SmokeTest#deleteCollectionTest
- class org.mozilla.fenix.ui.CollectionTest#deleteCollectionTest
- class org.mozilla.fenix.ui.SmokeTest#noHistoryInPrivateBrowsingTest
- class org.mozilla.fenix.ui.NoNetworkAccessStartupTests#noNetworkConnectionStartupTest

2
automation/taskcluster/androidTest/flank-x86-start-test.yml
View File

@ -38,7 +38,7 @@ gcloud:
- class org.mozilla.fenix.ui.HistoryTest#visitedUrlHistoryTest
- class org.mozilla.fenix.ui.SmokeTest#openMainMenuSettingsItemTest
- class org.mozilla.fenix.ui.SettingsSearchTest#toggleSearchSuggestionsTest
- class org.mozilla.fenix.ui.SmokeTest#deleteCollectionTest
- class org.mozilla.fenix.ui.CollectionTest#deleteCollectionTest
- class org.mozilla.fenix.ui.SmokeTest#noHistoryInPrivateBrowsingTest
- class org.mozilla.fenix.ui.NoNetworkAccessStartupTests#noNetworkConnectionStartupTest