Bug 1809609: adds UI test page content assertion and retries

2b44e37f · oana.horvath · mergify[bot] · 74d23bed · 2b44e37f · 2b44e37f
Commit 2b44e37f authored 2 years ago by oana.horvath Committed by mergify[bot] 2 years ago
--- a/focus-android/app/src/androidTest/assets/etpPages/adsTrackers.html
+++ b/focus-android/app/src/androidTest/assets/etpPages/adsTrackers.html
@@ -3,6 +3,7 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <html dir="ltr" xml:lang="en-US" lang="en-US">
+<meta name="viewport" content="width=device-width">
 <head>
    <meta charset="UTF-8">
    <title>adsTrackers</title>

--- a/focus-android/app/src/androidTest/assets/etpPages/analyticsTrackers.html
+++ b/focus-android/app/src/androidTest/assets/etpPages/analyticsTrackers.html
@@ -3,6 +3,7 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <html dir="ltr" xml:lang="en-US" lang="en-US">
+<meta name="viewport" content="width=device-width">
 <head>
    <meta charset="UTF-8">
    <title>analyticsTrackers</title>

--- a/focus-android/app/src/androidTest/assets/etpPages/otherTrackers.html
+++ b/focus-android/app/src/androidTest/assets/etpPages/otherTrackers.html
@@ -3,6 +3,7 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <html dir="ltr" xml:lang="en-US" lang="en-US">
+<meta name="viewport" content="width=device-width">
 <head>
    <meta charset="UTF-8">
    <title>otherTrackers</title>

--- a/focus-android/app/src/androidTest/assets/etpPages/socialTrackers.html
+++ b/focus-android/app/src/androidTest/assets/etpPages/socialTrackers.html
@@ -3,6 +3,7 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <html dir="ltr" xml:lang="en-US" lang="en-US">
+<meta name="viewport" content="width=device-width">
 <head>
    <meta charset="UTF-8">
    <title>socialTrackers</title>

--- a/focus-android/app/src/androidTest/assets/storage_check.html
+++ b/focus-android/app/src/androidTest/assets/storage_check.html
 <!DOCTYPE html>
 <html>
+<meta name="viewport" content="width=device-width">
 <body>

 <h1>Storage check</h1>

--- a/focus-android/app/src/androidTest/java/org/mozilla/focus/activity/robots/BrowserRobot.kt
+++ b/focus-android/app/src/androidTest/java/org/mozilla/focus/activity/robots/BrowserRobot.kt
@@ -50,7 +50,24 @@ class BrowserRobot {
        )

    fun verifyPageContent(expectedText: String) {
-        mDevice.wait(Until.findObject(By.textContains(expectedText)), waitingTime)
+        sessionLoadedIdlingResource = SessionLoadedIdlingResource()
+
+        runWithIdleRes(sessionLoadedIdlingResource) {
+            for (i in 1..RETRY_COUNT) {
+                try {
+                    assertTrue(
+                        webPageItemContainingText(expectedText).waitForExists(pageLoadingTime),
+                    )
+                    break
+                } catch (e: AssertionError) {
+                    if (i == RETRY_COUNT) {
+                        throw e
+                    } else {
+                        refreshPageIfStillLoading(expectedText)
+                    }
+                }
+            }
+        }
    }

    fun verifyTrackingProtectionAlert(expectedText: String) {
@@ -59,7 +76,7 @@ class BrowserRobot {
        for (i in 1..RETRY_COUNT) {
            try {
                assertTrue(
-                    mDevice.findObject(UiSelector().textContains(expectedText))
+                    webPageItemContainingText(expectedText)
                        .waitForExists(pageLoadingTime),
                )
                // close the JavaScript alert