For #25029 and #26087 re-enable useAppWhileTabIsCrashedTest and privateBrowsingUseAppWhileTabIsCrashedTest UI tests

pull/543/head
AndiAJ 2 years ago committed by mergify[bot]
parent 89acf3b3a2
commit 9721381243

@ -29,6 +29,7 @@ class CrashReportingTest {
isPocketEnabled = false, isPocketEnabled = false,
isJumpBackInCFREnabled = false, isJumpBackInCFREnabled = false,
isWallpaperOnboardingEnabled = false, isWallpaperOnboardingEnabled = false,
isTCPCFREnabled = false,
), ),
) { it.activity } ) { it.activity }
@ -73,7 +74,6 @@ class CrashReportingTest {
} }
} }
@Ignore("Failing, see: https://github.com/mozilla-mobile/fenix/issues/25029")
@SmokeTest @SmokeTest
@Test @Test
fun useAppWhileTabIsCrashedTest() { fun useAppWhileTabIsCrashedTest() {
@ -106,7 +106,6 @@ class CrashReportingTest {
@SmokeTest @SmokeTest
@Test @Test
@Ignore("Failing after compose migration. See: https://github.com/mozilla-mobile/fenix/issues/26087")
fun privateBrowsingUseAppWhileTabIsCrashedTest() { fun privateBrowsingUseAppWhileTabIsCrashedTest() {
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2) val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
@ -120,7 +119,6 @@ class CrashReportingTest {
}.openNewTab { }.openNewTab {
}.submitQuery(secondWebPage.url.toString()) { }.submitQuery(secondWebPage.url.toString()) {
waitForPageToLoad() waitForPageToLoad()
verifyPageContent("Page content: 2")
} }
navigationToolbar { navigationToolbar {

@ -678,12 +678,22 @@ class BrowserRobot {
} }
fun openTabDrawer(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition { fun openTabDrawer(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
mDevice.findObject( mDevice.waitForObjects(
UiSelector().descriptionContains("Tap to switch tabs."), mDevice.findObject(
).waitForExists(waitingTime) UiSelector()
.resourceId("$packageName:id/mozac_browser_toolbar_browser_actions"),
),
waitingTime,
)
tabsCounter().click() tabsCounter().click()
mDevice.waitNotNull(Until.findObject(By.res("$packageName:id/tab_layout")))
mDevice.waitForObjects(
mDevice.findObject(
UiSelector().resourceId("$packageName:id/new_tab_button"),
),
waitingTime,
)
TabDrawerRobot().interact() TabDrawerRobot().interact()
return TabDrawerRobot.Transition() return TabDrawerRobot.Transition()
@ -853,7 +863,8 @@ private fun assertMenuButton() {
.check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
} }
private fun tabsCounter() = mDevice.findObject(By.res("$packageName:id/counter_root")) private fun tabsCounter() =
mDevice.findObject(By.res("$packageName:id/mozac_browser_toolbar_browser_actions"))
private var progressBar = private var progressBar =
mDevice.findObject( mDevice.findObject(

Loading…
Cancel
Save