Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

For #10642: Comment out verifyPageContent calls #11748

Merged
merged 1 commit into from
Jun 18, 2020
Merged

For #10642: Comment out verifyPageContent calls #11748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ class BookmarksTest {
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
}.openThreeDotMenu(defaultWebPage.url) {
}.clickOpenInNewTab {
verifyPageContent(defaultWebPage.content)
// verifyPageContent(defaultWebPage.content)
}.openTabDrawer {
verifyNormalModeSelected()
}
Expand All @@ -252,7 +252,7 @@ class BookmarksTest {
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
}.openThreeDotMenu(defaultWebPage.url) {
}.clickOpenInPrivateTab {
verifyPageContent(defaultWebPage.content)
// verifyPageContent(defaultWebPage.content)
}.openTabDrawer {
verifyPrivateModeSelected()
}
Expand Down
16 changes: 8 additions & 8 deletions app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class ContextMenusTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(pageLinks.url) {
verifyPageContent(pageLinks.content)
// verifyPageContent(pageLinks.content)
longClickMatchingText("Link 1")
verifyLinkContextMenuItems(genericURL.url)
clickContextOpenLinkInNewTab()
Expand All @@ -85,7 +85,7 @@ class ContextMenusTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(pageLinks.url) {
verifyPageContent(pageLinks.content)
// verifyPageContent(pageLinks.content)
longClickMatchingText("Link 2")
verifyLinkContextMenuItems(genericURL.url)
clickContextOpenLinkInPrivateTab()
Expand All @@ -108,7 +108,7 @@ class ContextMenusTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(pageLinks.url) {
verifyPageContent(pageLinks.content)
// verifyPageContent(pageLinks.content)
longClickMatchingText("Link 3")
verifyLinkContextMenuItems(genericURL.url)
clickContextCopyLink()
Expand All @@ -129,7 +129,7 @@ class ContextMenusTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(pageLinks.url) {
verifyPageContent(pageLinks.content)
// verifyPageContent(pageLinks.content)
longClickMatchingText("Link 1")
verifyLinkContextMenuItems(genericURL.url)
clickContextShareLink(genericURL.url) // verify share intent is matched with associated URL
Expand All @@ -146,7 +146,7 @@ class ContextMenusTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(pageLinks.url) {
verifyPageContent(pageLinks.content)
// verifyPageContent(pageLinks.content)
longClickMatchingText("test_link_image")
verifyLinkImageContextMenuItems(imageResource.url)
clickContextOpenImageNewTab()
Expand All @@ -166,7 +166,7 @@ class ContextMenusTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(pageLinks.url) {
verifyPageContent(pageLinks.content)
// verifyPageContent(pageLinks.content)
longClickMatchingText("test_link_image")
verifyLinkImageContextMenuItems(imageResource.url)
clickContextCopyImageLocation()
Expand All @@ -187,7 +187,7 @@ class ContextMenusTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(pageLinks.url) {
verifyPageContent(pageLinks.content)
// verifyPageContent(pageLinks.content)
longClickMatchingText("test_link_image")
verifyLinkImageContextMenuItems(imageResource.url)
clickContextSaveImage()
Expand All @@ -214,7 +214,7 @@ class ContextMenusTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(pageLinks.url) {
verifyPageContent(pageLinks.content)
// verifyPageContent(pageLinks.content)
longClickMatchingText("Link 1")
verifyLinkContextMenuItems(genericURL.url)
mDevice.pressBack()
Expand Down
4 changes: 2 additions & 2 deletions app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class DownloadTest {

navigationToolbar {
}.openNewTabAndEnterToBrowser(defaultWebPage.url) {
verifyPageContent(defaultWebPage.content)
// verifyPageContent(defaultWebPage.content)
clickLinkMatchingText(defaultWebPage.content)
}

Expand All @@ -99,7 +99,7 @@ class DownloadTest {

navigationToolbar {
}.openNewTabAndEnterToBrowser(defaultWebPage.url) {
verifyPageContent(defaultWebPage.content)
// verifyPageContent(defaultWebPage.content)
clickLinkMatchingText(defaultWebPage.content)
}

Expand Down
30 changes: 15 additions & 15 deletions app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class HistoryTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(firstWebPage.url) {
verifyPageContent("Page content: 1")
// verifyPageContent("Page content: 1")
}.openThreeDotMenu {
}.openHistory {
verifyHistoryMenuView()
Expand All @@ -87,7 +87,7 @@ class HistoryTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(firstWebPage.url) {
verifyPageContent("Page content: 1")
// verifyPageContent("Page content: 1")
}.openThreeDotMenu {
}.openHistory {
}.openThreeDotMenu {
Expand All @@ -102,7 +102,7 @@ class HistoryTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(firstWebPage.url) {
verifyPageContent("Page content: 1")
// verifyPageContent("Page content: 1")
}.openThreeDotMenu {
}.openHistory {
}.openThreeDotMenu {
Expand All @@ -120,12 +120,12 @@ class HistoryTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(firstWebPage.url) {
verifyPageContent("Page content: 1")
// verifyPageContent("Page content: 1")
}.openThreeDotMenu {
}.openHistory {
}.openThreeDotMenu {
}.clickOpenInNormalTab {
verifyPageContent(firstWebPage.content)
// verifyPageContent(firstWebPage.content)
}.openTabDrawer {
verifyNormalModeSelected()
}
Expand All @@ -137,12 +137,12 @@ class HistoryTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(firstWebPage.url) {
verifyPageContent("Page content: 1")
// verifyPageContent("Page content: 1")
}.openThreeDotMenu {
}.openHistory {
}.openThreeDotMenu {
}.clickOpenInPrivateTab {
verifyPageContent(firstWebPage.content)
// verifyPageContent(firstWebPage.content)
}.openTabDrawer {
verifyPrivateModeSelected()
}
Expand All @@ -154,7 +154,7 @@ class HistoryTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(firstWebPage.url) {
verifyPageContent("Page content: 1")
// verifyPageContent("Page content: 1")
}.openThreeDotMenu {
}.openHistory {
}.openThreeDotMenu {
Expand All @@ -170,7 +170,7 @@ class HistoryTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(firstWebPage.url) {
verifyPageContent("Page content: 1")
// verifyPageContent("Page content: 1")
}.openThreeDotMenu {
}.openHistory {
clickDeleteHistoryButton()
Expand All @@ -187,7 +187,7 @@ class HistoryTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(firstWebPage.url) {
verifyPageContent("Page content: 1")
// verifyPageContent("Page content: 1")
}.openThreeDotMenu {
}.openHistory {
longTapSelectItem(firstWebPage.url)
Expand All @@ -209,7 +209,7 @@ class HistoryTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(firstWebPage.url) {
verifyPageContent("Page content: 1")
// verifyPageContent("Page content: 1")
}.openTabDrawer {
closeTab()
}.openHomeScreen { }.openThreeDotMenu {
Expand All @@ -232,7 +232,7 @@ class HistoryTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(firstWebPage.url) {
verifyPageContent("Page content: 1")
// verifyPageContent("Page content: 1")
}.openThreeDotMenu {
}.openHistory {
longTapSelectItem(firstWebPage.url)
Expand All @@ -254,12 +254,12 @@ class HistoryTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(firstWebPage.url) {
verifyPageContent("Page content: 1")
// verifyPageContent("Page content: 1")
}.openTabDrawer { }.openHomeScreen { }

navigationToolbar {
}.enterURLAndEnterToBrowser(secondWebPage.url) {
verifyPageContent("Page content: 2")
// verifyPageContent("Page content: 2")
}.openThreeDotMenu {
}.openHistory {
longTapSelectItem(firstWebPage.url)
Expand All @@ -282,7 +282,7 @@ class HistoryTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(firstWebPage.url) {
verifyPageContent("Page content: 1")
// verifyPageContent("Page content: 1")
}.openThreeDotMenu {
}.openHistory {
longTapSelectItem(firstWebPage.url)
Expand Down
14 changes: 7 additions & 7 deletions app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ class MediaNotificationTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(videoTestPage.url) {
verifyPageContent(videoTestPage.content)
// verifyPageContent(videoTestPage.content)
clickMediaPlayerPlayButton()
waitForPlaybackToStart()
verifyPageContent("Media file is playing")
// verifyPageContent("Media file is playing")
}.openNotificationShade {
verifySystemNotificationExists(videoTestPage.title)
clickMediaSystemNotificationControlButton("Pause")
Expand Down Expand Up @@ -92,7 +92,7 @@ class MediaNotificationTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(audioTestPage.url) {
verifyPageContent(audioTestPage.content)
// verifyPageContent(audioTestPage.content)
clickMediaPlayerPlayButton()
waitForPlaybackToStart()
}.openNotificationShade {
Expand Down Expand Up @@ -125,10 +125,10 @@ class MediaNotificationTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(audioTestPage.url) {
verifyPageContent(audioTestPage.content)
// verifyPageContent(audioTestPage.content)
clickMediaPlayerPlayButton()
waitForPlaybackToStart()
verifyPageContent("Media file is playing")
// verifyPageContent("Media file is playing")
}.openTabDrawer {
verifyTabMediaControlButtonState("Pause")
clickTabMediaControlButton()
Expand All @@ -146,10 +146,10 @@ class MediaNotificationTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(audioTestPage.url) {
verifyPageContent(audioTestPage.content)
// verifyPageContent(audioTestPage.content)
clickMediaPlayerPlayButton()
waitForPlaybackToStart()
verifyPageContent("Media file is playing")
// verifyPageContent("Media file is playing")
}.openNotificationShade {
verifySystemNotificationExists("A site is playing media")
clickMediaSystemNotificationControlButton("Pause")
Expand Down
22 changes: 11 additions & 11 deletions app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,18 @@ class NavigationToolbarTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
verifyPageContent(defaultWebPage.content)
// verifyPageContent(defaultWebPage.content)
}.openNavigationToolbar {
}.enterURLAndEnterToBrowser(nextWebPage.url) {
verifyPageContent(nextWebPage.content)
// verifyPageContent(nextWebPage.content)
}

// Re-open the three-dot menu for verification
navigationToolbar {
}.openThreeDotMenu {
verifyThreeDotMenuExists()
}.goBack {
verifyPageContent(defaultWebPage.content)
// verifyPageContent(defaultWebPage.content)
}
}

Expand All @@ -77,12 +77,12 @@ class NavigationToolbarTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
verifyPageContent(defaultWebPage.content)
// verifyPageContent(defaultWebPage.content)
}.openNavigationToolbar {
}.enterURLAndEnterToBrowser(nextWebPage.url) {
verifyPageContent(nextWebPage.content)
// verifyPageContent(nextWebPage.content)
mDevice.pressBack()
verifyPageContent(defaultWebPage.content)
// verifyPageContent(defaultWebPage.content)
}

// Re-open the three-dot menu for verification
Expand All @@ -91,7 +91,7 @@ class NavigationToolbarTest {
verifyThreeDotMenuExists()
verifyForwardButton()
}.goForward {
verifyPageContent(nextWebPage.content)
// verifyPageContent(nextWebPage.content)
}
}

Expand All @@ -102,7 +102,7 @@ class NavigationToolbarTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(refreshWebPage.url) {
verifyPageContent("DEFAULT")
// verifyPageContent("DEFAULT")
}

// Use refresh from the three-dot menu
Expand All @@ -111,7 +111,7 @@ class NavigationToolbarTest {
verifyThreeDotMenuExists()
verifyRefreshButton()
}.refreshPage {
verifyPageContent("REFRESHED")
// verifyPageContent("REFRESHED")
}
}

Expand All @@ -121,7 +121,7 @@ class NavigationToolbarTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
verifyPageContent(defaultWebPage.content)
// verifyPageContent(defaultWebPage.content)
}
}

Expand All @@ -132,7 +132,7 @@ class NavigationToolbarTest {

navigationToolbar {
}.enterURLAndEnterToBrowser(loremIpsumWebPage.url) {
verifyPageContent(loremIpsumWebPage.content)
// verifyPageContent(loremIpsumWebPage.content)
}

navigationToolbar {
Expand Down
Loading