Bug 1842560 - Fix verifyRecentlyClosedTabsListTest UI test

fenix/118.0
AndiAJ 1 year ago committed by mergify[bot]
parent cdec272975
commit e75166ebdc

@ -18,7 +18,10 @@ import org.hamcrest.Matchers
import org.hamcrest.Matchers.allOf import org.hamcrest.Matchers.allOf
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.helpers.HomeActivityComposeTestRule import org.mozilla.fenix.helpers.HomeActivityComposeTestRule
import org.mozilla.fenix.helpers.MatcherHelper.assertItemWithResIdAndTextExists
import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdContainingText
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestHelper.mDevice
import org.mozilla.fenix.helpers.TestHelper.packageName import org.mozilla.fenix.helpers.TestHelper.packageName
import org.mozilla.fenix.helpers.click import org.mozilla.fenix.helpers.click
@ -54,8 +57,9 @@ class RecentlyClosedTabsRobot {
} }
fun verifyRecentlyClosedTabsPageTitle(title: String) = fun verifyRecentlyClosedTabsPageTitle(title: String) =
recentlyClosedTabsPageTitle(title) assertItemWithResIdAndTextExists(
.check(matches(withEffectiveVisibility(Visibility.VISIBLE))) recentlyClosedTabsPageTitle(title),
)
fun verifyRecentlyClosedTabsUrl(expectedUrl: Uri) { fun verifyRecentlyClosedTabsUrl(expectedUrl: Uri) {
onView( onView(
@ -72,7 +76,10 @@ class RecentlyClosedTabsRobot {
class Transition { class Transition {
fun clickRecentlyClosedItem(title: String, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition { fun clickRecentlyClosedItem(title: String, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
recentlyClosedTabsPageTitle(title).click() recentlyClosedTabsPageTitle(title).also {
it.waitForExists(waitingTimeShort)
it.click()
}
mDevice.waitForIdle() mDevice.waitForIdle()
BrowserRobot().interact() BrowserRobot().interact()
@ -109,12 +116,11 @@ class RecentlyClosedTabsRobot {
} }
} }
private fun recentlyClosedTabsPageTitle(title: String) = onView( private fun recentlyClosedTabsPageTitle(title: String) =
allOf( itemWithResIdContainingText(
withId(R.id.title), resourceId = "$packageName:id/title",
withText(title), text = title,
), )
)
private fun recentlyClosedTabDeleteButton() = private fun recentlyClosedTabDeleteButton() =
onView( onView(

Loading…
Cancel
Save