Skip to content
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

Add the openPortSelectorMenuButton accessibility identifier to ... buttons #7282

Merged
merged 1 commit into from
Dec 6, 2024
Merged

Add the openPortSelectorMenuButton accessibility identifier to ... buttons #7282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ios/MullvadVPN/Classes/AccessbilityIdentifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public enum AccessibilityIdentifier: String {
case listCustomListDoneButton
case selectLocationFilterButton
case relayFilterChipCloseButton
case openPortSelectorMenuButton

// Cells
case deviceCell
Expand Down
1 change: 1 addition & 0 deletions ios/MullvadVPN/View controllers/Settings/SelectableSettingsDetailsCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class SelectableSettingsDetailsCell: SelectableSettingsCell {
.withRenderingMode(.alwaysOriginal)
.withTintColor(.white)
actionButton.configuration = actionButtonConfiguration
actionButton.accessibilityIdentifier = .openPortSelectorMenuButton

actionButton.addTarget(
self,
Expand Down
31 changes: 29 additions & 2 deletions ios/MullvadVPNUITests/Pages/VPNSettingsPage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,26 @@ class VPNSettingsPage: Page {
super.init(app)
}

private func cellExpandButton(_ cellAccessiblityIdentifier: AccessibilityIdentifier) -> XCUIElement {
private func cellSubButton(
_ cellAccessiblityIdentifier: AccessibilityIdentifier,
_ subButtonAccessibilityIdentifier: AccessibilityIdentifier
) -> XCUIElement {
let tableView = app.tables[AccessibilityIdentifier.vpnSettingsTableView]
let matchingCells = tableView.otherElements[cellAccessiblityIdentifier.rawValue]
let expandButton = matchingCells.buttons[AccessibilityIdentifier.expandButton]
let expandButton = matchingCells.buttons[subButtonAccessibilityIdentifier]
let lastCell = tableView.cells.allElementsBoundByIndex.last!
tableView.scrollDownToElement(element: lastCell)
return expandButton
}

private func cellExpandButton(_ cellAccessiblityIdentifier: AccessibilityIdentifier) -> XCUIElement {
return cellSubButton(cellAccessiblityIdentifier, .expandButton)
}

private func cellPortSelectorButton(_ cellAccessiblityIdentifier: AccessibilityIdentifier) -> XCUIElement {
return cellSubButton(cellAccessiblityIdentifier, .openPortSelectorMenuButton)
}

@discardableResult func tapBackButton() -> Self {
// Workaround for setting accessibility identifier on navigation bar button being non-trivial
app.buttons.matching(identifier: "Settings").allElementsBoundByIndex.last?.tap()
Expand All @@ -48,24 +59,40 @@ class VPNSettingsPage: Page {
return self
}

@discardableResult func tapUDPOverTCPPortSelectorButton() -> Self {
cellPortSelectorButton(AccessibilityIdentifier.wireGuardObfuscationUdpOverTcp).tap()

return self
}

@discardableResult func tapShadowsocksPortSelectorButton() -> Self {
cellPortSelectorButton(AccessibilityIdentifier.wireGuardObfuscationShadowsocks).tap()

return self
}

// this button no longer exists
@discardableResult func tapUDPOverTCPPortExpandButton() -> Self {
cellExpandButton(AccessibilityIdentifier.udpOverTCPPortCell).tap()

return self
}

// this button no longer exists
@discardableResult func tapUDPOverTCPPortAutomaticCell() -> Self {
app.cells["\(AccessibilityIdentifier.wireGuardObfuscationPort)Automatic"]
.tap()
return self
}

// this button no longer exists
@discardableResult func tapUDPOverTCPPort80Cell() -> Self {
app.cells["\(AccessibilityIdentifier.wireGuardObfuscationPort)80"]
.tap()
return self
}

// this button no longer exists
@discardableResult func tapUDPOverTCPPort5001Cell() -> Self {
app.cells["\(AccessibilityIdentifier.wireGuardObfuscationPort)5001"]
.tap()
Expand Down
Loading