Fixed flaky History UI tests by adding an extra verification step that (#6894)
the page is loaded. Enabled all testsmaster
parent
e1fd53c718
commit
46439930c0
|
@ -11,7 +11,6 @@ import mozilla.components.browser.storage.sync.PlacesHistoryStorage
|
||||||
import okhttp3.mockwebserver.MockWebServer
|
import okhttp3.mockwebserver.MockWebServer
|
||||||
import org.junit.After
|
import org.junit.After
|
||||||
import org.junit.Before
|
import org.junit.Before
|
||||||
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
|
||||||
|
@ -65,12 +64,12 @@ class HistoryTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore("Temp disable flakey test - see: https://github.com/mozilla-mobile/fenix/issues/5462")
|
|
||||||
fun visitedUrlHistoryTest() {
|
fun visitedUrlHistoryTest() {
|
||||||
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
|
verifyPageContent("Page content: 1")
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openLibrary {
|
}.openLibrary {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
|
@ -82,12 +81,12 @@ class HistoryTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore("Temp disable flakey test - see: https://github.com/mozilla-mobile/fenix/issues/5462")
|
|
||||||
fun deleteHistoryItemTest() {
|
fun deleteHistoryItemTest() {
|
||||||
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
|
verifyPageContent("Page content: 1")
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openLibrary {
|
}.openLibrary {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
|
@ -98,12 +97,12 @@ class HistoryTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore("Temp disable flakey test - see: https://github.com/mozilla-mobile/fenix/issues/5462")
|
|
||||||
fun deleteAllHistoryTest() {
|
fun deleteAllHistoryTest() {
|
||||||
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
|
verifyPageContent("Page content: 1")
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openLibrary {
|
}.openLibrary {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
|
@ -115,12 +114,12 @@ class HistoryTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore("Temp disable flakey test - see: https://github.com/mozilla-mobile/fenix/issues/5462")
|
|
||||||
fun multiSelectionToolbarItemsTest() {
|
fun multiSelectionToolbarItemsTest() {
|
||||||
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
|
verifyPageContent("Page content: 1")
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openLibrary {
|
}.openLibrary {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
|
@ -138,12 +137,12 @@ class HistoryTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore("Temp disable flakey test - see: https://github.com/mozilla-mobile/fenix/issues/5462")
|
|
||||||
fun openHistoryInNewTabTest() {
|
fun openHistoryInNewTabTest() {
|
||||||
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
|
verifyPageContent("Page content: 1")
|
||||||
}.openHomeScreen {
|
}.openHomeScreen {
|
||||||
closeTab()
|
closeTab()
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
|
@ -160,12 +159,12 @@ class HistoryTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore("Temp disable flakey test - see: https://github.com/mozilla-mobile/fenix/issues/5462")
|
|
||||||
fun openHistoryInPrivateTabTest() {
|
fun openHistoryInPrivateTabTest() {
|
||||||
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
|
verifyPageContent("Page content: 1")
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openLibrary {
|
}.openLibrary {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
|
@ -181,17 +180,18 @@ class HistoryTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore("Temp disable flakey test - see: https://github.com/mozilla-mobile/fenix/issues/5462")
|
|
||||||
fun deleteMultipleSelectionTest() {
|
fun deleteMultipleSelectionTest() {
|
||||||
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
||||||
val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
|
val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
|
verifyPageContent("Page content: 1")
|
||||||
}.openHomeScreen {}
|
}.openHomeScreen {}
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(secondWebPage.url) {
|
}.enterURLAndEnterToBrowser(secondWebPage.url) {
|
||||||
|
verifyPageContent("Page content: 2")
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openLibrary {
|
}.openLibrary {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
|
@ -210,12 +210,12 @@ class HistoryTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore("Temp disable flakey test - see: https://github.com/mozilla-mobile/fenix/issues/5462")
|
|
||||||
fun shareButtonTest() {
|
fun shareButtonTest() {
|
||||||
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
||||||
|
|
||||||
navigationToolbar {
|
navigationToolbar {
|
||||||
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
}.enterURLAndEnterToBrowser(firstWebPage.url) {
|
||||||
|
verifyPageContent("Page content: 1")
|
||||||
}.openThreeDotMenu {
|
}.openThreeDotMenu {
|
||||||
}.openLibrary {
|
}.openLibrary {
|
||||||
}.openHistory {
|
}.openHistory {
|
||||||
|
|
Loading…
Reference in New Issue