For #10915: fix tests by removing existing session

upstream-sync
Oana Horvath 3 years ago committed by mergify[bot]
parent f8599860dd
commit df960c4187

@ -270,22 +270,24 @@ class SettingsPrivacyTest {
}
@Test
@Ignore("See: https://github.com/mozilla-mobile/fenix/issues/10915")
fun openExternalLinksInPrivateTest() {
val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
setOpenLinksInPrivateOn()
openAppFromExternalLink(defaultWebPage.url.toString())
openAppFromExternalLink(firstWebPage.url.toString())
browserScreen {
}.openTabDrawer {
verifyPrivateModeSelected()
}.openNewTab { }.dismissSearchBar { }
}.closeTabDrawer {
}.goToHomescreen { }
setOpenLinksInPrivateOff()
openAppFromExternalLink(defaultWebPage.url.toString())
// We need to open a different link, otherwise it will open the same session
openAppFromExternalLink(secondWebPage.url.toString())
browserScreen {
}.openTabDrawer {
@ -294,7 +296,6 @@ class SettingsPrivacyTest {
}
@Test
@Ignore("See: https://github.com/mozilla-mobile/fenix/issues/10915")
fun launchPageShortcutInPrivateModeTest() {
val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
@ -307,7 +308,18 @@ class SettingsPrivacyTest {
addShortcutName(pageShortcutName)
clickAddShortcutButton()
clickAddAutomaticallyButton()
}.openHomeScreenShortcut(pageShortcutName) {
}
mDevice.waitForIdle()
// We need to close the existing tab here, to open a different session
restartApp(activityTestRule)
browserScreen {
}.openTabDrawer {
closeTab()
}
addToHomeScreen {
}.searchAndOpenHomeScreenShortcut(pageShortcutName) {
}.openTabDrawer {
verifyPrivateModeSelected()
}
@ -328,8 +340,7 @@ class SettingsPrivacyTest {
clickAddShortcutButton()
clickAddAutomaticallyButton()
}.openHomeScreenShortcut(pageShortcutName) {
}.openTabDrawer {
}.openNewTab { }.dismissSearchBar { }
}.goToHomescreen { }
setOpenLinksInPrivateOff()
restartApp(activityTestRule)
@ -339,8 +350,7 @@ class SettingsPrivacyTest {
}.searchAndOpenHomeScreenShortcut(pageShortcutName) {
}.openTabDrawer {
verifyNormalModeSelected()
}.openNewTab {
}.dismissSearchBar {
}.closeTabDrawer {
}.openThreeDotMenu {
}.openSettings {
}.openPrivateBrowsingSubMenu {

Loading…
Cancel
Save