From fe17e2acbdbd94018ad506d38542c5e5d2b0fa93 Mon Sep 17 00:00:00 2001 From: Kadeem Date: Fri, 7 Feb 2020 13:55:22 -0500 Subject: [PATCH] Updated About Settings Tests to check if a view is completely displayed --- .../java/org/mozilla/fenix/ui/robots/SettingsRobot.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt index 7d9530d01..efc381261 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt @@ -17,6 +17,7 @@ import androidx.test.espresso.intent.Intents.intended import androidx.test.espresso.intent.matcher.IntentMatchers.toPackage import androidx.test.espresso.matcher.ViewMatchers import androidx.test.espresso.matcher.ViewMatchers.Visibility +import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility import androidx.test.platform.app.InstrumentationRegistry import androidx.test.uiautomator.By @@ -250,19 +251,19 @@ private fun assertRemoteDebug() { private fun assertAboutHeading(): ViewInteraction { TestHelper.scrollToElementByText("About") return onView(ViewMatchers.withText("About")) - .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) + .check(matches(isCompletelyDisplayed())) } private fun assertRateOnGooglePlay(): ViewInteraction { TestHelper.scrollToElementByText("About Firefox Preview") return onView(ViewMatchers.withText("Rate on Google Play")) - .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) + .check(matches(isCompletelyDisplayed())) } private fun assertAboutFirefoxPreview(): ViewInteraction { TestHelper.scrollToElementByText("About Firefox Preview") return onView(ViewMatchers.withText("About Firefox Preview")) - .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) + .check(matches(isCompletelyDisplayed())) } fun swipeToBottom() = onView(ViewMatchers.withId(R.id.recycler_view)).perform(ViewActions.swipeUp())