Change RelayTests to recognise the tristate multihop UI

Author: acb-mv

ios/MullvadVPN/Coordinators/Settings/Multihop/SettingsMultihopView.swift

@@ -68,12 +68,13 @@ struct SettingsMultihopView<ViewModel>: View where ViewModel: TunnelSettingsObse
                                                 : Color(UIColor.Cell.titleTextColor)
                                         )
                                     Spacer().frame(width: UIMetrics.SettingsCell.selectableSettingsCellLeftViewSpacing)
-                                    Text(option.label)
+                                    Button(option.label, action: {tunnelViewModel.value = option.id})
                                         .foregroundStyle(
                                             (tunnelViewModel.value == option.id)
                                                 ? Color(UIColor.Cell.Background.selected)
                                                 : Color(UIColor.Cell.titleTextColor)
                                         )
+                                        .accessibilityIdentifier(option.accessibilityIdentifier.asString)
                                     Spacer()
                                 }
                                 .padding(EdgeInsets(UIMetrics.SettingsCell.defaultLayoutMargins))
@@ -112,7 +113,6 @@ struct SettingsMultihopView<ViewModel>: View where ViewModel: TunnelSettingsObse
                             .onTapGesture {
                                 tunnelViewModel.value = option.id
                             }
-                            .accessibilityIdentifier(option.accessibilityIdentifier.asString)
                         }
                     }
                     .cornerRadius(16)

ios/MullvadVPNUITests/Pages/MultihopPage.swift

@@ -27,6 +27,7 @@ class MultihopPage: Page {
         return self
     }
 
+    // the old on/off UI; delete once we get rid of the code
     @discardableResult func tapEnableSwitch() -> Self {
         app.switches[AccessibilityIdentifier.multihopSwitch].tap()
         return self
@@ -40,4 +41,10 @@ class MultihopPage: Page {
         }
         return self
     }
+    
+    // the new, tristate UI
+    @discardableResult func tapMultihopAlways() -> Self {
+        app.buttons[AccessibilityIdentifier.multihopAlways].tap()
+        return self
+    }
 }

ios/MullvadVPNUITests/RelayTests.swift

@@ -533,7 +533,7 @@ class RelayTests: LoggedInWithTimeUITestCase {
 
         MultihopPage(app)
             .verifyOnePage()
-            .tapEnableSwitch()
+            .tapMultihopAlways()
             .tapBackButton()
 
         SettingsPage(app)
@@ -561,7 +561,7 @@ class RelayTests: LoggedInWithTimeUITestCase {
 
         MultihopPage(app)
             .verifyOnePage()
-            .tapEnableSwitch()
+            .tapMultihopAlways()
             .tapBackButton()
 
         SettingsPage(app)