Rewrite screenshot tests to use new syntax

Author: Jon Petersson

ios/MullvadVPN.xcodeproj/project.pbxproj

@@ -65,7 +65,7 @@ class CustomListsTests: LoggedInWithTimeUITestCase {
         EditCustomListLocationsPage(app)
             .scrollToLocationWith(identifier: "se")
             .toggleLocationCheckmarkWith(identifier: "se")
-            .pressBackButton()
+            .tapBackButton(action: .edit)
 
         CustomListPage(app)
             .tapSaveListButton()
@@ -96,7 +96,7 @@ class CustomListsTests: LoggedInWithTimeUITestCase {
             .unfoldLocationwith(identifier: "se")
             .unfoldLocationwith(identifier: "se-got")
             .toggleLocationCheckmarkWith(identifier: "se-got-wg-001")
-            .pressBackButton()
+            .tapBackButton(action: .edit)
 
         CustomListPage(app)
             .tapSaveListButton()

ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNScreenshots.xcscheme

@@ -39,8 +39,12 @@ class CustomListPage: Page {
         editCustomListNameCell.tap()
         // Select the entire text with a triple tap
         editCustomListNameCell.tap(withNumberOfTaps: 3, numberOfTouches: 1)
-        // Tap the "delete" key on the on-screen keyboard, the case is sensitive
-        app.keys["delete"].tap()
+        // Tap the "delete" key on the on-screen keyboard, the case is sensitive.
+        // However, on a simulator the keyboard isn't visible by default, so we
+        // need to take that into consideration.
+        if app.keys["delete"].isHittable {
+            app.keys["delete"].tap()
+        }
         editCustomListNameCell.typeText(name)
         return self
     }

ios/MullvadVPNScreenshots/Info.plist

@@ -38,7 +38,7 @@ class DNSSettingsPage: Page {
 
     @discardableResult func tapDNSContentBlockersHeaderExpandButton() -> Self {
         let headerView = app.otherElements[AccessibilityIdentifier.dnsContentBlockersHeaderView]
-        let expandButton = headerView.buttons[AccessibilityIdentifier.collapseButton]
+        let expandButton = headerView.buttons[AccessibilityIdentifier.expandButton]
         expandButton.tap()
 
         return self

ios/MullvadVPNScreenshots/MullvadVPNScreenshots.swift

@@ -9,6 +9,10 @@
 import XCTest
 
 class EditCustomListLocationsPage: Page {
+    enum Action {
+        case add, edit
+    }
+
     @discardableResult override init(_ app: XCUIApplication) {
         super.init(app)
 
@@ -46,8 +50,15 @@ class EditCustomListLocationsPage: Page {
         return self
     }
 
-    @discardableResult func pressBackButton() -> Self {
-        app.navigationBars["Edit locations"].buttons.firstMatch.tap()
+    @discardableResult func tapBackButton(action: Action) -> Self {
+        let navigationBarName = switch action {
+        case .add:
+            "Add locations"
+        case .edit:
+            "Edit locations"
+        }
+
+        app.navigationBars[navigationBarName].buttons.firstMatch.tap()
         return self
     }
 }

ios/MullvadVPNUITests/Test base classes/BaseUITestCase.swift ios/MullvadVPNUITests/Base/BaseUITestCase.swift

@@ -16,6 +16,10 @@ class TunnelControlPage: Page {
         let protocolName: String
     }
 
+    var connectionIsSecured: Bool {
+        app.staticTexts[AccessibilityIdentifier.connectionStatusConnectedLabel].exists
+    }
+
     /// Poll the "in address row" label for its updated values and output an array of ConnectionAttempt objects representing the connection attempts that have been communicated through the UI.
     /// - Parameters:
     ///   - attemptsCount: number of connection attempts to look for

ios/MullvadVPNUITests/Test base classes/LoggedInWithTimeUITestCase.swift ios/MullvadVPNUITests/Base/LoggedInWithTimeUITestCase.swift

@@ -14,10 +14,10 @@ class VPNSettingsPage: Page {
         super.init(app)
     }
 
-    private func cellExpandCollapseButton(_ cellAccessiblityIdentifier: AccessibilityIdentifier) -> XCUIElement {
+    private func cellExpandButton(_ cellAccessiblityIdentifier: AccessibilityIdentifier) -> XCUIElement {
         let table = app.tables[AccessibilityIdentifier.vpnSettingsTableView]
         let matchingCells = table.otherElements.containing(.any, identifier: cellAccessiblityIdentifier.rawValue)
-        let expandButton = matchingCells.buttons[AccessibilityIdentifier.collapseButton]
+        let expandButton = matchingCells.buttons[AccessibilityIdentifier.expandButton]
 
         return expandButton
     }
@@ -37,18 +37,18 @@ class VPNSettingsPage: Page {
     }
 
     @discardableResult func tapWireGuardPortsExpandButton() -> Self {
-        cellExpandCollapseButton(AccessibilityIdentifier.wireGuardPortsCell).tap()
+        cellExpandButton(AccessibilityIdentifier.wireGuardPortsCell).tap()
         return self
     }
 
     @discardableResult func tapWireGuardObfuscationExpandButton() -> Self {
-        cellExpandCollapseButton(AccessibilityIdentifier.wireGuardObfuscationCell).tap()
+        cellExpandButton(AccessibilityIdentifier.wireGuardObfuscationCell).tap()
 
         return self
     }
 
     @discardableResult func tapUDPOverTCPPortExpandButton() -> Self {
-        cellExpandCollapseButton(AccessibilityIdentifier.udpOverTCPPortCell).tap()
+        cellExpandButton(AccessibilityIdentifier.udpOverTCPPortCell).tap()
 
         return self
     }
@@ -72,7 +72,7 @@ class VPNSettingsPage: Page {
     }
 
     @discardableResult func tapQuantumResistantTunnelExpandButton() -> Self {
-        cellExpandCollapseButton(AccessibilityIdentifier.quantumResistantTunnelCell).tap()
+        cellExpandButton(AccessibilityIdentifier.quantumResistantTunnelCell).tap()
 
         return self
     }