From ffddebc39121a7e3d0753a516b588832cb3d7012 Mon Sep 17 00:00:00 2001 From: mojganii Date: Thu, 24 Oct 2024 22:18:29 +0200 Subject: [PATCH 1/4] Remove UITest for Daita from VPNSettings --- .../Pages/VPNSettingsPage.swift | 37 ------------------- .../SettingsMigrationTests.swift | 2 - 2 files changed, 39 deletions(-) diff --git a/ios/MullvadVPNUITests/Pages/VPNSettingsPage.swift b/ios/MullvadVPNUITests/Pages/VPNSettingsPage.swift index 570f32ab080f..197035f58ff5 100644 --- a/ios/MullvadVPNUITests/Pages/VPNSettingsPage.swift +++ b/ios/MullvadVPNUITests/Pages/VPNSettingsPage.swift @@ -127,21 +127,6 @@ class VPNSettingsPage: Page { return self } - @discardableResult func tapDaitaSwitch() -> Self { - app.cells[AccessibilityIdentifier.daitaSwitch] - .switches[AccessibilityIdentifier.customSwitch] - .tap() - let promptIsShown = app - .otherElements[AccessibilityIdentifier.daitaPromptAlert.rawValue] - .waitForExistence(timeout: 1.0) - - if promptIsShown { - DaitaPromptAlert(app) - .tapEnableAnyway() - } - return self - } - @discardableResult func verifyCustomWireGuardPortSelected(portNumber: String) -> Self { let cell = app.cells[AccessibilityIdentifier.wireGuardCustomPort] XCTAssertTrue(cell.isSelected) @@ -193,28 +178,6 @@ class VPNSettingsPage: Page { return self } - @discardableResult func verifyDaitaSwitchOn() -> Self { - let switchElement = app.cells[.daitaSwitch] - .switches[AccessibilityIdentifier.customSwitch] - - guard let switchValue = switchElement.value as? String else { - XCTFail("Failed to read switch state") - return self - } - - XCTAssertEqual(switchValue, "1") - return self - } - - @discardableResult func tapDaitaSwitchIfOn() -> Self { - let switchElement = app.cells[.daitaSwitch].switches[AccessibilityIdentifier.customSwitch] - - if switchElement.value as? String == "1" { - tapDaitaSwitch() - } - return self - } - @discardableResult func tapMultihopSwitchIfOn() -> Self { let switchElement = app.cells[.multihopSwitch].switches[AccessibilityIdentifier.customSwitch] diff --git a/ios/MullvadVPNUITests/SettingsMigrationTests.swift b/ios/MullvadVPNUITests/SettingsMigrationTests.swift index 85ab71bafa34..3d73e82e11ed 100644 --- a/ios/MullvadVPNUITests/SettingsMigrationTests.swift +++ b/ios/MullvadVPNUITests/SettingsMigrationTests.swift @@ -121,7 +121,6 @@ class SettingsMigrationTests: BaseUITestCase { .tapUDPOverTCPPort80Cell() .tapQuantumResistantTunnelExpandButton() .tapQuantumResistantTunnelOnCell() - .tapDaitaSwitch() .tapMultihopSwitch() } @@ -154,7 +153,6 @@ class SettingsMigrationTests: BaseUITestCase { .verifyUDPOverTCPPort80Selected() .tapQuantumResistantTunnelExpandButton() .verifyQuantumResistantTunnelOnSelected() - .verifyDaitaSwitchOn() .verifyMultihopSwitchOn() } } From 6b3af9464b232ac0167db54a6072514fa7b68677 Mon Sep 17 00:00:00 2001 From: mojganii Date: Tue, 29 Oct 2024 13:47:30 +0100 Subject: [PATCH 2/4] Add commit_hash to end to end test --- .github/workflows/ios-end-to-end-tests.yml | 1 - wireguard-go-rs/libwg/wireguard-go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ios-end-to-end-tests.yml b/.github/workflows/ios-end-to-end-tests.yml index 4aa336dd9fdf..d05a7bd8321a 100644 --- a/.github/workflows/ios-end-to-end-tests.yml +++ b/.github/workflows/ios-end-to-end-tests.yml @@ -93,7 +93,6 @@ jobs: with: clean: true ref: ${{ env.COMMIT_HASH }} - - name: Configure Rust uses: actions-rs/toolchain@v1.0.6 with: diff --git a/wireguard-go-rs/libwg/wireguard-go b/wireguard-go-rs/libwg/wireguard-go index 3957ef94034a..b1cf09a982bb 160000 --- a/wireguard-go-rs/libwg/wireguard-go +++ b/wireguard-go-rs/libwg/wireguard-go @@ -1 +1 @@ -Subproject commit 3957ef94034a9cbb47f323b3290620bb849d58e3 +Subproject commit b1cf09a982bba6f6c63fadc956d88e8c2326d05e From 04205243bd842bc1177c317eed8472ab6b0239c8 Mon Sep 17 00:00:00 2001 From: mojganii Date: Fri, 15 Nov 2024 16:46:26 +0100 Subject: [PATCH 3/4] Reuse end to end test in settings migration test --- ...os-end-to-end-tests-settings-migration.yml | 186 ++++++++---------- ios/MullvadVPN.xcodeproj/project.pbxproj | 16 -- .../xcschemes/MullvadVPNUITests.xcscheme | 12 -- .../Pages/VPNSettingsPage.swift | 30 --- ios/MullvadVPNUITests/RelayTests.swift | 38 +--- .../SettingsMigrationTests.swift | 2 - ios/MullvadVPNUITests/tests.json | 45 +++-- ios/PacketTunnelCore/Daita/Maybenot.swift | 8 +- ios/TestPlans/MullvadVPNUITestsAll.xctestplan | 3 +- ...lvadVPNUITestsChangeDNSSettings.xctestplan | 28 --- ...MullvadVPNUITestsChangeSettings.xctestplan | 28 --- ...UITestsVerifyDNSSettingsChanged.xctestplan | 28 --- ...VPNUITestsVerifySettingsChanged.xctestplan | 28 --- 13 files changed, 118 insertions(+), 334 deletions(-) delete mode 100644 ios/TestPlans/MullvadVPNUITestsChangeDNSSettings.xctestplan delete mode 100644 ios/TestPlans/MullvadVPNUITestsChangeSettings.xctestplan delete mode 100644 ios/TestPlans/MullvadVPNUITestsVerifyDNSSettingsChanged.xctestplan delete mode 100644 ios/TestPlans/MullvadVPNUITestsVerifySettingsChanged.xctestplan diff --git a/.github/workflows/ios-end-to-end-tests-settings-migration.yml b/.github/workflows/ios-end-to-end-tests-settings-migration.yml index fb59434b27ef..771345f97a8f 100644 --- a/.github/workflows/ios-end-to-end-tests-settings-migration.yml +++ b/.github/workflows/ios-end-to-end-tests-settings-migration.yml @@ -1,126 +1,108 @@ ---- -name: iOS settings migration tests +name: iOS Settings Migration Tests + concurrency: group: ios-end-to-end-tests cancel-in-progress: false + permissions: contents: read + issues: write + pull-requests: write + on: workflow_dispatch: schedule: # At midnight every day. # Notifications for scheduled workflows are sent to the user who last modified the cron - # syntax in the workflow file. If you update this you must have notifications for - # Github Actions enabled, so these don't go unnoticed. + # syntax in the workflow file. If you update this, ensure notifications for + # GitHub Actions are enabled. # https://docs.github.com/en/actions/monitoring-and-troubleshooting-workflows/notifications-for-workflow-runs - cron: '0 0 * * *' + +# Global environment variables for easy updates env: TEST_DEVICE_UDID: 00008130-0019181022F3803A + OLD_APP_COMMIT_HASH: "98c3489ede22a7eb4a6fcb69b4bd504abbe83d5f" + jobs: - test: - name: Settings migration end to end tests - runs-on: [self-hosted, macOS, ios-test] - env: - OLD_APP_COMMIT_HASH: 895b7d98825e678f5d7023d5ea3c9b7beee89280 + set_commit_hash: + name: Set Commit Hash Environment Variable + runs-on: + - self-hosted + - macOS + - ios-test + outputs: + old_app_commit_hash: ${{ steps.set-hash.outputs.old_app_commit_hash }} steps: - - name: Configure Rust - uses: actions-rs/toolchain@v1.0.6 - with: - toolchain: stable - override: true - target: aarch64-apple-ios - - - name: Uninstall app - timeout-minutes: 5 - run: ios-deploy --id ${{ env.TEST_DEVICE_UDID }} --uninstall_only --bundle_id net.mullvad.MullvadVPN + - name: Set OLD_APP_COMMIT_HASH + id: set-hash + run: echo "::set-output name=old_app_commit_hash::${{ env.OLD_APP_COMMIT_HASH }}" - - name: Checkout old repository version - uses: actions/checkout@v4 - with: - ref: ${{ env.OLD_APP_COMMIT_HASH }} - - - name: Change DNS settings on old app version - uses: ./.github/actions/ios-end-to-end-tests - with: - ios_device_pin_code: ${{ secrets.IOS_DEVICE_PIN_CODE }} - test_device_identifier_uuid: ${{ secrets.IOS_TEST_DEVICE_IDENTIFIER_UUID }} - has_time_account_number: ${{ secrets.IOS_HAS_TIME_ACCOUNT_NUMBER_PRODUCTION }} - no_time_account_number: ${{ secrets.IOS_NO_TIME_ACCOUNT_NUMBER_PRODUCTION }} - test_device_udid: ${{ env.TEST_DEVICE_UDID }} - xcode_test_plan: 'MullvadVPNUITestsChangeDNSSettings' - partner_api_token: ${{ secrets.STAGEMOLE_PARTNER_AUTH }} - - - name: Store test report for changing DNS settings - uses: actions/upload-artifact@v4 - if: always() - with: - name: test-report-change-dns-settings - path: ios/test-report/junit.xml - - - name: Checkout repository to get the current app version - uses: actions/checkout@v4 - - - name: Verify DNS settings still changed on current app version - uses: ./.github/actions/ios-end-to-end-tests - if: always() - with: - ios_device_pin_code: ${{ secrets.IOS_DEVICE_PIN_CODE }} - test_device_identifier_uuid: ${{ secrets.IOS_TEST_DEVICE_IDENTIFIER_UUID }} - has_time_account_number: ${{ secrets.IOS_HAS_TIME_ACCOUNT_NUMBER_PRODUCTION }} - no_time_account_number: ${{ secrets.IOS_NO_TIME_ACCOUNT_NUMBER_PRODUCTION }} - test_device_udid: ${{ env.TEST_DEVICE_UDID }} - partner_api_token: ${{ secrets.STAGEMOLE_PARTNER_AUTH }} - xcode_test_plan: 'MullvadVPNUITestsVerifyDNSSettingsChanged' + uninstall_app: + name: Uninstall Old App + runs-on: + - self-hosted + - macOS + - ios-test + needs: set_commit_hash + env: + TEST_DEVICE_UDID: 00008130-0019181022F3803A + steps: + - name: Install ios-deploy + run: brew install ios-deploy - - name: Store test report for verifying DNS settings - uses: actions/upload-artifact@v4 - if: always() - with: - name: test-report-verify-dns-settings - path: ios/test-report/junit.xml + - name: Verify Device Connection + run: ios-deploy --detect - - name: Checkout old repository version - uses: actions/checkout@v4 - with: - ref: ${{ env.OLD_APP_COMMIT_HASH }} + - name: Uninstall Old App from Device + timeout-minutes: 10 + run: ios-deploy --id ${{ env.TEST_DEVICE_UDID }} --uninstall_only --bundle_id net.mullvad.MullvadVPN - - name: Change all other settings on old app version - uses: ./.github/actions/ios-end-to-end-tests - if: always() - with: - ios_device_pin_code: ${{ secrets.IOS_DEVICE_PIN_CODE }} - test_device_identifier_uuid: ${{ secrets.IOS_TEST_DEVICE_IDENTIFIER_UUID }} - has_time_account_number: ${{ secrets.IOS_HAS_TIME_ACCOUNT_NUMBER_PRODUCTION }} - no_time_account_number: ${{ secrets.IOS_NO_TIME_ACCOUNT_NUMBER_PRODUCTION }} - test_device_udid: ${{ env.TEST_DEVICE_UDID }} - partner_api_token: ${{ secrets.STAGEMOLE_PARTNER_AUTH }} - xcode_test_plan: 'MullvadVPNUITestsChangeSettings' + - name: Verify Uninstallation + run: | + if ios-deploy --id ${{ env.TEST_DEVICE_UDID }} --list | grep net.mullvad.MullvadVPN; then + echo "Uninstallation failed." + exit 1 + else + echo "App successfully uninstalled." + fi - - name: Store test report for changing all settings - uses: actions/upload-artifact@v4 - if: always() - with: - name: test-report-change-all-other-settings - path: ios/test-report/junit.xml + change_dns_settings: + name: Change DNS Settings on Old App Version + uses: ./.github/workflows/ios-end-to-end-tests.yml + needs: + - set_commit_hash + - uninstall_app + with: + arg_tests_json_key: "mullvadVPNUITestsChangeDNSSettings" + commit_hash: ${{ needs.set_commit_hash.outputs.old_app_commit_hash }} + secrets: inherit - - name: Checkout repository to get the current app version - uses: actions/checkout@v4 + verify_dns_settings: + name: Verify DNS Settings on Current App Version + needs: + - change_dns_settings + uses: ./.github/workflows/ios-end-to-end-tests.yml + with: + arg_tests_json_key: "mullvadVPNUITestsVerifyDNSSettingsChanged" + secrets: inherit - - name: Verify all other settings still changed on current app version - uses: ./.github/actions/ios-end-to-end-tests - if: always() - with: - ios_device_pin_code: ${{ secrets.IOS_DEVICE_PIN_CODE }} - test_device_identifier_uuid: ${{ secrets.IOS_TEST_DEVICE_IDENTIFIER_UUID }} - has_time_account_number: ${{ secrets.IOS_HAS_TIME_ACCOUNT_NUMBER_PRODUCTION }} - no_time_account_number: ${{ secrets.IOS_NO_TIME_ACCOUNT_NUMBER_PRODUCTION }} - test_device_udid: ${{ env.TEST_DEVICE_UDID }} - partner_api_token: ${{ secrets.STAGEMOLE_PARTNER_AUTH }} - xcode_test_plan: 'MullvadVPNUITestsVerifySettingsChanged' + change_other_settings: + name: Change All Other Settings on Old App Version + needs: + - set_commit_hash + - verify_dns_settings + uses: ./.github/workflows/ios-end-to-end-tests.yml + with: + arg_tests_json_key: "mullvadVPNUITestsChangeSettings" + commit_hash: ${{ needs.set_commit_hash.outputs.old_app_commit_hash }} + secrets: inherit - - name: Store test report for verifying all other settings - uses: actions/upload-artifact@v4 - if: always() - with: - name: test-report-verify-all-other-settings - path: ios/test-report/junit.xml + verify_other_settings: + name: Verify All Other Settings on Current App Version + needs: + - change_other_settings + uses: ./.github/workflows/ios-end-to-end-tests.yml + with: + arg_tests_json_key: "mullvadVPNUITestsVerifySettingsChanged" + secrets: inherit diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index 7fe94e8467cf..2b41567c292b 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -633,10 +633,6 @@ 8529693A2B4F0238007EAD4C /* TermsOfServicePage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 852969392B4F0238007EAD4C /* TermsOfServicePage.swift */; }; 8529693C2B4F0257007EAD4C /* Alert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8529693B2B4F0257007EAD4C /* Alert.swift */; }; 852A26462BA9C9CB006EB9C8 /* DNSSettingsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 852A26452BA9C9CB006EB9C8 /* DNSSettingsPage.swift */; }; - 852BC66F2BAB44F500A47558 /* MullvadVPNUITestsVerifySettingsChanged.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 852BC66C2BAB44F500A47558 /* MullvadVPNUITestsVerifySettingsChanged.xctestplan */; }; - 852BC6702BAB44F500A47558 /* MullvadVPNUITestsChangeSettings.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 852BC66D2BAB44F500A47558 /* MullvadVPNUITestsChangeSettings.xctestplan */; }; - 852BC6712BAB44F500A47558 /* MullvadVPNUITestsVerifyDNSSettingsChanged.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 852BC66E2BAB44F500A47558 /* MullvadVPNUITestsVerifyDNSSettingsChanged.xctestplan */; }; - 852BC6732BAB450B00A47558 /* MullvadVPNUITestsChangeDNSSettings.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 852BC6722BAB450B00A47558 /* MullvadVPNUITestsChangeDNSSettings.xctestplan */; }; 852D054D2BC3DE3A008578D2 /* APIAccessPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 852D054C2BC3DE3A008578D2 /* APIAccessPage.swift */; }; 852D054F2BC43DF7008578D2 /* AddAccessMethodPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 852D054E2BC43DF7008578D2 /* AddAccessMethodPage.swift */; }; 8532E6872B8CCED600ACECD1 /* ProblemReportSubmittedPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8532E6862B8CCED600ACECD1 /* ProblemReportSubmittedPage.swift */; }; @@ -1955,10 +1951,6 @@ 852969392B4F0238007EAD4C /* TermsOfServicePage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TermsOfServicePage.swift; sourceTree = ""; }; 8529693B2B4F0257007EAD4C /* Alert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Alert.swift; sourceTree = ""; }; 852A26452BA9C9CB006EB9C8 /* DNSSettingsPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DNSSettingsPage.swift; sourceTree = ""; }; - 852BC66C2BAB44F500A47558 /* MullvadVPNUITestsVerifySettingsChanged.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MullvadVPNUITestsVerifySettingsChanged.xctestplan; sourceTree = ""; }; - 852BC66D2BAB44F500A47558 /* MullvadVPNUITestsChangeSettings.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MullvadVPNUITestsChangeSettings.xctestplan; sourceTree = ""; }; - 852BC66E2BAB44F500A47558 /* MullvadVPNUITestsVerifyDNSSettingsChanged.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MullvadVPNUITestsVerifyDNSSettingsChanged.xctestplan; sourceTree = ""; }; - 852BC6722BAB450B00A47558 /* MullvadVPNUITestsChangeDNSSettings.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MullvadVPNUITestsChangeDNSSettings.xctestplan; sourceTree = ""; }; 852D054C2BC3DE3A008578D2 /* APIAccessPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIAccessPage.swift; sourceTree = ""; }; 852D054E2BC43DF7008578D2 /* AddAccessMethodPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddAccessMethodPage.swift; sourceTree = ""; }; 8532E6862B8CCED600ACECD1 /* ProblemReportSubmittedPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProblemReportSubmittedPage.swift; sourceTree = ""; }; @@ -3857,11 +3849,7 @@ 7A83C4002A55B81A00DFB83A /* MullvadVPNCI.xctestplan */, 7A02D4EA2A9CEC7A00C19E31 /* MullvadVPNScreenshots.xctestplan */, 852969302B4D9E70007EAD4C /* MullvadVPNUITestsAll.xctestplan */, - 852BC6722BAB450B00A47558 /* MullvadVPNUITestsChangeDNSSettings.xctestplan */, - 852BC66D2BAB44F500A47558 /* MullvadVPNUITestsChangeSettings.xctestplan */, 85006A8E2B73EF67004AD8FB /* MullvadVPNUITestsSmoke.xctestplan */, - 852BC66E2BAB44F500A47558 /* MullvadVPNUITestsVerifyDNSSettingsChanged.xctestplan */, - 852BC66C2BAB44F500A47558 /* MullvadVPNUITestsVerifySettingsChanged.xctestplan */, ); path = TestPlans; sourceTree = ""; @@ -5052,10 +5040,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 852BC66F2BAB44F500A47558 /* MullvadVPNUITestsVerifySettingsChanged.xctestplan in Resources */, - 852BC6712BAB44F500A47558 /* MullvadVPNUITestsVerifyDNSSettingsChanged.xctestplan in Resources */, - 852BC6702BAB44F500A47558 /* MullvadVPNUITestsChangeSettings.xctestplan in Resources */, - 852BC6732BAB450B00A47558 /* MullvadVPNUITestsChangeDNSSettings.xctestplan in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNUITests.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNUITests.xcscheme index 48eba40cb235..c7c011fb01f5 100644 --- a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNUITests.xcscheme +++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNUITests.xcscheme @@ -16,18 +16,6 @@ reference = "container:TestPlans/MullvadVPNUITestsAll.xctestplan" default = "YES"> - - - - - - - - Self { - app.cells[AccessibilityIdentifier.multihopSwitch] - .switches[AccessibilityIdentifier.customSwitch] - .tap() - return self - } - @discardableResult func verifyCustomWireGuardPortSelected(portNumber: String) -> Self { let cell = app.cells[AccessibilityIdentifier.wireGuardCustomPort] XCTAssertTrue(cell.isSelected) @@ -164,26 +156,4 @@ class VPNSettingsPage: Page { XCTAssertTrue(cell.isSelected) return self } - - @discardableResult func verifyMultihopSwitchOn() -> Self { - let switchElement = app.cells[.multihopSwitch] - .switches[AccessibilityIdentifier.customSwitch] - - guard let switchValue = switchElement.value as? String else { - XCTFail("Failed to read switch state") - return self - } - - XCTAssertEqual(switchValue, "1") - return self - } - - @discardableResult func tapMultihopSwitchIfOn() -> Self { - let switchElement = app.cells[.multihopSwitch].switches[AccessibilityIdentifier.customSwitch] - - if switchElement.value as? String == "1" { - tapMultihopSwitch() - } - return self - } } diff --git a/ios/MullvadVPNUITests/RelayTests.swift b/ios/MullvadVPNUITests/RelayTests.swift index b000d2fe50a5..f539d9e2aaec 100644 --- a/ios/MullvadVPNUITests/RelayTests.swift +++ b/ios/MullvadVPNUITests/RelayTests.swift @@ -245,43 +245,7 @@ class RelayTests: LoggedInWithTimeUITestCase { .tapDisconnectButton() } - func testMultihopSettings() throws { - // Undo enabling Multihop in teardown - addTeardownBlock { - HeaderBar(self.app) - .tapSettingsButton() - - SettingsPage(self.app) - .tapVPNSettingsCell() - - VPNSettingsPage(self.app) - .tapMultihopSwitchIfOn() - } - - HeaderBar(app) - .tapSettingsButton() - - SettingsPage(app) - .tapVPNSettingsCell() - - VPNSettingsPage(app) - .tapMultihopSwitch() - .tapBackButton() - - SettingsPage(app) - .tapDoneButton() - - TunnelControlPage(app) - .tapSecureConnectionButton() - - allowAddVPNConfigurationsIfAsked() - - TunnelControlPage(app) - .waitForSecureConnectionLabel() - .verifyConnectingOverMultihop() - .tapDisconnectButton() - } - + /// Connect to a relay in the default country and city, get name and IP address of the relay the app successfully connects to. Assumes user is logged on and at tunnel control page. private func getDefaultRelayInfo() -> RelayInfo { TunnelControlPage(app) diff --git a/ios/MullvadVPNUITests/SettingsMigrationTests.swift b/ios/MullvadVPNUITests/SettingsMigrationTests.swift index 3d73e82e11ed..a496714103cd 100644 --- a/ios/MullvadVPNUITests/SettingsMigrationTests.swift +++ b/ios/MullvadVPNUITests/SettingsMigrationTests.swift @@ -121,7 +121,6 @@ class SettingsMigrationTests: BaseUITestCase { .tapUDPOverTCPPort80Cell() .tapQuantumResistantTunnelExpandButton() .tapQuantumResistantTunnelOnCell() - .tapMultihopSwitch() } func testVerifySettingsStillChanged() { @@ -153,6 +152,5 @@ class SettingsMigrationTests: BaseUITestCase { .verifyUDPOverTCPPort80Selected() .tapQuantumResistantTunnelExpandButton() .verifyQuantumResistantTunnelOnSelected() - .verifyMultihopSwitchOn() } } diff --git a/ios/MullvadVPNUITests/tests.json b/ios/MullvadVPNUITests/tests.json index 19f5ec287a82..f72074cce573 100644 --- a/ios/MullvadVPNUITests/tests.json +++ b/ios/MullvadVPNUITests/tests.json @@ -1,19 +1,30 @@ { - "tests": { - "nightly": [ - "AccountTests", - "ConnectivityTests", - "CustomListsTests", - "RelayTests", - "SettingsTests" - ], - "pr-merge-to-main": [ - "AccountTests/testLogin", - "AccountTests/testCreateAccount" - ], - "api-tests": [ - "AccountTests" - ] - } + "tests":{ + "nightly":[ + "AccountTests", + "ConnectivityTests", + "CustomListsTests", + "RelayTests", + "SettingsTests" + ], + "pr-merge-to-main":[ + "AccountTests/testLogin", + "AccountTests/testCreateAccount" + ], + "api-tests":[ + "AccountTests" + ], + "mullvadVPNUITestsChangeDNSSettings":[ + "SettingsMigrationTests/testChangeCustomDNSSettings" + ], + "mullvadVPNUITestsVerifyDNSSettingsChanged":[ + "SettingsMigrationTests/testVerifyCustomDNSSettingsStillChanged" + ], + "mullvadVPNUITestsChangeSettings":[ + "SettingsMigrationTests/testChangeVPNSettings" + ], + "mullvadVPNUITestsVerifySettingsChanged":[ + "SettingsMigrationTests/testVerifySettingsStillChanged" + ] + } } - diff --git a/ios/PacketTunnelCore/Daita/Maybenot.swift b/ios/PacketTunnelCore/Daita/Maybenot.swift index 1b38d6135a69..fc5b0bd75cda 100644 --- a/ios/PacketTunnelCore/Daita/Maybenot.swift +++ b/ios/PacketTunnelCore/Daita/Maybenot.swift @@ -2,10 +2,10 @@ // This is an autogenerated file, do not edit public struct Maybenot { public let machines=""" -789cd5cfbb0900200c04d08b833886adb889389f5bb9801be811acb58ae2837ce02010c158b070555c9538b6377a64dbb0ceff242c20b79038507dd169fbede9f629bf6f021efa1b66 -789cedd0510a401110856153f665ffbbb1030e991735717890f8eabae22f35e252e31a6c2b6c2bf158ce88010b61b69fed14db7fabd8498ffad17d8fedbf5decc4adde3ab7b0fddb045fa153d3ff09ecdb6c7faf0cd04322e8 -789cedd1510a80200c80617de95addff36dda096e84b209bfe0f1bb40f32297f1056cbdd954eb68d6c9b7ac8e2e33a650176fbdd6ea07df24227b7daaf9effa27df2462768edade766689fa2a093d47aedbf86f6291a3ad1593ffb6e45fb4454795e630ae31d11bd1bedffeb0151b22c62 -789cedd2bd4b82411c07f07b2a48846a089a326889861a9c2452ee12221e0ca2a5201ca5a122fc0bda042544370771f3159c9c0405e51914e45c5414df7d441075f00515c4c553f0117906075f40f0331c77c7ddef8efb1e05a6de8e6f3d96661392ee1c6a9f349b72e6316a6e542c4c980b5dbb24cfbbcccefa1d00d57df145ff44079506a677adacc29623a4780f30288a312e99440f809a7d9b457c4711a1b8cf7249ea2adf75cb698e1b4fb50f19dc4d67e0c95d12d354186ab3b1e74f5b9ab7aecc4e70f332e918bfdef6db03ce9042a2bba491e88324629022ef85a6f1aa95a3ece0efcb5f5223012039997e3b726455cb84a9f82322db96f6ff531dbada6558bb120bdce79915bf6c6bc5f51659febc1141265ee0 +02eNptjLsNwCAQQ++yQRZImTJlRIfYBDEJA7ERJQtQ0iC+dxSIJ1mWLcv5TsLH9wMmF4KLqwkRAawk2yPR00CHX3V3j1GziWvE09NBBWg9Fjk= +02eNqFjLENwCAMBP8hC2SJlKnTsVr2zBKUaVACNgiBEJxknex/Oezv9fjjRCF8mXLY4pAEbpeFJFlFqJBGA7PqWQ3spCer4l3rnvGDH6+FGlE= +02eNqFjDkOgDAMBL056PkEJTVdvsY/+URKmojDmwiBUDyStbJ35DLuy5anWRrlqLTDcA0AkTXVkDt01ZAHwLFwludZeMsLLILlRRax4+lKcnrnl/8HJzqIIG0= +02eNpdjr0LQVEYxt9zGES5o4myKVksFM45lEHKx0LJYDAZ5C+QRTHIaGETViYDKYPp3ijFYLj3KkmGK2WwuVwiv3rrrafnA1Jm16ijKBQ+6NRDGPJ2E0Xe6YnAD0hFD9nm/ObIHumlv4imZ3Mm8DwvtaxB0Jy1IUex0pYIIB30lhuCYkYvwW6nQFSV41R1L8vkmwlgEOONVvEaYt1SwLhdhxn8gdBgEfXU7RFmzeR9YtPPxrbqOVkLsd29XJhIJfbqRomGheLcYUWeFgxQodrq9wcP1E88/w== """ public let maximumEvents: UInt32 = 1000 public let maximumActions: UInt32 = 1000 diff --git a/ios/TestPlans/MullvadVPNUITestsAll.xctestplan b/ios/TestPlans/MullvadVPNUITestsAll.xctestplan index 475af04ab2c4..8ec7f9753eea 100644 --- a/ios/TestPlans/MullvadVPNUITestsAll.xctestplan +++ b/ios/TestPlans/MullvadVPNUITestsAll.xctestplan @@ -22,8 +22,7 @@ "LoggedInWithTimeUITestCase", "LoggedInWithoutTimeUITestCase", "LoggedOutUITestCase", - "ScreenshotTests", - "SettingsMigrationTests" + "ScreenshotTests" ], "target" : { "containerPath" : "container:MullvadVPN.xcodeproj", diff --git a/ios/TestPlans/MullvadVPNUITestsChangeDNSSettings.xctestplan b/ios/TestPlans/MullvadVPNUITestsChangeDNSSettings.xctestplan deleted file mode 100644 index 92d92d1974a6..000000000000 --- a/ios/TestPlans/MullvadVPNUITestsChangeDNSSettings.xctestplan +++ /dev/null @@ -1,28 +0,0 @@ -{ - "configurations" : [ - { - "id" : "29A4F7B5-B97B-4F31-9EB0-3C09615D0ACF", - "name" : "Configuration 1", - "options" : { - - } - } - ], - "defaultOptions" : { - "testTimeoutsEnabled" : true - }, - "testTargets" : [ - { - "selectedTests" : [ - "MigrationTests\/testChangeCustomDNSSettings()", - "SettingsMigrationTests\/testChangeCustomDNSSettings()" - ], - "target" : { - "containerPath" : "container:MullvadVPN.xcodeproj", - "identifier" : "852969242B4D9C1F007EAD4C", - "name" : "MullvadVPNUITests" - } - } - ], - "version" : 1 -} diff --git a/ios/TestPlans/MullvadVPNUITestsChangeSettings.xctestplan b/ios/TestPlans/MullvadVPNUITestsChangeSettings.xctestplan deleted file mode 100644 index 366e2e597b76..000000000000 --- a/ios/TestPlans/MullvadVPNUITestsChangeSettings.xctestplan +++ /dev/null @@ -1,28 +0,0 @@ -{ - "configurations" : [ - { - "id" : "29A4F7B5-B97B-4F31-9EB0-3C09615D0ACF", - "name" : "Configuration 1", - "options" : { - - } - } - ], - "defaultOptions" : { - "testTimeoutsEnabled" : true - }, - "testTargets" : [ - { - "selectedTests" : [ - "MigrationTests\/testChangeSettings()", - "SettingsMigrationTests\/testChangeSettings()" - ], - "target" : { - "containerPath" : "container:MullvadVPN.xcodeproj", - "identifier" : "852969242B4D9C1F007EAD4C", - "name" : "MullvadVPNUITests" - } - } - ], - "version" : 1 -} diff --git a/ios/TestPlans/MullvadVPNUITestsVerifyDNSSettingsChanged.xctestplan b/ios/TestPlans/MullvadVPNUITestsVerifyDNSSettingsChanged.xctestplan deleted file mode 100644 index 7b2c070a3d3a..000000000000 --- a/ios/TestPlans/MullvadVPNUITestsVerifyDNSSettingsChanged.xctestplan +++ /dev/null @@ -1,28 +0,0 @@ -{ - "configurations" : [ - { - "id" : "29A4F7B5-B97B-4F31-9EB0-3C09615D0ACF", - "name" : "Configuration 1", - "options" : { - - } - } - ], - "defaultOptions" : { - "testTimeoutsEnabled" : true - }, - "testTargets" : [ - { - "selectedTests" : [ - "MigrationTests\/testVerifyCustomDNSSettingsStillChanged()", - "SettingsMigrationTests\/testVerifyCustomDNSSettingsStillChanged()" - ], - "target" : { - "containerPath" : "container:MullvadVPN.xcodeproj", - "identifier" : "852969242B4D9C1F007EAD4C", - "name" : "MullvadVPNUITests" - } - } - ], - "version" : 1 -} diff --git a/ios/TestPlans/MullvadVPNUITestsVerifySettingsChanged.xctestplan b/ios/TestPlans/MullvadVPNUITestsVerifySettingsChanged.xctestplan deleted file mode 100644 index 872d198dd9da..000000000000 --- a/ios/TestPlans/MullvadVPNUITestsVerifySettingsChanged.xctestplan +++ /dev/null @@ -1,28 +0,0 @@ -{ - "configurations" : [ - { - "id" : "29A4F7B5-B97B-4F31-9EB0-3C09615D0ACF", - "name" : "Configuration 1", - "options" : { - - } - } - ], - "defaultOptions" : { - "testTimeoutsEnabled" : true - }, - "testTargets" : [ - { - "selectedTests" : [ - "MigrationTests\/testVerifySettingsStillChanged()", - "SettingsMigrationTests\/testVerifySettingsStillChanged()" - ], - "target" : { - "containerPath" : "container:MullvadVPN.xcodeproj", - "identifier" : "852969242B4D9C1F007EAD4C", - "name" : "MullvadVPNUITests" - } - } - ], - "version" : 1 -} From b6844f0d35389da1a29d82f1ec97b5b649fadae0 Mon Sep 17 00:00:00 2001 From: mojganii Date: Fri, 15 Nov 2024 17:11:58 +0100 Subject: [PATCH 4/4] Update commit id --- .github/workflows/ios-end-to-end-tests-settings-migration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios-end-to-end-tests-settings-migration.yml b/.github/workflows/ios-end-to-end-tests-settings-migration.yml index 771345f97a8f..ca32af943aa2 100644 --- a/.github/workflows/ios-end-to-end-tests-settings-migration.yml +++ b/.github/workflows/ios-end-to-end-tests-settings-migration.yml @@ -22,7 +22,7 @@ on: # Global environment variables for easy updates env: TEST_DEVICE_UDID: 00008130-0019181022F3803A - OLD_APP_COMMIT_HASH: "98c3489ede22a7eb4a6fcb69b4bd504abbe83d5f" + OLD_APP_COMMIT_HASH: "4319bfbe700d3e0f7ecfcd9d004a63f6f12c40ac" jobs: set_commit_hash: