corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1949717 - Part 9: Fix failing UI test and update to include new UI elements. r=android-reviewers,mavduevskiy,rebecatudor273

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D240161
This commit is contained in:
t-p-white
2025-03-04 21:58:20 +00:00
parent c430f59f9c
commit ec431636ba
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/focus-android/app/src/androidTest/java/org/mozilla/focus/activity/FirstRunTest.kt
View File

@@ -50,7 +50,7 @@ class FirstRunTest : TestSetup() {
verifyFirstOnboardingScreenItems() verifyFirstOnboardingScreenItems()
restartApp(mActivityTestRule) restartApp(mActivityTestRule)
verifyFirstOnboardingScreenItems() verifyFirstOnboardingScreenItems()
clickGetStartedButton() clickAgreeAndContinueButton()
verifySecondOnboardingScreenItems() verifySecondOnboardingScreenItems()
restartApp(mActivityTestRule) restartApp(mActivityTestRule)
verifySecondOnboardingScreenItems() verifySecondOnboardingScreenItems()

21
mobile/android/focus-android/app/src/androidTest/java/org/mozilla/focus/activity/robots/HomeScreenRobot.kt
View File

@@ -78,7 +78,9 @@ class HomeScreenRobot {
assertTrue(onboardingLogo.waitForExists(waitingTime)) assertTrue(onboardingLogo.waitForExists(waitingTime))
assertTrue(onboardingFirstScreenTitle.waitForExists(waitingTime)) assertTrue(onboardingFirstScreenTitle.waitForExists(waitingTime))
assertTrue(onboardingFirstScreenSubtitle.waitForExists(waitingTime)) assertTrue(onboardingFirstScreenSubtitle.waitForExists(waitingTime))
assertTrue(onboardingGetStartedButton.waitForExists(waitingTime)) assertTrue(onboardingFirstScreenTermsOfUse.waitForExists(waitingTime))
assertTrue(onboardingFirstScreenPrivacyNotice.waitForExists(waitingTime))
assertTrue(onboardingAgreeAndContinueButton.waitForExists(waitingTime))
} }
fun verifySecondOnboardingScreenItems() { fun verifySecondOnboardingScreenItems() {
@@ -90,8 +92,8 @@ class HomeScreenRobot {
assertTrue(onboardingSkipButton.waitForExists(waitingTime)) assertTrue(onboardingSkipButton.waitForExists(waitingTime))
} }
fun clickGetStartedButton() { fun clickAgreeAndContinueButton() {
onboardingGetStartedButton onboardingAgreeAndContinueButton
.also { it.waitForExists(waitingTime) } .also { it.waitForExists(waitingTime) }
.also { it.clickAndWaitForNewWindow(waitingTime) } .also { it.clickAndWaitForNewWindow(waitingTime) }
} }
@@ -206,12 +208,21 @@ private val onboardingSecondScreenSecondSubtitle =
), ),
) )
private val onboardingGetStartedButton = private val onboardingFirstScreenTermsOfUse =
mDevice.findObject( mDevice.findObject(
UiSelector() UiSelector()
.textContains(getStringResource(R.string.onboarding_first_screen_button_text)), .textContains("By continuing, you agree to the Firefox Terms of Use."),
) )
private val onboardingFirstScreenPrivacyNotice =
mDevice.findObject(
UiSelector()
.textContains("Firefox cares about your privacy. Learn more in our Privacy Notice."),
)
private val onboardingAgreeAndContinueButton =
mDevice.findObject(UiSelector().textContains("Agree and continue"))
private val onboardingSetAsDefaultBrowserButton = private val onboardingSetAsDefaultBrowserButton =
mDevice.findObject( mDevice.findObject(
UiSelector() UiSelector()