Add missing button identifiers

6 files changed, 13 insertions, 7 deletions

diff --git a/ios/MullvadVPN/ConnectViewController.swift b/ios/MullvadVPN/ConnectViewController.swift
index 725b2472da..c78cd57c22 100644
--- a/ios/MullvadVPN/ConnectViewController.swift
+++ b/ios/MullvadVPN/ConnectViewController.swift
@@ -63,6 +63,9 @@ class ConnectViewController: UIViewController, RootContainment, TunnelObserver,
             button.titleLabel?.font = UIFont.systemFont(ofSize: 18, weight: .semibold)
         }
 
+        selectLocationButton.accessibilityIdentifier = "SelectLocationButton"
+        splitDisconnectButtonView.primaryButton.accessibilityIdentifier = "DisconnectButton"
+
         connectionPanel.collapseButton.addTarget(self, action: #selector(handleConnectionPanelButton(_:)), for: .touchUpInside)
         connectButton.addTarget(self, action: #selector(handleConnect(_:)), for: .touchUpInside)
         splitDisconnectButtonView.primaryButton.addTarget(self, action: #selector(handleDisconnect(_:)), for: .touchUpInside)
diff --git a/ios/MullvadVPN/ConsentViewController.xib b/ios/MullvadVPN/ConsentViewController.xib
index 331483b9ae..3345552936 100644
--- a/ios/MullvadVPN/ConsentViewController.xib
+++ b/ios/MullvadVPN/ConsentViewController.xib
@@ -20,7 +20,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fbX-Lo-tij">
-                    <rect key="frame" x="0.0" y="0.0" width="414" height="793"/>
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="792"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="11q-bQ-xwY" userLabel="Content view">
                             <rect key="frame" x="0.0" y="0.0" width="414" height="558"/>
@@ -59,7 +59,7 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DsZ-mb-iQe" customClass="LinkButton" customModule="MullvadVPN" customModuleProvider="target">
-                                    <rect key="frame" x="20" y="516" width="20" height="22"/>
+                                    <rect key="frame" x="20" y="516" width="128" height="22"/>
                                     <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="18"/>
                                     <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <state key="normal" title="Privacy Policy" image="IconExtlink"/>
@@ -95,10 +95,10 @@
                     </constraints>
                 </scrollView>
                 <view contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FYK-e4-iEm" userLabel="Footer">
-                    <rect key="frame" x="0.0" y="793" width="414" height="103"/>
+                    <rect key="frame" x="0.0" y="792" width="414" height="104"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7rE-vW-Iff" customClass="AppButton" customModule="MullvadVPN" customModuleProvider="target">
-                            <rect key="frame" x="20" y="24" width="374" height="21"/>
+                            <rect key="frame" x="20" y="24" width="374" height="22"/>
                             <accessibility key="accessibilityConfiguration" identifier="AgreeButton"/>
                             <state key="normal" title="Agree and continue" backgroundImage="DefaultButton">
                                 <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/ios/MullvadVPN/HeaderBarView.swift b/ios/MullvadVPN/HeaderBarView.swift
index 55e2c16070..ce6cad973f 100644
--- a/ios/MullvadVPN/HeaderBarView.swift
+++ b/ios/MullvadVPN/HeaderBarView.swift
@@ -23,6 +23,7 @@ class HeaderBarView: UIView {
     lazy var settingsButton: UIButton = {
         let settingsButton = UIButton(type: .custom)
         settingsButton.setImage(UIImage(named: "IconSettings"), for: .normal)
+        settingsButton.accessibilityIdentifier = "SettingsButton"
         return settingsButton
     }()
 
diff --git a/ios/MullvadVPN/SelectLocationCell.swift b/ios/MullvadVPN/SelectLocationCell.swift
index d7f3c4c1ba..735a42df9c 100644
--- a/ios/MullvadVPN/SelectLocationCell.swift
+++ b/ios/MullvadVPN/SelectLocationCell.swift
@@ -89,6 +89,7 @@ class SelectLocationCell: BasicTableViewCell {
         statusIndicator.tintColor = .white
         tickImageView.tintColor = .white
 
+        collapseButton.accessibilityIdentifier = "CollapseButton"
         collapseButton.tintColor = .white
         collapseButton.setImage(chevronDown, for: .normal)
         collapseButton.addTarget(self, action: #selector(handleCollapseButton(_ :)), for: .touchUpInside)
diff --git a/ios/MullvadVPN/SettingsViewController.swift b/ios/MullvadVPN/SettingsViewController.swift
index 201451c09e..cd78c2b282 100644
--- a/ios/MullvadVPN/SettingsViewController.swift
+++ b/ios/MullvadVPN/SettingsViewController.swift
@@ -108,6 +108,7 @@ class SettingsViewController: UITableViewController, AccountViewControllerDelega
 
                 cell.titleLabel.text = NSLocalizedString("Account", comment: "")
                 cell.accountExpiryDate = Account.shared.expiry
+                cell.accessibilityIdentifier = "AccountCell"
                 cell.accessoryType = .disclosureIndicator
             }
 
diff --git a/ios/MullvadVPNScreenshots/MullvadVPNScreenshots.swift b/ios/MullvadVPNScreenshots/MullvadVPNScreenshots.swift
index 2aa3bc9b29..bdba8df8ad 100644
--- a/ios/MullvadVPNScreenshots/MullvadVPNScreenshots.swift
+++ b/ios/MullvadVPNScreenshots/MullvadVPNScreenshots.swift
@@ -60,7 +60,7 @@ class MullvadVPNScreenshots: XCTestCase {
         if cityCell.exists {
             cityCell.tap()
         } else {
-            countryCell.buttons["ExpandButton"].tap()
+            countryCell.buttons["CollapseButton"].tap()
             cityCell.tap()
         }
 
@@ -70,8 +70,8 @@ class MullvadVPNScreenshots: XCTestCase {
         snapshot("MainSecured")
 
         // Re-open Select location controller
-        app.buttons["SwitchLocationButton"].tap()
-        cityCell.buttons["ExpandButton"].tap()
+        app.buttons["SelectLocationButton"].tap()
+        cityCell.buttons["CollapseButton"].tap()
         snapshot("SelectLocation")
 
         // Tap the "Done" button to dismiss the "Select location" controller