diff options
| author | Andrew Bulhak <andrew.bulhak@mullvad.net> | 2024-12-19 17:47:25 +0100 |
|---|---|---|
| committer | acb-mv <158061187+acb-mv@users.noreply.github.com> | 2025-01-02 10:05:47 +0100 |
| commit | b52988e92219acf3119b34bc3b5238bcf6e7dbb8 (patch) | |
| tree | 5efffa625443c8701c72dc1bdd418d50e865d8a6 | |
| parent | 5fa64e87b65e2b8cd99d3df4f4d76bf86c1507ea (diff) | |
| download | mullvadvpn-b52988e92219acf3119b34bc3b5238bcf6e7dbb8.tar.xz mullvadvpn-b52988e92219acf3119b34bc3b5238bcf6e7dbb8.zip | |
Make tests less ambiguous
4 files changed, 18 insertions, 8 deletions
diff --git a/ios/MullvadVPNUITests/Pages/ShadowsocksObfuscationSettingsPage.swift b/ios/MullvadVPNUITests/Pages/ShadowsocksObfuscationSettingsPage.swift index 0334c9e49f..6b3f41c2ed 100644 --- a/ios/MullvadVPNUITests/Pages/ShadowsocksObfuscationSettingsPage.swift +++ b/ios/MullvadVPNUITests/Pages/ShadowsocksObfuscationSettingsPage.swift @@ -31,8 +31,8 @@ class ShadowsocksObfuscationSettingsPage: Page { customCell.textFields.firstMatch } - @discardableResult func tapPortCell(_ index: Int) -> Self { - portCell(index).tap() + @discardableResult func tapAutomaticPortCell() -> Self { + portCell(0).tap() return self } diff --git a/ios/MullvadVPNUITests/Pages/UDPOverTCPObfuscationSettingsPage.swift b/ios/MullvadVPNUITests/Pages/UDPOverTCPObfuscationSettingsPage.swift index c133ce776a..a645508485 100644 --- a/ios/MullvadVPNUITests/Pages/UDPOverTCPObfuscationSettingsPage.swift +++ b/ios/MullvadVPNUITests/Pages/UDPOverTCPObfuscationSettingsPage.swift @@ -22,8 +22,18 @@ class UDPOverTCPObfuscationSettingsPage: Page { table.cells.element(boundBy: index) } - @discardableResult func tapPortCell(_ index: Int) -> Self { - portCell(index).tap() + @discardableResult func tapAutomaticPortCell() -> Self { + portCell(0).tap() + return self + } + + @discardableResult func tapPort80Cell() -> Self { + portCell(1).tap() + return self + } + + @discardableResult func tapPort5001Cell() -> Self { + portCell(2).tap() return self } diff --git a/ios/MullvadVPNUITests/Pages/VPNSettingsPage.swift b/ios/MullvadVPNUITests/Pages/VPNSettingsPage.swift index a9b20f145c..d833050f10 100644 --- a/ios/MullvadVPNUITests/Pages/VPNSettingsPage.swift +++ b/ios/MullvadVPNUITests/Pages/VPNSettingsPage.swift @@ -180,7 +180,7 @@ class VPNSettingsPage: Page { @discardableResult func verifyUDPOverTCPPort80Selected() -> Self { let detailLabel = app.staticTexts[AccessibilityIdentifier.wireGuardObfuscationUdpOverTcpPort] - XCTAssertTrue(detailLabel.label.hasSuffix("80")) + XCTAssertTrue(detailLabel.label.hasSuffix(" 80")) return self } diff --git a/ios/MullvadVPNUITests/SettingsMigrationTests.swift b/ios/MullvadVPNUITests/SettingsMigrationTests.swift index 8e6959da5c..b1a7e22575 100644 --- a/ios/MullvadVPNUITests/SettingsMigrationTests.swift +++ b/ios/MullvadVPNUITests/SettingsMigrationTests.swift @@ -138,13 +138,13 @@ class SettingsMigrationTests: BaseUITestCase { .tapUDPOverTCPPortSelectorButton() UDPOverTCPObfuscationSettingsPage(app) - .tapPortCell(2) - .tapPortCell(1) + .tapPort5001Cell() + .tapPort80Cell() .tapBackButton() VPNSettingsPage(app) .tapShadowsocksPortSelectorButton() ShadowsocksObfuscationSettingsPage(app) - .tapPortCell(0) + .tapAutomaticPortCell() .tapCustomCell() .enterText("1234") .tapBackButton() |