blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Fix UI test failures

master
Severin Rudie 2020-02-11 10:59:26 -08:00 committed by Jeff Boek
parent a701988ae9
commit 8288739a60
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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()

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

@ -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)))
} }