blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Closes #12778: re-arranged the steps in closeTabTest and closePrivateTabTest (#13810)

master
Oana Horvath 2020-08-13 19:20:47 +03:00 committed by GitHub
parent f0a045f9b9
commit 4542b4b934
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
View File

@ -10,13 +10,13 @@ import okhttp3.mockwebserver.MockWebServer
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before
import org.junit.BeforeClass import org.junit.BeforeClass
import org.junit.Ignore
import org.junit.Rule import org.junit.Rule
import org.junit.Test import org.junit.Test
import org.mozilla.fenix.helpers.AndroidAssetDispatcher import org.mozilla.fenix.helpers.AndroidAssetDispatcher
import org.mozilla.fenix.helpers.HomeActivityTestRule import org.mozilla.fenix.helpers.HomeActivityTestRule
import org.mozilla.fenix.helpers.TestAssetHelper import org.mozilla.fenix.helpers.TestAssetHelper
import org.mozilla.fenix.helpers.TestHelper.sendSingleTapToScreen import org.mozilla.fenix.helpers.TestHelper.sendSingleTapToScreen
import org.mozilla.fenix.ui.robots.browserScreen
import org.mozilla.fenix.ui.robots.homeScreen import org.mozilla.fenix.ui.robots.homeScreen
import org.mozilla.fenix.ui.robots.navigationToolbar import org.mozilla.fenix.ui.robots.navigationToolbar
import org.mozilla.fenix.ui.robots.notificationShade import org.mozilla.fenix.ui.robots.notificationShade
@ -148,7 +148,6 @@ class TabbedBrowsingTest {
} }
@Test @Test
@Ignore("For some reason this intermittently fails with the drawer :(")
fun closeTabTest() { fun closeTabTest() {
var genericURLS = TestAssetHelper.getGenericAssets(mockWebServer) var genericURLS = TestAssetHelper.getGenericAssets(mockWebServer)
@ -161,25 +160,39 @@ class TabbedBrowsingTest {
closeTabViaXButton("Test_Page_${index + 1}") closeTabViaXButton("Test_Page_${index + 1}")
verifySnackBarText("Tab closed") verifySnackBarText("Tab closed")
snackBarButtonClick("UNDO") snackBarButtonClick("UNDO")
// verifyExistingOpenTabs("Test_Page_${index + 1}") }
// verifyCloseTabsButton("Test_Page_${index + 1}")
// swipeTabRight("Test_Page_${index + 1}") mDevice.waitForIdle()
// verifySnackBarText("Tab closed")
// snackBarButtonClick("UNDO") browserScreen {
// verifyExistingOpenTabs("Test_Page_${index + 1}") }.openTabDrawer {
// verifyCloseTabsButton("Test_Page_${index + 1}") verifyExistingOpenTabs("Test_Page_${index + 1}")
// swipeTabLeft("Test_Page_${index + 1}") swipeTabRight("Test_Page_${index + 1}")
// verifySnackBarText("Tab closed") verifySnackBarText("Tab closed")
// snackBarButtonClick("UNDO") snackBarButtonClick("UNDO")
}
mDevice.waitForIdle()
browserScreen {
}.openTabDrawer {
verifyExistingOpenTabs("Test_Page_${index + 1}")
swipeTabLeft("Test_Page_${index + 1}")
verifySnackBarText("Tab closed")
snackBarButtonClick("UNDO")
}
mDevice.waitForIdle()
browserScreen {
}.openTabDrawer {
verifyExistingOpenTabs("Test_Page_${index + 1}") verifyExistingOpenTabs("Test_Page_${index + 1}")
verifyCloseTabsButton("Test_Page_${index + 1}")
}.openHomeScreen { }.openHomeScreen {
} }
} }
} }
@Test @Test
@Ignore("For some reason this intermittently fails with the drawer :(")
fun closePrivateTabTest() { fun closePrivateTabTest() {
var genericURLS = TestAssetHelper.getGenericAssets(mockWebServer) var genericURLS = TestAssetHelper.getGenericAssets(mockWebServer)
@ -193,19 +206,34 @@ class TabbedBrowsingTest {
closeTabViaXButton("Test_Page_${index + 1}") closeTabViaXButton("Test_Page_${index + 1}")
verifySnackBarText("Private tab closed") verifySnackBarText("Private tab closed")
snackBarButtonClick("UNDO") snackBarButtonClick("UNDO")
// verifyExistingOpenTabs("Test_Page_${index + 1}") }
// verifyCloseTabsButton("Test_Page_${index + 1}")
// swipeTabRight("Test_Page_${index + 1}") mDevice.waitForIdle()
// verifySnackBarText("Private tab closed")
// snackBarButtonClick("UNDO") browserScreen {
// verifyExistingOpenTabs("Test_Page_${index + 1}") }.openTabDrawer {
// verifyCloseTabsButton("Test_Page_${index + 1}")
// swipeTabLeft("Test_Page_${index + 1}")
// verifySnackBarText("Private tab closed")
// snackBarButtonClick("UNDO")
verifyExistingOpenTabs("Test_Page_${index + 1}") verifyExistingOpenTabs("Test_Page_${index + 1}")
verifyCloseTabsButton("Test_Page_${index + 1}") swipeTabRight("Test_Page_${index + 1}")
}.openHomeScreen { verifySnackBarText("Private tab closed")
snackBarButtonClick("UNDO")
}
mDevice.waitForIdle()
browserScreen {
}.openTabDrawer {
verifyExistingOpenTabs("Test_Page_${index + 1}")
swipeTabLeft("Test_Page_${index + 1}")
verifySnackBarText("Private tab closed")
snackBarButtonClick("UNDO")
}
mDevice.waitForIdle()
browserScreen {
}.openTabDrawer {
verifyExistingOpenTabs("Test_Page_${index + 1}")
closeTabViaXButton("Test_Page_${index + 1}")
} }
} }
} }