Skip to content
Snippets Groups Projects

Bug 41679: Backport Android-specific security fixes from Firefox 111 to ESR 102.9-based Tor Browser (fenix portion)

Merged morgan requested to merge morgan/fenix:bug_41679 into tor-browser-102.2.1-12.0-2
20 files
+ 1237
17
Compare changes
  • Side-by-side
  • Inline
Files
20
@@ -12,7 +12,6 @@ import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.intent.Intents
import androidx.test.espresso.intent.matcher.IntentMatchers
import androidx.test.espresso.matcher.RootMatchers.isDialog
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -82,6 +81,13 @@ class DownloadRobot {
return Transition()
}
fun closeCompletedDownloadPrompt(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
closeCompletedDownloadButton().click()
BrowserRobot().interact()
return BrowserRobot.Transition()
}
fun closePrompt(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
closePromptButton().click()
@@ -177,12 +183,14 @@ private fun assertDownloadNotificationPopup() {
)
}
private fun closeCompletedDownloadButton() =
onView(withId(R.id.download_dialog_close_button))
private fun closePromptButton() =
onView(withContentDescription("Close"))
onView(withId(R.id.close_button))
private fun downloadButton() =
onView(withText("Download"))
.inRoot(isDialog())
.check(matches(isDisplayed()))
private fun openDownloadButton() =
Loading