Skip to content

Fixes #4335 #4338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonalmeida merged 2 commits into from
Jun 5, 2026
Merged

Fixes #4335 #4338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8144af1
Fixes #4335
AaronMT Jun 4, 2026
b1f4a25
Merge branch 'master' into 4335
mergify[bot] Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/src/androidTest/java/org/mozilla/reference/browser/ui/AddonsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package org.mozilla.reference.browser.ui
import mockwebserver3.MockWebServer
import org.junit.After
import org.junit.Before
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.mozilla.reference.browser.helpers.AndroidAssetDispatcher
Expand Down Expand Up @@ -61,7 +60,6 @@ class AddonsTest {
}
}

@Ignore("Failing, see: https://github.com/mozilla-mobile/reference-browser/issues/4335")
@Test
fun installAddonTest() {
val addonName = "uBlock Origin"
Expand All @@ -77,7 +75,6 @@ class AddonsTest {
}
}

@Ignore("Failing, see: https://github.com/mozilla-mobile/reference-browser/issues/4335")
@Test
fun verifyAddonElementsTest() {
val addonName = "uBlock Origin"
Expand All @@ -95,7 +92,6 @@ class AddonsTest {
}
}

@Ignore("Failing, see: https://github.com/mozilla-mobile/reference-browser/issues/4335")
@Test
fun removeAddonTest() {
val addonName = "uBlock Origin"
Expand Down
17 changes: 8 additions & 9 deletions app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AddonsManagerRobot.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,14 @@ class AddonsManagerRobot {
}

private fun allowInstallAddonButton() {
assertTrue(mDevice.findObject(UiSelector().text("Add")).waitForExists(waitingTime))

onView(
allOf(
withId(addonsR.id.allow_button),
withText(addonsR.string.mozac_feature_addons_permissions_dialog_add),
),
).check(matches(isCompletelyDisplayed()))
.perform(click())
// The permissions dialog disables the "Add" button for ~1s as
// clickjacking protection. Wait until it becomes enabled.
val allowButton = mDevice.wait(
Until.findObject(By.res("$packageName:id/allow_button").enabled(true)),
waitingTime,
)
assertTrue("Allow button did not become enabled", allowButton != null)
allowButton.click()
}

private fun assertAddonDownloadCompletedPrompt(addonName: String) {
Expand Down