diff options
| author | Andrew Bulhak <andrew.bulhak@mullvad.net> | 2024-12-19 16:57:13 +0100 |
|---|---|---|
| committer | acb-mv <158061187+acb-mv@users.noreply.github.com> | 2025-01-02 10:05:47 +0100 |
| commit | 5fa64e87b65e2b8cd99d3df4f4d76bf86c1507ea (patch) | |
| tree | a5dff3e368f7444c0a0b6171a49440d4680b31fb /ios | |
| parent | 3eed252d030eadd388332d5599452ea6f62fed07 (diff) | |
| download | mullvadvpn-5fa64e87b65e2b8cd99d3df4f4d76bf86c1507ea.tar.xz mullvadvpn-5fa64e87b65e2b8cd99d3df4f4d76bf86c1507ea.zip | |
Fix testVerifySettingsStillChanged to work with new UI
Diffstat (limited to 'ios')
4 files changed, 7 insertions, 3 deletions
diff --git a/ios/MullvadVPN/Classes/AccessbilityIdentifier.swift b/ios/MullvadVPN/Classes/AccessbilityIdentifier.swift index 86fc7df767..60b0c22fe9 100644 --- a/ios/MullvadVPN/Classes/AccessbilityIdentifier.swift +++ b/ios/MullvadVPN/Classes/AccessbilityIdentifier.swift @@ -181,6 +181,8 @@ public enum AccessibilityIdentifier: Equatable { case wireGuardObfuscationOff case wireGuardObfuscationUdpOverTcp case wireGuardObfuscationShadowsocks + case wireGuardObfuscationUdpOverTcpPort + case wireGuardObfuscationShadowsocksPort case wireGuardPort(UInt16?) case udpOverTcpObfuscationSettings diff --git a/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsCellFactory.swift b/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsCellFactory.swift index 3f0b75c9e1..b1f1c9fd59 100644 --- a/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsCellFactory.swift +++ b/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsCellFactory.swift @@ -39,6 +39,7 @@ final class VPNSettingsCellFactory: CellFactoryProtocol { // swiftlint:disable:next cyclomatic_complexity function_body_length func configureCell(_ cell: UITableViewCell, item: VPNSettingsDataSource.Item, indexPath: IndexPath) { + (cell as? SettingsCell)?.detailTitleLabel.accessibilityIdentifier = nil switch item { case .dnsSettings: guard let cell = cell as? SettingsCell else { return } @@ -154,6 +155,7 @@ final class VPNSettingsCellFactory: CellFactoryProtocol { ), viewModel.obfuscationUpdOverTcpPort.description) cell.setAccessibilityIdentifier(item.accessibilityIdentifier) + cell.detailTitleLabel.setAccessibilityIdentifier(.wireGuardObfuscationUdpOverTcpPort) cell.applySubCellStyling() cell.buttonAction = { [weak self] in @@ -178,6 +180,7 @@ final class VPNSettingsCellFactory: CellFactoryProtocol { ), viewModel.obfuscationShadowsocksPort.description) cell.setAccessibilityIdentifier(item.accessibilityIdentifier) + cell.detailTitleLabel.setAccessibilityIdentifier(.wireGuardObfuscationShadowsocksPort) cell.applySubCellStyling() cell.buttonAction = { [weak self] in diff --git a/ios/MullvadVPNUITests/Pages/VPNSettingsPage.swift b/ios/MullvadVPNUITests/Pages/VPNSettingsPage.swift index 4469607168..a9b20f145c 100644 --- a/ios/MullvadVPNUITests/Pages/VPNSettingsPage.swift +++ b/ios/MullvadVPNUITests/Pages/VPNSettingsPage.swift @@ -179,8 +179,8 @@ class VPNSettingsPage: Page { } @discardableResult func verifyUDPOverTCPPort80Selected() -> Self { - let cell = app.cells["\(AccessibilityIdentifier.wireGuardObfuscationPort)80"] - XCTAssertTrue(cell.isSelected) + let detailLabel = app.staticTexts[AccessibilityIdentifier.wireGuardObfuscationUdpOverTcpPort] + XCTAssertTrue(detailLabel.label.hasSuffix("80")) return self } diff --git a/ios/MullvadVPNUITests/SettingsMigrationTests.swift b/ios/MullvadVPNUITests/SettingsMigrationTests.swift index 0d4281b682..8e6959da5c 100644 --- a/ios/MullvadVPNUITests/SettingsMigrationTests.swift +++ b/ios/MullvadVPNUITests/SettingsMigrationTests.swift @@ -175,7 +175,6 @@ class SettingsMigrationTests: BaseUITestCase { .verifyCustomWireGuardPortSelected(portNumber: wireGuardPort) .tapWireGuardObfuscationExpandButton() .verifyWireGuardObfuscationOnSelected() - .tapUDPOverTCPPortExpandButton() .verifyUDPOverTCPPort80Selected() .tapQuantumResistantTunnelExpandButton() .verifyQuantumResistantTunnelOnSelected() |