ishan/fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For #21441, #21477, #21500, #21499 #21476, #21474: retry dismissing the search bar

Browse Source
This commit is contained in:
Oana Horvath 2021-09-30 15:32:11 +03:00 committed by mergify[bot]
parent 920376ee5b
commit 526501160c
5 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/androidTest/java/org/mozilla/fenix/ui/SettingsBasicsTest.kt
View File

@ -175,9 +175,6 @@ class SettingsBasicsTest {
}.openNavigationToolbar {
}.enterURLAndEnterToBrowser(webpage) {
checkTextSizeOnWebsite(textSizePercentage, fenixApp.components)
}.openTabDrawer {
}.openNewTab {
}.dismissSearchBar {
}.openThreeDotMenu {
}.openSettings {
}.openAccessibilitySubMenu {

3
app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt
View File

@ -230,9 +230,6 @@ class SettingsPrivacyTest {
verifySaveLoginPromptIsShown()
// Don't save the login, add to exceptions
saveLoginFromPrompt("Never save")
}.openTabDrawer {
}.openNewTab {
}.dismissSearchBar {
}.openThreeDotMenu {
}.openSettings {
}.openLoginsAndPasswordSubMenu {

4
app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
View File

@ -322,9 +322,7 @@ class SmokeTest {
expandMenu()
}.addToFirefoxHome {
verifySnackBarText("Added to top sites!")
}.openTabDrawer {
}.openNewTab {
}.dismissSearchBar {
}.goToHomescreen {
verifyExistingTopSitesTabs(defaultWebPage.title)
}
}

16
app/src/androidTest/java/org/mozilla/fenix/ui/TopSitesTest.kt
View File

@ -61,9 +61,7 @@ class TopSitesTest {
verifyAddToTopSitesButton()
}.addToFirefoxHome {
verifySnackBarText("Added to top sites!")
}.openTabDrawer {
}.openNewTab {
}.dismissSearchBar {
}.goToHomescreen {
verifyExistingTopSitesList()
verifyExistingTopSitesTabs(defaultWebPageTitle)
}
@ -113,9 +111,7 @@ class TopSitesTest {
verifyAddToTopSitesButton()
}.addToFirefoxHome {
verifySnackBarText("Added to top sites!")
}.openTabDrawer {
}.openNewTab {
}.dismissSearchBar {
}.goToHomescreen {
verifyExistingTopSitesList()
verifyExistingTopSitesTabs(defaultWebPageTitle)
}.openContextMenuOnTopSitesWithTitle(defaultWebPageTitle) {
@ -140,9 +136,7 @@ class TopSitesTest {
verifyAddToTopSitesButton()
}.addToFirefoxHome {
verifySnackBarText("Added to top sites!")
}.openTabDrawer {
}.openNewTab {
}.dismissSearchBar {
}.goToHomescreen {
verifyExistingTopSitesList()
verifyExistingTopSitesTabs(defaultWebPageTitle)
}.openContextMenuOnTopSitesWithTitle(defaultWebPageTitle) {
@ -167,9 +161,7 @@ class TopSitesTest {
verifyAddToTopSitesButton()
}.addToFirefoxHome {
verifySnackBarText("Added to top sites!")
}.openTabDrawer {
}.openNewTab {
}.dismissSearchBar {
}.goToHomescreen {
verifyExistingTopSitesList()
verifyExistingTopSitesTabs(defaultWebPageTitle)
}.openContextMenuOnTopSitesWithTitle(defaultWebPageTitle) {

10
app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
View File

@ -43,6 +43,7 @@ import org.mozilla.fenix.helpers.Constants.LONG_CLICK_DURATION
import org.mozilla.fenix.helpers.SessionLoadedIdlingResource
import org.mozilla.fenix.helpers.TestAssetHelper
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
import org.mozilla.fenix.helpers.TestHelper.packageName
import org.mozilla.fenix.helpers.TestHelper.waitForObjects
import org.mozilla.fenix.helpers.click
@ -185,6 +186,13 @@ class SearchRobot {
mDevice.waitForIdle()
closeSoftKeyboard()
mDevice.pressBack()
try {
assertTrue(searchWrapper().waitUntilGone(waitingTimeShort))
} catch (e: AssertionError) {
mDevice.pressBack()
assertTrue(searchWrapper().waitUntilGone(waitingTimeShort))
}
HomeScreenRobot().interact()
return HomeScreenRobot.Transition()
}
@ -244,7 +252,7 @@ private fun scanButton(): ViewInteraction {
private fun clearButton() =
mDevice.findObject(UiSelector().resourceId("$packageName:id/mozac_browser_toolbar_clear_view"))
private fun searchWrapper() = onView(withId(R.id.search_wrapper))
private fun searchWrapper() = mDevice.findObject(UiSelector().resourceId("$packageName:id/search_wrapper"))
private fun assertSearchEngineURL(searchEngineName: String) {
mDevice.waitNotNull(