Replaces verifyPageContent in UI tests
parent
6be39aebde
commit
af3c232615
|
@ -234,7 +234,7 @@ class BookmarksTest {
|
||||||
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
||||||
}.openThreeDotMenu(defaultWebPage.url) {
|
}.openThreeDotMenu(defaultWebPage.url) {
|
||||||
}.clickOpenInNewTab {
|
}.clickOpenInNewTab {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
verifyUrl(defaultWebPage.url.toString())
|
||||||
}.openTabDrawer {
|
}.openTabDrawer {
|
||||||
verifyNormalModeSelected()
|
verifyNormalModeSelected()
|
||||||
}
|
}
|
||||||
|
@ -253,7 +253,7 @@ class BookmarksTest {
|
||||||
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
||||||
}.openThreeDotMenu(defaultWebPage.url) {
|
}.openThreeDotMenu(defaultWebPage.url) {
|
||||||
}.clickOpenInPrivateTab {
|
}.clickOpenInPrivateTab {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
verifyUrl(defaultWebPage.url.toString())
|
||||||
}.openTabDrawer {
|
}.openTabDrawer {
|
||||||
verifyPrivateModeSelected()
|
verifyPrivateModeSelected()
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,7 +61,7 @@ class ContextMenusTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
||||||
// verifyPageContent(pageLinks.content)
|
mDevice.waitForIdle()
|
||||||
longClickMatchingText("Link 1")
|
longClickMatchingText("Link 1")
|
||||||
verifyLinkContextMenuItems(genericURL.url)
|
verifyLinkContextMenuItems(genericURL.url)
|
||||||
clickContextOpenLinkInNewTab()
|
clickContextOpenLinkInNewTab()
|
||||||
|
@ -83,7 +83,7 @@ class ContextMenusTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
||||||
// verifyPageContent(pageLinks.content)
|
mDevice.waitForIdle()
|
||||||
longClickMatchingText("Link 2")
|
longClickMatchingText("Link 2")
|
||||||
verifyLinkContextMenuItems(genericURL.url)
|
verifyLinkContextMenuItems(genericURL.url)
|
||||||
clickContextOpenLinkInPrivateTab()
|
clickContextOpenLinkInPrivateTab()
|
||||||
|
@ -105,7 +105,7 @@ class ContextMenusTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
||||||
// verifyPageContent(pageLinks.content)
|
mDevice.waitForIdle()
|
||||||
longClickMatchingText("Link 3")
|
longClickMatchingText("Link 3")
|
||||||
verifyLinkContextMenuItems(genericURL.url)
|
verifyLinkContextMenuItems(genericURL.url)
|
||||||
clickContextCopyLink()
|
clickContextCopyLink()
|
||||||
|
@ -125,12 +125,13 @@ class ContextMenusTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
||||||
// verifyPageContent(pageLinks.content)
|
mDevice.waitForIdle()
|
||||||
longClickMatchingText("Link 1")
|
longClickMatchingText("Link 1")
|
||||||
verifyLinkContextMenuItems(genericURL.url)
|
verifyLinkContextMenuItems(genericURL.url)
|
||||||
clickContextShareLink(genericURL.url) // verify share intent is matched with associated URL
|
clickContextShareLink(genericURL.url) // verify share intent is matched with associated URL
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Ignore("Intermittent: https://github.com/mozilla-mobile/fenix/issues/12367")
|
@Ignore("Intermittent: https://github.com/mozilla-mobile/fenix/issues/12367")
|
||||||
@Test
|
@Test
|
||||||
fun verifyContextOpenImageNewTab() {
|
fun verifyContextOpenImageNewTab() {
|
||||||
|
@ -141,7 +142,7 @@ class ContextMenusTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
||||||
// verifyPageContent(pageLinks.content)
|
mDevice.waitForIdle()
|
||||||
longClickMatchingText("test_link_image")
|
longClickMatchingText("test_link_image")
|
||||||
verifyLinkImageContextMenuItems(imageResource.url)
|
verifyLinkImageContextMenuItems(imageResource.url)
|
||||||
clickContextOpenImageNewTab()
|
clickContextOpenImageNewTab()
|
||||||
|
@ -161,7 +162,7 @@ class ContextMenusTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
||||||
// verifyPageContent(pageLinks.content)
|
mDevice.waitForIdle()
|
||||||
longClickMatchingText("test_link_image")
|
longClickMatchingText("test_link_image")
|
||||||
verifyLinkImageContextMenuItems(imageResource.url)
|
verifyLinkImageContextMenuItems(imageResource.url)
|
||||||
clickContextCopyImageLocation()
|
clickContextCopyImageLocation()
|
||||||
|
@ -182,7 +183,7 @@ class ContextMenusTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
||||||
// verifyPageContent(pageLinks.content)
|
mDevice.waitForIdle()
|
||||||
longClickMatchingText("test_link_image")
|
longClickMatchingText("test_link_image")
|
||||||
verifyLinkImageContextMenuItems(imageResource.url)
|
verifyLinkImageContextMenuItems(imageResource.url)
|
||||||
clickContextSaveImage()
|
clickContextSaveImage()
|
||||||
|
@ -209,7 +210,7 @@ class ContextMenusTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
}.enterURLAndEnterToBrowser(pageLinks.url) {
|
||||||
// verifyPageContent(pageLinks.content)
|
mDevice.waitForIdle()
|
||||||
longClickMatchingText("Link 1")
|
longClickMatchingText("Link 1")
|
||||||
verifyLinkContextMenuItems(genericURL.url)
|
verifyLinkContextMenuItems(genericURL.url)
|
||||||
dismissContentContextMenu(genericURL.url)
|
dismissContentContextMenu(genericURL.url)
|
||||||
|
|
|
@ -82,7 +82,7 @@ class DownloadTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.openNewTabAndEnterToBrowser(defaultWebPage.url) {
|
}.openNewTabAndEnterToBrowser(defaultWebPage.url) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
mDevice.waitForIdle()
|
||||||
clickLinkMatchingText(defaultWebPage.content)
|
clickLinkMatchingText(defaultWebPage.content)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -100,7 +100,7 @@ class DownloadTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.openNewTabAndEnterToBrowser(defaultWebPage.url) {
|
}.openNewTabAndEnterToBrowser(defaultWebPage.url) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
mDevice.waitForIdle()
|
||||||
clickLinkMatchingText(defaultWebPage.content)
|
clickLinkMatchingText(defaultWebPage.content)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,7 @@ import org.mozilla.fenix.helpers.TestAssetHelper
|
||||||
import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
|
import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
|
||||||
import org.mozilla.fenix.ui.robots.historyMenu
|
import org.mozilla.fenix.ui.robots.historyMenu
|
||||||
import org.mozilla.fenix.ui.robots.homeScreen
|
import org.mozilla.fenix.ui.robots.homeScreen
|
||||||
|
import org.mozilla.fenix.ui.robots.mDevice
|
||||||
import org.mozilla.fenix.ui.robots.multipleSelectionToolbar
|
import org.mozilla.fenix.ui.robots.multipleSelectionToolbar
|
||||||
import org.mozilla.fenix.ui.robots.navigationToolbar
|
import org.mozilla.fenix.ui.robots.navigationToolbar
|
||||||
|
|
||||||
|
@ -70,7 +71,7 @@ class HistoryTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
// verifyPageContent("Page content: 1")
|
mDevice.waitForIdle()
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
verifyHistoryMenuView()
|
verifyHistoryMenuView()
|
||||||
|
@ -86,7 +87,7 @@ class HistoryTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
// verifyPageContent("Page content: 1")
|
mDevice.waitForIdle()
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
|
@ -101,7 +102,7 @@ class HistoryTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
// verifyPageContent("Page content: 1")
|
mDevice.waitForIdle()
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
|
@ -119,12 +120,12 @@ class HistoryTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
// verifyPageContent("Page content: 1")
|
mDevice.waitForIdle()
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.clickOpenInNormalTab {
|
}.clickOpenInNormalTab {
|
||||||
// verifyPageContent(firstWebPage.content)
|
verifyUrl(firstWebPage.url.toString())
|
||||||
}.openTabDrawer {
|
}.openTabDrawer {
|
||||||
verifyNormalModeSelected()
|
verifyNormalModeSelected()
|
||||||
}
|
}
|
||||||
|
@ -136,12 +137,12 @@ class HistoryTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
// verifyPageContent("Page content: 1")
|
mDevice.waitForIdle()
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.clickOpenInPrivateTab {
|
}.clickOpenInPrivateTab {
|
||||||
// verifyPageContent(firstWebPage.content)
|
verifyUrl(firstWebPage.url.toString())
|
||||||
}.openTabDrawer {
|
}.openTabDrawer {
|
||||||
verifyPrivateModeSelected()
|
verifyPrivateModeSelected()
|
||||||
}
|
}
|
||||||
|
@ -153,7 +154,7 @@ class HistoryTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
// verifyPageContent("Page content: 1")
|
mDevice.waitForIdle()
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
|
@ -168,7 +169,7 @@ class HistoryTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
// verifyPageContent("Page content: 1")
|
mDevice.waitForIdle()
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
clickDeleteHistoryButton()
|
clickDeleteHistoryButton()
|
||||||
|
@ -184,7 +185,7 @@ class HistoryTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
// verifyPageContent("Page content: 1")
|
mDevice.waitForIdle()
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
longTapSelectItem(firstWebPage.url)
|
longTapSelectItem(firstWebPage.url)
|
||||||
|
@ -206,7 +207,7 @@ class HistoryTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
// verifyPageContent("Page content: 1")
|
mDevice.waitForIdle()
|
||||||
}.openTabDrawer {
|
}.openTabDrawer {
|
||||||
closeTab()
|
closeTab()
|
||||||
}.openHomeScreen { }.openThreeDotMenu {
|
}.openHomeScreen { }.openThreeDotMenu {
|
||||||
|
@ -228,7 +229,7 @@ class HistoryTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
// verifyPageContent("Page content: 1")
|
mDevice.waitForIdle()
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
longTapSelectItem(firstWebPage.url)
|
longTapSelectItem(firstWebPage.url)
|
||||||
|
@ -249,12 +250,11 @@ class HistoryTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
// verifyPageContent("Page content: 1")
|
|
||||||
}.openTabDrawer { }.openHomeScreen { }
|
}.openTabDrawer { }.openHomeScreen { }
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(secondWebPage.url) {
|
}.enterURLAndEnterToBrowser(secondWebPage.url) {
|
||||||
// verifyPageContent("Page content: 2")
|
mDevice.waitForIdle()
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
longTapSelectItem(firstWebPage.url)
|
longTapSelectItem(firstWebPage.url)
|
||||||
|
@ -277,7 +277,7 @@ class HistoryTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
// verifyPageContent("Page content: 1")
|
mDevice.waitForIdle()
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
longTapSelectItem(firstWebPage.url)
|
longTapSelectItem(firstWebPage.url)
|
||||||
|
|
|
@ -58,10 +58,8 @@ class MediaNotificationTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(videoTestPage.url) {
|
}.enterURLAndEnterToBrowser(videoTestPage.url) {
|
||||||
// verifyPageContent(videoTestPage.content)
|
mDevice.waitForIdle()
|
||||||
clickMediaPlayerPlayButton()
|
clickMediaPlayerPlayButton()
|
||||||
waitForPlaybackToStart()
|
|
||||||
// verifyPageContent("Media file is playing")
|
|
||||||
}.openNotificationShade {
|
}.openNotificationShade {
|
||||||
verifySystemNotificationExists(videoTestPage.title)
|
verifySystemNotificationExists(videoTestPage.title)
|
||||||
clickMediaSystemNotificationControlButton("Pause")
|
clickMediaSystemNotificationControlButton("Pause")
|
||||||
|
@ -92,7 +90,7 @@ class MediaNotificationTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(audioTestPage.url) {
|
}.enterURLAndEnterToBrowser(audioTestPage.url) {
|
||||||
// verifyPageContent(audioTestPage.content)
|
mDevice.waitForIdle()
|
||||||
clickMediaPlayerPlayButton()
|
clickMediaPlayerPlayButton()
|
||||||
waitForPlaybackToStart()
|
waitForPlaybackToStart()
|
||||||
}.openNotificationShade {
|
}.openNotificationShade {
|
||||||
|
@ -125,10 +123,9 @@ class MediaNotificationTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(audioTestPage.url) {
|
}.enterURLAndEnterToBrowser(audioTestPage.url) {
|
||||||
// verifyPageContent(audioTestPage.content)
|
mDevice.waitForIdle()
|
||||||
clickMediaPlayerPlayButton()
|
clickMediaPlayerPlayButton()
|
||||||
waitForPlaybackToStart()
|
waitForPlaybackToStart()
|
||||||
// verifyPageContent("Media file is playing")
|
|
||||||
}.openTabDrawer {
|
}.openTabDrawer {
|
||||||
verifyTabMediaControlButtonState("Pause")
|
verifyTabMediaControlButtonState("Pause")
|
||||||
clickTabMediaControlButton()
|
clickTabMediaControlButton()
|
||||||
|
@ -146,10 +143,9 @@ class MediaNotificationTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(audioTestPage.url) {
|
}.enterURLAndEnterToBrowser(audioTestPage.url) {
|
||||||
// verifyPageContent(audioTestPage.content)
|
mDevice.waitForIdle()
|
||||||
clickMediaPlayerPlayButton()
|
clickMediaPlayerPlayButton()
|
||||||
waitForPlaybackToStart()
|
waitForPlaybackToStart()
|
||||||
// verifyPageContent("Media file is playing")
|
|
||||||
}.openNotificationShade {
|
}.openNotificationShade {
|
||||||
verifySystemNotificationExists("A site is playing media")
|
verifySystemNotificationExists("A site is playing media")
|
||||||
clickMediaSystemNotificationControlButton("Pause")
|
clickMediaSystemNotificationControlButton("Pause")
|
||||||
|
|
|
@ -55,18 +55,12 @@ class NavigationToolbarTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
mDevice.waitForIdle()
|
||||||
}.openNavigationToolbar {
|
}.openNavigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(nextWebPage.url) {
|
}.enterURLAndEnterToBrowser(nextWebPage.url) {
|
||||||
// verifyPageContent(nextWebPage.content)
|
verifyUrl(nextWebPage.url.toString())
|
||||||
}
|
mDevice.pressBack()
|
||||||
|
verifyUrl(defaultWebPage.url.toString())
|
||||||
// Re-open the three-dot menu for verification
|
|
||||||
navigationToolbar {
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
verifyThreeDotMenuExists()
|
|
||||||
}.goBack {
|
|
||||||
// verifyPageContent(defaultWebPage.content)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -77,12 +71,14 @@ class NavigationToolbarTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
mDevice.waitForIdle()
|
||||||
}.openNavigationToolbar {
|
}.openNavigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(nextWebPage.url) {
|
}.enterURLAndEnterToBrowser(nextWebPage.url) {
|
||||||
// verifyPageContent(nextWebPage.content)
|
mDevice.waitForIdle()
|
||||||
|
verifyUrl(nextWebPage.url.toString())
|
||||||
mDevice.pressBack()
|
mDevice.pressBack()
|
||||||
// verifyPageContent(defaultWebPage.content)
|
mDevice.waitForIdle()
|
||||||
|
verifyUrl(defaultWebPage.url.toString())
|
||||||
}
|
}
|
||||||
|
|
||||||
// Re-open the three-dot menu for verification
|
// Re-open the three-dot menu for verification
|
||||||
|
@ -91,7 +87,7 @@ class NavigationToolbarTest {
|
||||||
verifyThreeDotMenuExists()
|
verifyThreeDotMenuExists()
|
||||||
verifyForwardButton()
|
verifyForwardButton()
|
||||||
}.goForward {
|
}.goForward {
|
||||||
// verifyPageContent(nextWebPage.content)
|
verifyUrl(nextWebPage.url.toString())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -101,7 +97,7 @@ class NavigationToolbarTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(refreshWebPage.url) {
|
}.enterURLAndEnterToBrowser(refreshWebPage.url) {
|
||||||
// verifyPageContent("DEFAULT")
|
mDevice.waitForIdle()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Use refresh from the three-dot menu
|
// Use refresh from the three-dot menu
|
||||||
|
@ -110,7 +106,7 @@ class NavigationToolbarTest {
|
||||||
verifyThreeDotMenuExists()
|
verifyThreeDotMenuExists()
|
||||||
verifyRefreshButton()
|
verifyRefreshButton()
|
||||||
}.refreshPage {
|
}.refreshPage {
|
||||||
// verifyPageContent("REFRESHED")
|
verifyPageContent("REFRESHED")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -120,7 +116,7 @@ class NavigationToolbarTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
verifyUrl(defaultWebPage.url.toString())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -131,7 +127,7 @@ class NavigationToolbarTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(loremIpsumWebPage.url) {
|
}.enterURLAndEnterToBrowser(loremIpsumWebPage.url) {
|
||||||
// verifyPageContent(loremIpsumWebPage.content)
|
mDevice.waitForIdle()
|
||||||
}
|
}
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
|
|
|
@ -19,6 +19,7 @@ import org.mozilla.fenix.helpers.AndroidAssetDispatcher
|
||||||
import org.mozilla.fenix.helpers.ViewVisibilityIdlingResource
|
import org.mozilla.fenix.helpers.ViewVisibilityIdlingResource
|
||||||
import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
|
import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
|
||||||
import org.mozilla.fenix.helpers.TestAssetHelper
|
import org.mozilla.fenix.helpers.TestAssetHelper
|
||||||
|
import org.mozilla.fenix.ui.robots.mDevice
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tests for verifying basic functionality of content context menus
|
* Tests for verifying basic functionality of content context menus
|
||||||
|
@ -70,7 +71,7 @@ class ReaderViewTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(readerViewPage.url) {
|
}.enterURLAndEnterToBrowser(readerViewPage.url) {
|
||||||
// verifyPageContent(readerViewPage.content)
|
mDevice.waitForIdle()
|
||||||
}
|
}
|
||||||
|
|
||||||
IdlingRegistry.getInstance().register(readerViewNotificationDot)
|
IdlingRegistry.getInstance().register(readerViewNotificationDot)
|
||||||
|
@ -99,7 +100,7 @@ class ReaderViewTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(genericPage.url) {
|
}.enterURLAndEnterToBrowser(genericPage.url) {
|
||||||
// verifyPageContent(genericPage.content)
|
mDevice.waitForIdle()
|
||||||
}
|
}
|
||||||
|
|
||||||
readerViewRobot {
|
readerViewRobot {
|
||||||
|
@ -120,7 +121,7 @@ class ReaderViewTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(readerViewPage.url) {
|
}.enterURLAndEnterToBrowser(readerViewPage.url) {
|
||||||
// verifyPageContent(readerViewPage.content)
|
mDevice.waitForIdle()
|
||||||
}
|
}
|
||||||
|
|
||||||
IdlingRegistry.getInstance().register(readerViewNotificationDot)
|
IdlingRegistry.getInstance().register(readerViewNotificationDot)
|
||||||
|
@ -152,7 +153,7 @@ class ReaderViewTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(readerViewPage.url) {
|
}.enterURLAndEnterToBrowser(readerViewPage.url) {
|
||||||
// verifyPageContent(readerViewPage.content)
|
mDevice.waitForIdle()
|
||||||
}
|
}
|
||||||
|
|
||||||
IdlingRegistry.getInstance().register(readerViewNotificationDot)
|
IdlingRegistry.getInstance().register(readerViewNotificationDot)
|
||||||
|
@ -187,7 +188,7 @@ class ReaderViewTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(readerViewPage.url) {
|
}.enterURLAndEnterToBrowser(readerViewPage.url) {
|
||||||
// verifyPageContent(readerViewPage.content)
|
mDevice.waitForIdle()
|
||||||
}
|
}
|
||||||
|
|
||||||
IdlingRegistry.getInstance().register(readerViewNotificationDot)
|
IdlingRegistry.getInstance().register(readerViewNotificationDot)
|
||||||
|
@ -222,7 +223,7 @@ class ReaderViewTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(readerViewPage.url) {
|
}.enterURLAndEnterToBrowser(readerViewPage.url) {
|
||||||
// verifyPageContent(readerViewPage.content)
|
mDevice.waitForIdle()
|
||||||
}
|
}
|
||||||
|
|
||||||
IdlingRegistry.getInstance().register(readerViewNotificationDot)
|
IdlingRegistry.getInstance().register(readerViewNotificationDot)
|
||||||
|
@ -263,7 +264,7 @@ class ReaderViewTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(readerViewPage.url) {
|
}.enterURLAndEnterToBrowser(readerViewPage.url) {
|
||||||
// verifyPageContent(readerViewPage.content)
|
mDevice.waitForIdle()
|
||||||
}
|
}
|
||||||
|
|
||||||
IdlingRegistry.getInstance().register(readerViewNotificationDot)
|
IdlingRegistry.getInstance().register(readerViewNotificationDot)
|
||||||
|
|
|
@ -133,27 +133,24 @@ class SettingsBasicsTest {
|
||||||
homeScreen {
|
homeScreen {
|
||||||
}.openNavigationToolbar {
|
}.openNavigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(page1.url) {
|
}.enterURLAndEnterToBrowser(page1.url) {
|
||||||
// verifyPageContent(page1.content)
|
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
clickAddBookmarkButton()
|
clickAddBookmarkButton()
|
||||||
}
|
}
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(page2.url) {
|
}.enterURLAndEnterToBrowser(page2.url) {
|
||||||
// verifyPageContent(page2.content)
|
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
clickAddBookmarkButton()
|
clickAddBookmarkButton()
|
||||||
}
|
}
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(page3.url) {
|
}.enterURLAndEnterToBrowser(page3.url) {
|
||||||
// verifyPageContent(page3.content)
|
mDevice.waitForIdle()
|
||||||
}
|
}
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
verifyNoHistoryBookmarks()
|
verifyNoHistoryBookmarks()
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
|
@ -50,7 +50,7 @@ class ShareButtonTest {
|
||||||
// - Visit a URL, wait until it's loaded
|
// - Visit a URL, wait until it's loaded
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
mDevice.waitForIdle()
|
||||||
}
|
}
|
||||||
|
|
||||||
// From the 3-dot menu next to the Select share menu
|
// From the 3-dot menu next to the Select share menu
|
||||||
|
|
|
@ -50,12 +50,10 @@ class SmokeTest {
|
||||||
homeScreen {
|
homeScreen {
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
mDevice.waitForIdle()
|
||||||
verifyNavURLBarItems()
|
verifyNavURLBarItems()
|
||||||
}.openNavigationToolbar {
|
}.openNavigationToolbar {
|
||||||
}.goBackToWebsite {
|
}.goBackToWebsite {
|
||||||
// Check disabled due to intermittent failures
|
|
||||||
// verifyPageContent(defaultWebPage.content)
|
|
||||||
}.openTabDrawer {
|
}.openTabDrawer {
|
||||||
verifyExistingTabList()
|
verifyExistingTabList()
|
||||||
}.openHomeScreen {
|
}.openHomeScreen {
|
||||||
|
|
|
@ -66,7 +66,7 @@ class TabbedBrowsingTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.openNewTabAndEnterToBrowser(defaultWebPage.url) {
|
}.openNewTabAndEnterToBrowser(defaultWebPage.url) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
mDevice.waitForIdle()
|
||||||
verifyTabCounter("1")
|
verifyTabCounter("1")
|
||||||
}.openTabDrawer {
|
}.openTabDrawer {
|
||||||
verifyExistingTabList()
|
verifyExistingTabList()
|
||||||
|
@ -92,7 +92,7 @@ class TabbedBrowsingTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.openNewTabAndEnterToBrowser(defaultWebPage.url) {
|
}.openNewTabAndEnterToBrowser(defaultWebPage.url) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
mDevice.waitForIdle()
|
||||||
verifyTabCounter("1")
|
verifyTabCounter("1")
|
||||||
}.openTabDrawer {
|
}.openTabDrawer {
|
||||||
verifyExistingTabList()
|
verifyExistingTabList()
|
||||||
|
@ -110,7 +110,6 @@ class TabbedBrowsingTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
|
||||||
}.openTabDrawer {
|
}.openTabDrawer {
|
||||||
verifyExistingTabList()
|
verifyExistingTabList()
|
||||||
}.openTabsListThreeDotMenu {
|
}.openTabsListThreeDotMenu {
|
||||||
|
@ -128,7 +127,6 @@ class TabbedBrowsingTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
|
||||||
}.openTabDrawer {
|
}.openTabDrawer {
|
||||||
verifyPrivateModeSelected()
|
verifyPrivateModeSelected()
|
||||||
verifyExistingTabList()
|
verifyExistingTabList()
|
||||||
|
@ -149,7 +147,6 @@ class TabbedBrowsingTest {
|
||||||
genericURLS.forEachIndexed { index, element ->
|
genericURLS.forEachIndexed { index, element ->
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.openNewTabAndEnterToBrowser(element.url) {
|
}.openNewTabAndEnterToBrowser(element.url) {
|
||||||
// verifyPageContent(element.content)
|
|
||||||
}.openTabDrawer {
|
}.openTabDrawer {
|
||||||
verifyExistingOpenTabs("Test_Page_${index + 1}")
|
verifyExistingOpenTabs("Test_Page_${index + 1}")
|
||||||
verifyCloseTabsButton("Test_Page_${index + 1}")
|
verifyCloseTabsButton("Test_Page_${index + 1}")
|
||||||
|
@ -182,7 +179,6 @@ class TabbedBrowsingTest {
|
||||||
genericURLS.forEachIndexed { index, element ->
|
genericURLS.forEachIndexed { index, element ->
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.openNewTabAndEnterToBrowser(element.url) {
|
}.openNewTabAndEnterToBrowser(element.url) {
|
||||||
// verifyPageContent(element.content)
|
|
||||||
}.openTabDrawer {
|
}.openTabDrawer {
|
||||||
verifyExistingOpenTabs("Test_Page_${index + 1}")
|
verifyExistingOpenTabs("Test_Page_${index + 1}")
|
||||||
verifyCloseTabsButton("Test_Page_${index + 1}")
|
verifyCloseTabsButton("Test_Page_${index + 1}")
|
||||||
|
|
|
@ -53,7 +53,6 @@ class TopSitesTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
verifyAddFirefoxHome()
|
verifyAddFirefoxHome()
|
||||||
}.addToFirefoxHome {
|
}.addToFirefoxHome {
|
||||||
|
@ -72,7 +71,6 @@ class TopSitesTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
verifyAddFirefoxHome()
|
verifyAddFirefoxHome()
|
||||||
}.addToFirefoxHome {
|
}.addToFirefoxHome {
|
||||||
|
@ -82,7 +80,6 @@ class TopSitesTest {
|
||||||
verifyExistingTopSitesList()
|
verifyExistingTopSitesList()
|
||||||
verifyExistingTopSitesTabs(defaultWebPageTitle)
|
verifyExistingTopSitesTabs(defaultWebPageTitle)
|
||||||
}.openTopSiteTabWithTitle(title = defaultWebPageTitle) {
|
}.openTopSiteTabWithTitle(title = defaultWebPageTitle) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
|
||||||
verifyUrl(defaultWebPage.url.toString().replace("http://", ""))
|
verifyUrl(defaultWebPage.url.toString().replace("http://", ""))
|
||||||
}.openTabDrawer {
|
}.openTabDrawer {
|
||||||
}.openHomeScreen {
|
}.openHomeScreen {
|
||||||
|
@ -103,7 +100,6 @@ class TopSitesTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
verifyAddFirefoxHome()
|
verifyAddFirefoxHome()
|
||||||
}.addToFirefoxHome {
|
}.addToFirefoxHome {
|
||||||
|
@ -126,7 +122,6 @@ class TopSitesTest {
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
||||||
// verifyPageContent(defaultWebPage.content)
|
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
verifyAddFirefoxHome()
|
verifyAddFirefoxHome()
|
||||||
}.addToFirefoxHome {
|
}.addToFirefoxHome {
|
||||||
|
|
|
@ -39,7 +39,6 @@ import org.mozilla.fenix.ext.components
|
||||||
import org.mozilla.fenix.helpers.Constants.LONG_CLICK_DURATION
|
import org.mozilla.fenix.helpers.Constants.LONG_CLICK_DURATION
|
||||||
import org.mozilla.fenix.helpers.TestAssetHelper
|
import org.mozilla.fenix.helpers.TestAssetHelper
|
||||||
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
|
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
|
||||||
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
|
|
||||||
import org.mozilla.fenix.helpers.click
|
import org.mozilla.fenix.helpers.click
|
||||||
import org.mozilla.fenix.helpers.ext.waitNotNull
|
import org.mozilla.fenix.helpers.ext.waitNotNull
|
||||||
|
|
||||||
|
@ -81,13 +80,11 @@ class BrowserRobot {
|
||||||
/* Asserts that the text within DOM element with ID="testContent" has the given text, i.e.
|
/* Asserts that the text within DOM element with ID="testContent" has the given text, i.e.
|
||||||
* document.querySelector('#testContent').innerText == expectedText
|
* document.querySelector('#testContent').innerText == expectedText
|
||||||
*
|
*
|
||||||
* This function is not working at intended and needs a replacement.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* fun verifyPageContent(expectedText: String) {
|
fun verifyPageContent(expectedText: String) {
|
||||||
// val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
|
assertTrue(mDevice.findObject(UiSelector().text(expectedText)).waitForExists(waitingTime))
|
||||||
// mDevice.waitNotNull(Until.findObject(By.textContains(expectedText)), waitingTime)
|
}
|
||||||
}*/
|
|
||||||
|
|
||||||
fun verifyTabCounter(expectedText: String) {
|
fun verifyTabCounter(expectedText: String) {
|
||||||
onView(withId(R.id.counter_text))
|
onView(withId(R.id.counter_text))
|
||||||
|
@ -336,21 +333,13 @@ class BrowserRobot {
|
||||||
}
|
}
|
||||||
|
|
||||||
fun waitForPlaybackToStart() {
|
fun waitForPlaybackToStart() {
|
||||||
mDevice.waitNotNull(
|
val playStateMessage = mDevice.findObject(UiSelector().text("Media file is playing"))
|
||||||
hasObject(
|
assertTrue(playStateMessage.waitForExists(waitingTime))
|
||||||
text("Media file is playing")
|
|
||||||
), waitingTimeShort
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun verifyMediaIsPaused() {
|
fun verifyMediaIsPaused() {
|
||||||
mDevice.waitNotNull(
|
val pausedStateMessage = mDevice.findObject(UiSelector().text("Media file is paused"))
|
||||||
hasObject(
|
assertTrue(pausedStateMessage.waitForExists(waitingTime))
|
||||||
text("Media file is paused")
|
|
||||||
), waitingTimeShort
|
|
||||||
)
|
|
||||||
|
|
||||||
mDevice.findObject(UiSelector().text("Media file is paused")).exists()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class Transition {
|
class Transition {
|
||||||
|
|
Loading…
Reference in New Issue