Fix UI test failures (8288739a) · Commits · The Tor Project / Applications / fenix

app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -206,7 +206,7 @@ fun settingsAccountPreferences() = onView(withText(R.string.preferences_sync)).c

	fun settingsSearch() = onView(withText(R.string.preferences_search)).click()		fun settingsSearch() = onView(withText(R.string.preferences_search)).click()

	fun settingsTheme() = onView(withText(R.string.preferences_theme)).click()		fun settingsTheme() = onView(withText(R.string.preferences_customize)).click()

	fun settingsAccessibility() = onView(withText(R.string.preferences_accessibility)).click()		fun settingsAccessibility() = onView(withText(R.string.preferences_accessibility)).click()

app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -36,10 +36,10 @@ import org.mozilla.fenix.helpers.click
	class SettingsRobot {		class SettingsRobot {

	// BASICS SECTION		// BASICS SECTION
	fun verifyBasicsHeading() = assertBasicsHeading()		fun verifyBasicsHeading() = assertGeneralHeading()

	fun verifySearchEngineButton() = assertSearchEngineButton()		fun verifySearchEngineButton() = assertSearchEngineButton()
	fun verifyThemeButton() = assertThemeButton()		fun verifyThemeButton() = assertCustomizeButton()
	fun verifyThemeSelected() = assertThemeSelected()		fun verifyThemeSelected() = assertThemeSelected()
	fun verifyAccessibilityButton() = assertAccessibilityButton()		fun verifyAccessibilityButton() = assertAccessibilityButton()
	fun verifySetAsDefaultBrowserButton() = assertSetAsDefaultBrowserButton()		fun verifySetAsDefaultBrowserButton() = assertSetAsDefaultBrowserButton()
	@@ -159,14 +159,14 @@ class SettingsRobot {

	private fun assertSettingsView() {		private fun assertSettingsView() {
	// verify that we are in the correct library view		// verify that we are in the correct library view
	assertBasicsHeading()		assertGeneralHeading()
	assertPrivacyHeading()		assertPrivacyHeading()
	assertDeveloperToolsHeading()		assertDeveloperToolsHeading()
	assertAboutHeading()		assertAboutHeading()
	}		}

	// BASICS SECTION		// GENERAL SECTION
	private fun assertBasicsHeading() = onView(ViewMatchers.withText("Basics"))		private fun assertGeneralHeading() = onView(ViewMatchers.withText("General"))
	.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))		.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))

	private fun assertSearchEngineButton() {		private fun assertSearchEngineButton() {
	@@ -175,7 +175,7 @@ private fun assertSearchEngineButton() {
	.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))		.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
	}		}

	private fun assertThemeButton() = onView(ViewMatchers.withText("Theme"))		private fun assertCustomizeButton() = onView(ViewMatchers.withText("Customize"))
	.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))		.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))

	private fun assertThemeSelected() = onView(ViewMatchers.withText("Light"))		private fun assertThemeSelected() = onView(ViewMatchers.withText("Light"))
	@@ -190,7 +190,7 @@ private fun assertSetAsDefaultBrowserButton() =

	// PRIVACY SECTION		// PRIVACY SECTION
	private fun assertPrivacyHeading() {		private fun assertPrivacyHeading() {
	onView(ViewMatchers.withText("Privacy"))		onView(ViewMatchers.withText("Privacy and security"))
	.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))		.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
	}		}