Commit 589e186f authored by MozLando's avatar MozLando
Browse files

Merge #7697



7697: For mozilla-mobile/fenix#7310 - Adds bypassCache parameter to reload. r=csadilek a=boek

For mozilla-mobile/fenix#7310 - Adds bypassCache parameter to reload. 


Co-authored-by: default avatarJeff Boek <jeff@jeffboek.com>
parents 91f6850b b931ccb1
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -132,8 +132,8 @@ class GeckoEngineSession(
    /**
     * See [EngineSession.reload]
     */
    override fun reload() {
        geckoSession.reload()
    override fun reload(flags: LoadUrlFlags) {
        geckoSession.reload(flags.value)
    }

    /**
+14 −3
Original line number Diff line number Diff line
@@ -467,7 +467,18 @@ class GeckoEngineSessionTest {

        engineSession.reload()

        verify(geckoSession).reload()
        verify(geckoSession).reload(GeckoSession.LOAD_FLAGS_NONE)
    }

    @Test
    fun reloadBypassingCache() {
        val engineSession = GeckoEngineSession(mock(),
                geckoSessionProvider = geckoSessionProvider)
        engineSession.loadUrl("http://mozilla.org")

        engineSession.reload(flags = LoadUrlFlags.select(LoadUrlFlags.BYPASS_CACHE))

        verify(geckoSession).reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE)
    }

    @Test
@@ -2319,7 +2330,7 @@ class GeckoEngineSessionTest {

        // reload()
        engineSession.reload()
        verify(geckoSession).reload()
        verify(geckoSession).reload(GeckoSession.LOAD_FLAGS_NONE)
        fakePageLoad(false)

        fakePageLoad(true)
@@ -2341,7 +2352,7 @@ class GeckoEngineSessionTest {
        // toggleDesktopMode()
        engineSession.toggleDesktopMode(false, reload = true)
        // This is the second time in this test, so we actually want two invocations.
        verify(geckoSession, times(2)).reload()
        verify(geckoSession, times(2)).reload(GeckoSession.LOAD_FLAGS_NONE)
        fakePageLoad(false)

        fakePageLoad(true)
+2 −2
Original line number Diff line number Diff line
@@ -132,8 +132,8 @@ class GeckoEngineSession(
    /**
     * See [EngineSession.reload]
     */
    override fun reload() {
        geckoSession.reload()
    override fun reload(flags: LoadUrlFlags) {
        geckoSession.reload(flags.value)
    }

    /**
+14 −3
Original line number Diff line number Diff line
@@ -467,7 +467,18 @@ class GeckoEngineSessionTest {

        engineSession.reload()

        verify(geckoSession).reload()
        verify(geckoSession).reload(GeckoSession.LOAD_FLAGS_NONE)
    }

    @Test
    fun reloadBypassingCache() {
        val engineSession = GeckoEngineSession(mock(),
                geckoSessionProvider = geckoSessionProvider)
        engineSession.loadUrl("http://mozilla.org")

        engineSession.reload(flags = LoadUrlFlags.select(LoadUrlFlags.BYPASS_CACHE))

        verify(geckoSession).reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE)
    }

    @Test
@@ -2500,7 +2511,7 @@ class GeckoEngineSessionTest {

        // reload()
        engineSession.reload()
        verify(geckoSession).reload()
        verify(geckoSession).reload(GeckoSession.LOAD_FLAGS_NONE)
        fakePageLoad(false)

        fakePageLoad(true)
@@ -2522,7 +2533,7 @@ class GeckoEngineSessionTest {
        // toggleDesktopMode()
        engineSession.toggleDesktopMode(false, reload = true)
        // This is the second time in this test, so we actually want two invocations.
        verify(geckoSession, times(2)).reload()
        verify(geckoSession, times(2)).reload(GeckoSession.LOAD_FLAGS_NONE)
        fakePageLoad(false)

        fakePageLoad(true)
+2 −2
Original line number Diff line number Diff line
@@ -132,8 +132,8 @@ class GeckoEngineSession(
    /**
     * See [EngineSession.reload]
     */
    override fun reload() {
        geckoSession.reload()
    override fun reload(flags: LoadUrlFlags) {
        geckoSession.reload(flags.value)
    }

    /**
Loading