diff --git a/app/src/androidTest/java/org/mozilla/reference/browser/ui/AddonsTest.kt b/app/src/androidTest/java/org/mozilla/reference/browser/ui/AddonsTest.kt index 9a44dd933..29948cdd3 100644 --- a/app/src/androidTest/java/org/mozilla/reference/browser/ui/AddonsTest.kt +++ b/app/src/androidTest/java/org/mozilla/reference/browser/ui/AddonsTest.kt @@ -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 @@ -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" @@ -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" @@ -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" diff --git a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AddonsManagerRobot.kt b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AddonsManagerRobot.kt index 9602fdbc1..c0e487ffc 100644 --- a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AddonsManagerRobot.kt +++ b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AddonsManagerRobot.kt @@ -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) {