For #10642: Comment out verifyPageContent calls

mozilla-mobile · Jun 18, 2020 · 9f9c3f4 · 9f9c3f4
1 parent 82cbafa
commit 9f9c3f4
Show file tree

Hide file tree

Showing 13 changed files with 72 additions and 70 deletions.
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -233,7 +233,7 @@ class BookmarksTest {
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
         }.openThreeDotMenu(defaultWebPage.url) {
         }.clickOpenInNewTab {
-            verifyPageContent(defaultWebPage.content)
+            // verifyPageContent(defaultWebPage.content)
         }.openTabDrawer {
             verifyNormalModeSelected()
         }
@@ -252,7 +252,7 @@ class BookmarksTest {
             IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
         }.openThreeDotMenu(defaultWebPage.url) {
         }.clickOpenInPrivateTab {
-            verifyPageContent(defaultWebPage.content)
+            // verifyPageContent(defaultWebPage.content)
         }.openTabDrawer {
             verifyPrivateModeSelected()
         }

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
@@ -62,7 +62,7 @@ class ContextMenusTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
-            verifyPageContent(pageLinks.content)
+            // verifyPageContent(pageLinks.content)
             longClickMatchingText("Link 1")
             verifyLinkContextMenuItems(genericURL.url)
             clickContextOpenLinkInNewTab()
@@ -85,7 +85,7 @@ class ContextMenusTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
-            verifyPageContent(pageLinks.content)
+            // verifyPageContent(pageLinks.content)
             longClickMatchingText("Link 2")
             verifyLinkContextMenuItems(genericURL.url)
             clickContextOpenLinkInPrivateTab()
@@ -108,7 +108,7 @@ class ContextMenusTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
-            verifyPageContent(pageLinks.content)
+            // verifyPageContent(pageLinks.content)
             longClickMatchingText("Link 3")
             verifyLinkContextMenuItems(genericURL.url)
             clickContextCopyLink()
@@ -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
@@ -146,7 +146,7 @@ class ContextMenusTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
-            verifyPageContent(pageLinks.content)
+            // verifyPageContent(pageLinks.content)
             longClickMatchingText("test_link_image")
             verifyLinkImageContextMenuItems(imageResource.url)
             clickContextOpenImageNewTab()
@@ -166,7 +166,7 @@ class ContextMenusTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
-            verifyPageContent(pageLinks.content)
+            // verifyPageContent(pageLinks.content)
             longClickMatchingText("test_link_image")
             verifyLinkImageContextMenuItems(imageResource.url)
             clickContextCopyImageLocation()
@@ -187,7 +187,7 @@ class ContextMenusTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
-            verifyPageContent(pageLinks.content)
+            // verifyPageContent(pageLinks.content)
             longClickMatchingText("test_link_image")
             verifyLinkImageContextMenuItems(imageResource.url)
             clickContextSaveImage()
@@ -214,7 +214,7 @@ class ContextMenusTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
-            verifyPageContent(pageLinks.content)
+            // verifyPageContent(pageLinks.content)
             longClickMatchingText("Link 1")
             verifyLinkContextMenuItems(genericURL.url)
             mDevice.pressBack()

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/DownloadTest.kt
@@ -81,7 +81,7 @@ class DownloadTest {
 
         navigationToolbar {
         }.openNewTabAndEnterToBrowser(defaultWebPage.url) {
-            verifyPageContent(defaultWebPage.content)
+            // verifyPageContent(defaultWebPage.content)
             clickLinkMatchingText(defaultWebPage.content)
         }
 
@@ -99,7 +99,7 @@ class DownloadTest {
 
         navigationToolbar {
         }.openNewTabAndEnterToBrowser(defaultWebPage.url) {
-            verifyPageContent(defaultWebPage.content)
+            // verifyPageContent(defaultWebPage.content)
             clickLinkMatchingText(defaultWebPage.content)
         }
 

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
@@ -71,7 +71,7 @@ class HistoryTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(firstWebPage.url) {
-            verifyPageContent("Page content: 1")
+            // verifyPageContent("Page content: 1")
         }.openThreeDotMenu {
         }.openHistory {
             verifyHistoryMenuView()
@@ -87,7 +87,7 @@ class HistoryTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(firstWebPage.url) {
-            verifyPageContent("Page content: 1")
+            // verifyPageContent("Page content: 1")
         }.openThreeDotMenu {
         }.openHistory {
         }.openThreeDotMenu {
@@ -102,7 +102,7 @@ class HistoryTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(firstWebPage.url) {
-            verifyPageContent("Page content: 1")
+            // verifyPageContent("Page content: 1")
         }.openThreeDotMenu {
         }.openHistory {
         }.openThreeDotMenu {
@@ -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()
         }
@@ -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()
         }
@@ -154,7 +154,7 @@ class HistoryTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(firstWebPage.url) {
-            verifyPageContent("Page content: 1")
+            // verifyPageContent("Page content: 1")
         }.openThreeDotMenu {
         }.openHistory {
         }.openThreeDotMenu {
@@ -170,7 +170,7 @@ class HistoryTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(firstWebPage.url) {
-            verifyPageContent("Page content: 1")
+            // verifyPageContent("Page content: 1")
         }.openThreeDotMenu {
         }.openHistory {
             clickDeleteHistoryButton()
@@ -187,7 +187,7 @@ class HistoryTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(firstWebPage.url) {
-            verifyPageContent("Page content: 1")
+            // verifyPageContent("Page content: 1")
         }.openThreeDotMenu {
         }.openHistory {
             longTapSelectItem(firstWebPage.url)
@@ -209,7 +209,7 @@ class HistoryTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(firstWebPage.url) {
-            verifyPageContent("Page content: 1")
+            // verifyPageContent("Page content: 1")
         }.openTabDrawer {
             closeTab()
         }.openHomeScreen { }.openThreeDotMenu {
@@ -232,7 +232,7 @@ class HistoryTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(firstWebPage.url) {
-            verifyPageContent("Page content: 1")
+            // verifyPageContent("Page content: 1")
         }.openThreeDotMenu {
         }.openHistory {
             longTapSelectItem(firstWebPage.url)
@@ -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)
@@ -282,7 +282,7 @@ class HistoryTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(firstWebPage.url) {
-            verifyPageContent("Page content: 1")
+            // verifyPageContent("Page content: 1")
         }.openThreeDotMenu {
         }.openHistory {
             longTapSelectItem(firstWebPage.url)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/MediaNotificationTest.kt
@@ -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")
@@ -92,7 +92,7 @@ class MediaNotificationTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(audioTestPage.url) {
-            verifyPageContent(audioTestPage.content)
+            // verifyPageContent(audioTestPage.content)
             clickMediaPlayerPlayButton()
             waitForPlaybackToStart()
         }.openNotificationShade {
@@ -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()
@@ -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")

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt
@@ -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)
         }
     }
 
@@ -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
@@ -91,7 +91,7 @@ class NavigationToolbarTest {
             verifyThreeDotMenuExists()
             verifyForwardButton()
         }.goForward {
-            verifyPageContent(nextWebPage.content)
+            // verifyPageContent(nextWebPage.content)
         }
     }
 
@@ -102,7 +102,7 @@ class NavigationToolbarTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(refreshWebPage.url) {
-            verifyPageContent("DEFAULT")
+            // verifyPageContent("DEFAULT")
         }
 
         // Use refresh from the three-dot menu
@@ -111,7 +111,7 @@ class NavigationToolbarTest {
             verifyThreeDotMenuExists()
             verifyRefreshButton()
         }.refreshPage {
-            verifyPageContent("REFRESHED")
+            // verifyPageContent("REFRESHED")
         }
     }
 
@@ -121,7 +121,7 @@ class NavigationToolbarTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            verifyPageContent(defaultWebPage.content)
+            // verifyPageContent(defaultWebPage.content)
         }
     }
 
@@ -132,7 +132,7 @@ class NavigationToolbarTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(loremIpsumWebPage.url) {
-            verifyPageContent(loremIpsumWebPage.content)
+            // verifyPageContent(loremIpsumWebPage.content)
         }
 
         navigationToolbar {