For #5905 - Fixes UI tests
parent
8288739a60
commit
1f250a730d
|
@ -79,7 +79,7 @@ class SettingsBasicsTest {
|
||||||
verifySearchBrowsingHistory()
|
verifySearchBrowsingHistory()
|
||||||
verifySearchBookmarks()
|
verifySearchBookmarks()
|
||||||
}.goBack {
|
}.goBack {
|
||||||
}.openThemeSubMenu {
|
}.openCustomizeSubMenu {
|
||||||
verifyThemes()
|
verifyThemes()
|
||||||
}.goBack {
|
}.goBack {
|
||||||
}.openAccessibilitySubMenu {
|
}.openAccessibilitySubMenu {
|
||||||
|
@ -165,7 +165,7 @@ class SettingsBasicsTest {
|
||||||
homeScreen {
|
homeScreen {
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openSettings {
|
}.openSettings {
|
||||||
}.openThemeSubMenu {
|
}.openCustomizeSubMenu {
|
||||||
verifyThemes()
|
verifyThemes()
|
||||||
selectDarkMode()
|
selectDarkMode()
|
||||||
verifyDarkThemeApplied(getUiTheme())
|
verifyDarkThemeApplied(getUiTheme())
|
||||||
|
|
|
@ -52,7 +52,7 @@ class SettingsRobot {
|
||||||
fun verifyEnhancedTrackingProtectionValue(state: String) =
|
fun verifyEnhancedTrackingProtectionValue(state: String) =
|
||||||
assertEnhancedTrackingProtectionValue(state)
|
assertEnhancedTrackingProtectionValue(state)
|
||||||
|
|
||||||
fun verifyAddPrivateBrowsingShortcutButton() = assertAddPrivateBrowsingShortcutButton()
|
fun verifyAddPrivateBrowsingShortcutButton() = assertPrivateBrowsingButton()
|
||||||
fun verifySitePermissionsButton() = assertSitePermissionsButton()
|
fun verifySitePermissionsButton() = assertSitePermissionsButton()
|
||||||
fun verifyDeleteBrowsingDataButton() = assertDeleteBrowsingDataButton()
|
fun verifyDeleteBrowsingDataButton() = assertDeleteBrowsingDataButton()
|
||||||
fun verifyDeleteBrowsingDataOnQuitButton() = assertDeleteBrowsingDataOnQuitButton()
|
fun verifyDeleteBrowsingDataOnQuitButton() = assertDeleteBrowsingDataOnQuitButton()
|
||||||
|
@ -102,10 +102,10 @@ class SettingsRobot {
|
||||||
return SettingsSubMenuSearchRobot.Transition()
|
return SettingsSubMenuSearchRobot.Transition()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun openThemeSubMenu(interact: SettingsSubMenuThemeRobot.() -> Unit): SettingsSubMenuThemeRobot.Transition {
|
fun openCustomizeSubMenu(interact: SettingsSubMenuThemeRobot.() -> Unit): SettingsSubMenuThemeRobot.Transition {
|
||||||
|
|
||||||
fun themeButton() = onView(ViewMatchers.withText("Theme"))
|
fun customizeButton() = onView(ViewMatchers.withText("Customize"))
|
||||||
themeButton().click()
|
customizeButton().click()
|
||||||
|
|
||||||
SettingsSubMenuThemeRobot().interact()
|
SettingsSubMenuThemeRobot().interact()
|
||||||
return SettingsSubMenuThemeRobot.Transition()
|
return SettingsSubMenuThemeRobot.Transition()
|
||||||
|
@ -211,10 +211,10 @@ private fun assertLoginsButton() {
|
||||||
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
|
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun assertAddPrivateBrowsingShortcutButton() {
|
private fun assertPrivateBrowsingButton() {
|
||||||
TestHelper.scrollToElementByText("Add private browsing shortcut")
|
TestHelper.scrollToElementByText("Private browsing")
|
||||||
mDevice.wait(Until.findObject(By.text("Add private browsing shortcut")), waitingTime)
|
mDevice.wait(Until.findObject(By.text("Private browsing")), waitingTime)
|
||||||
onView(ViewMatchers.withText("Add private browsing shortcut"))
|
onView(ViewMatchers.withText("Private browsing"))
|
||||||
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
|
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue