Bug 1882987 - Remove redundant assertion functions from SiteSecurityRobot

fenix/125.0
AndiAJ 4 months ago committed by mergify[bot]
parent 04d03862d2
commit 0bbeb07069

@ -26,20 +26,7 @@ import org.mozilla.fenix.helpers.TestHelper.packageName
*/
class SiteSecurityRobot {
fun verifyQuickActionSheet(url: String = "", isConnectionSecure: Boolean) = assertQuickActionSheet(url, isConnectionSecure)
fun openSecureConnectionSubMenu(isConnectionSecure: Boolean) {
quickActionSheetSecurityInfo(isConnectionSecure).click()
mDevice.waitForWindowUpdate(packageName, waitingTimeShort)
}
fun verifySecureConnectionSubMenu(pageTitle: String = "", url: String = "", isConnectionSecure: Boolean) =
assertSecureConnectionSubMenu(pageTitle, url, isConnectionSecure)
fun clickQuickActionSheetClearSiteData() = quickActionSheetClearSiteData().click()
fun verifyClearSiteDataPrompt(url: String) = assertClearSiteDataPrompt(url)
class Transition
}
private fun assertQuickActionSheet(url: String = "", isConnectionSecure: Boolean) {
fun verifyQuickActionSheet(url: String = "", isConnectionSecure: Boolean) {
quickActionSheet().waitForExists(waitingTime)
assertUIObjectExists(
quickActionSheetUrl(url.tryGetHostFromUrl()),
@ -48,8 +35,11 @@ private fun assertQuickActionSheet(url: String = "", isConnectionSecure: Boolean
quickActionSheetClearSiteData(),
)
}
private fun assertSecureConnectionSubMenu(pageTitle: String = "", url: String = "", isConnectionSecure: Boolean) {
fun openSecureConnectionSubMenu(isConnectionSecure: Boolean) {
quickActionSheetSecurityInfo(isConnectionSecure).click()
mDevice.waitForWindowUpdate(packageName, waitingTimeShort)
}
fun verifySecureConnectionSubMenu(pageTitle: String = "", url: String = "", isConnectionSecure: Boolean) {
secureConnectionSubMenu().waitForExists(waitingTime)
assertUIObjectExists(
secureConnectionSubMenuPageTitle(pageTitle),
@ -59,13 +49,16 @@ private fun assertSecureConnectionSubMenu(pageTitle: String = "", url: String =
secureConnectionSubMenuCertificateInfo(),
)
}
private fun assertClearSiteDataPrompt(url: String) {
fun clickQuickActionSheetClearSiteData() = quickActionSheetClearSiteData().click()
fun verifyClearSiteDataPrompt(url: String) {
assertUIObjectExists(clearSiteDataPrompt(url))
cancelClearSiteDataButton.check(matches(isDisplayed()))
deleteSiteDataButton.check(matches(isDisplayed()))
}
class Transition
}
private fun quickActionSheet() =
mDevice.findObject(UiSelector().resourceId("$packageName:id/quick_action_sheet"))

Loading…
Cancel
Save