diff options
| author | Emīls <emils@mullvad.net> | 2026-02-10 15:02:21 +0100 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2026-02-10 15:02:21 +0100 |
| commit | a3d3ac1d50be862b2ee6dd19ae688662580cfbe2 (patch) | |
| tree | 9d0de061a9bcf0a565846d7ca571e2803c491b56 | |
| parent | f0b4bd753a0aa1ffcc30e83ee8e171aa19945ed5 (diff) | |
| parent | 17a6244e248014a90489015ba3098bb77c7fa26b (diff) | |
| download | mullvadvpn-pre-fix-standalone-build.tar.xz mullvadvpn-pre-fix-standalone-build.zip | |
Merge branch 'testappstillfunctioningwhenapidown-fails-ios-1476'pre-fix-standalone-build
| -rw-r--r-- | ios/MullvadVPNUITests/AccountTests.swift | 1 | ||||
| -rw-r--r-- | ios/MullvadVPNUITests/Base/BaseUITestCase.swift | 1 | ||||
| -rw-r--r-- | ios/MullvadVPNUITests/ConnectivityTests.swift | 2 | ||||
| -rw-r--r-- | ios/MullvadVPNUITests/Pages/AccountPage.swift | 6 | ||||
| -rw-r--r-- | ios/MullvadVPNUITests/Pages/Page.swift | 2 |
5 files changed, 1 insertions, 11 deletions
diff --git a/ios/MullvadVPNUITests/AccountTests.swift b/ios/MullvadVPNUITests/AccountTests.swift index eea6be2396..1c1409dd7c 100644 --- a/ios/MullvadVPNUITests/AccountTests.swift +++ b/ios/MullvadVPNUITests/AccountTests.swift @@ -238,7 +238,6 @@ class AccountTests: LoggedOutUITestCase { AccountPage(app) .tapLogOutButton() - .waitForLogoutSpinnerToDisappear() LoginPage(app) diff --git a/ios/MullvadVPNUITests/Base/BaseUITestCase.swift b/ios/MullvadVPNUITests/Base/BaseUITestCase.swift index 9eaa5068ba..ab09ec75a0 100644 --- a/ios/MullvadVPNUITests/Base/BaseUITestCase.swift +++ b/ios/MullvadVPNUITests/Base/BaseUITestCase.swift @@ -331,7 +331,6 @@ class BaseUITestCase: XCTestCase { .tapAccountButton() AccountPage(app) .tapLogOutButton() - .waitForLogoutSpinnerToDisappear() } else { // Workaround for revoked device view not showing account button RevokedDevicePage(app) diff --git a/ios/MullvadVPNUITests/ConnectivityTests.swift b/ios/MullvadVPNUITests/ConnectivityTests.swift index 0640e81621..6ec034d394 100644 --- a/ios/MullvadVPNUITests/ConnectivityTests.swift +++ b/ios/MullvadVPNUITests/ConnectivityTests.swift @@ -131,7 +131,6 @@ class ConnectivityTests: LoggedOutUITestCase { AccountPage(app) .tapLogOutButton() - .waitForLogoutSpinnerToDisappear() LoginPage(app) @@ -218,7 +217,6 @@ class ConnectivityTests: LoggedOutUITestCase { // Log out will take long because API cannot be reached AccountPage(app) .tapLogOutButton() - .waitForLogoutSpinnerToDisappear() // Verify API cannot be reached by doing a login attempt which should fail LoginPage(app) diff --git a/ios/MullvadVPNUITests/Pages/AccountPage.swift b/ios/MullvadVPNUITests/Pages/AccountPage.swift index 6763403e23..ec9c1dc6b1 100644 --- a/ios/MullvadVPNUITests/Pages/AccountPage.swift +++ b/ios/MullvadVPNUITests/Pages/AccountPage.swift @@ -66,12 +66,6 @@ class AccountPage: PaymentPage { return self } - - func waitForLogoutSpinnerToDisappear() { - let spinnerDisappeared = app.otherElements[.logOutSpinnerAlertView] - .notExistsAfterWait(timeout: .extremelyLong) - XCTAssertTrue(spinnerDisappeared, "Log out spinner disappeared") - } } private extension Date { diff --git a/ios/MullvadVPNUITests/Pages/Page.swift b/ios/MullvadVPNUITests/Pages/Page.swift index 983ba50efd..5e0b057377 100644 --- a/ios/MullvadVPNUITests/Pages/Page.swift +++ b/ios/MullvadVPNUITests/Pages/Page.swift @@ -23,7 +23,7 @@ class Page { func waitForPageToBeShown() { if let pageElement { XCTAssertTrue( - pageElement.existsAfterWait(), + pageElement.existsAfterWait(timeout: .extremelyLong), "Page is shown" ) } |