Unverified Commit 4d139d52 authored by Aaron Train's avatar Aaron Train Committed by GitHub
Browse files

Closes #9189: Fixes "static asset not found" error in... 

Closes #9189: Fixes "static asset not found" error in doNotSaveLoginFromPromptTest, saveLoginFromPromptTest UI tests (#9439)

AndroidAssetDispatcher class dispatcher was attempting to open a local asset with a query suffix from the request. If query suffix is found, remove it. Re-enable saveLoginFromPromptTest() and doNotSaveLoginFromPromptTest()
parent 9679b91e

app/src/androidTest/java/org/mozilla/fenix/helpers/MockWebServer.kt

+4 −4
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ const val HTTP_NOT_FOUND = 404 
class AndroidAssetDispatcher : Dispatcher() {

    private val mainThreadHandler = Handler(Looper.getMainLooper())



    override fun dispatch(request: RecordedRequest): MockResponse {

    override fun dispatch(request: RecordedRequest?): MockResponse {

        val assetManager = InstrumentationRegistry.getInstrumentation().context.assets

        try {

            val pathNoLeadingSlash = request.path.drop(1)

            assetManager.open(pathNoLeadingSlash).use { inputStream ->

                return fileToResponse(pathNoLeadingSlash, inputStream)

            val pathWithoutQueryParams = Uri.parse(request?.path?.drop(1)).path

            assetManager.open(pathWithoutQueryParams!!).use { inputStream ->

                return fileToResponse(pathWithoutQueryParams, inputStream)

            }

        } catch (e: IOException) { // e.g. file not found.

            // We're on a background thread so we need to forward the exception to the main thread.

app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ class SettingsPrivacyTest { 
    }



    @Test

    @Ignore("Passes locally, fails on CI. Fix in https://github.com/mozilla-mobile/fenix/issues/9189")

    fun saveLoginFromPromptTest() {

        val saveLoginTest =

            TestAssetHelper.getSaveLoginAsset(mockWebServer)
@@ -166,7 +165,6 @@ class SettingsPrivacyTest { 
    }



    @Test

    @Ignore("Passes locally, fails on CI. Fix in https://github.com/mozilla-mobile/fenix/issues/9189")

    fun doNotSaveLoginFromPromptTest() {

        val saveLoginTest = TestAssetHelper.getSaveLoginAsset(mockWebServer)