test: fix more tests after UI refactor

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthUIComponents/Sources/Components/CountrySelector.swift

@@ -88,6 +88,7 @@ public struct CountrySelector: View {
         } label: {
           Text("\(country.flag) \(country.name) (\(country.dialCode))")
         }
+        .accessibilityIdentifier("country-option-\(country.code)")
       }
     } label: {
       HStack(spacing: 4) {
@@ -101,6 +102,7 @@ public struct CountrySelector: View {
           .foregroundStyle(.secondary)
       }
     }
+    .accessibilityIdentifier("country-selector")
     .disabled(!enabled)
   }
 }

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests/MFAEnrolmentUITests.swift

@@ -193,11 +193,24 @@ final class MFAEnrollmentUITests: XCTestCase {
     XCTAssertTrue(startButton.waitForExistence(timeout: 10))
     startButton.tap()
 
-    // 6) Enter phone number and display name, then press "Send Code"
+    // 6) Select UK country code and enter phone number (without dial code)
+    // Find and tap the country selector - try multiple approaches since it's embedded in the TextField
+    let countrySelector = app.buttons["🇺🇸 +1"]
+    XCTAssertTrue(countrySelector.waitForExistence(timeout: 5))
+    
+    countrySelector.tap()
+    
+    // Select United Kingdom (+44) - try multiple element types
+    let ukOption = app.buttons["country-option-GB"]
+    XCTAssertTrue(ukOption.waitForExistence(timeout: 5))
+    
+    ukOption.tap()
+    
+    // Enter phone number (without dial code)
     let phoneField = app.textFields["phone-number-field"]
     XCTAssertTrue(phoneField.waitForExistence(timeout: 10))
-    let phoneNumber = "+447444555666"
-    UIPasteboard.general.string = phoneNumber
+    let phoneNumberWithoutDialCode = "7444555666"
+    UIPasteboard.general.string = phoneNumberWithoutDialCode
     phoneField.tap()
     phoneField.press(forDuration: 1.2)
     app.menuItems["Paste"].tap()
@@ -219,7 +232,9 @@ final class MFAEnrollmentUITests: XCTestCase {
     XCTAssertTrue(verificationCodeField.waitForExistence(timeout: 15))
 
     // Fetch the latest SMS verification code generated by the emulator for this phone number
-    let code = try await getLastSmsCode(specificPhone: phoneNumber)
+    // The emulator stores the full phone number with dial code
+    let fullPhoneNumber = "+44\(phoneNumberWithoutDialCode)"
+    let code = try await getLastSmsCode(specificPhone: fullPhoneNumber)
 
     UIPasteboard.general.string = code
     verificationCodeField.tap()
@@ -356,48 +371,17 @@ final class MFAEnrollmentUITests: XCTestCase {
     try navigateToMFAEnrollment(app: app)
 
     // Test back button exists
-    let cancelButton = app.buttons["mfa-back-button"]
-    XCTAssertTrue(cancelButton.exists, "Back button should exist")
-    XCTAssertTrue(cancelButton.isEnabled, "Back button should be enabled")
+    let backButton = app.navigationBars.buttons.element(boundBy: 0)
+    XCTAssertTrue(backButton.exists, "Back button should exist")
 
     // Tap cancel button
-    cancelButton.tap()
-
-    // Should navigate back to signed in view
-    let signedInText = app.staticTexts["signed-in-text"]
-    XCTAssertTrue(
-      signedInText.waitForExistence(timeout: 5),
-      "Should navigate back to signed in view"
-    )
-  }
-
-  @MainActor
-  func testBackButtonFromMFAManagement() async throws {
-    let email = createEmail()
-
-    // Create user in test runner before launching app
-    try await createTestUser(email: email)
-
-    let app = createTestApp(mfaEnabled: true)
-    app.launch()
-
-    // Sign in and navigate to MFA management
-    try signInToApp(app: app, email: email)
-    app.buttons["mfa-management-button"].tap()
-
-    // Test back button exists
-    let backButton = app.buttons["back-button"]
-    XCTAssertTrue(backButton.waitForExistence(timeout: 5), "Back button should exist")
-    XCTAssertTrue(backButton.isEnabled, "Back button should be enabled")
-
-    // Tap back button
     backButton.tap()
 
-    // Should navigate back to signed in view
-    let signedInText = app.staticTexts["signed-in-text"]
+    // Should navigate back to manage MFA View
+    let signedInText = app.buttons["setup-mfa-button"]
     XCTAssertTrue(
       signedInText.waitForExistence(timeout: 5),
-      "Should navigate back to signed in view"
+      "Should navigate back to setup MFA view"
     )
   }
 

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests/MFAResolutionUITests.swift

@@ -417,7 +417,7 @@ final class MFAResolutionUITests: XCTestCase {
     }
   }
 
-  private func signInUser(app: XCUIApplication, email: String, password: String = "123456") throws {
+  @MainActor private func signInUser(app: XCUIApplication, email: String, password: String = "123456") throws {
     // Ensure we're in sign in flow
     let switchFlowButton = app.buttons["switch-auth-flow"]
     if switchFlowButton.exists && switchFlowButton.label.contains("Sign In") {
@@ -440,7 +440,7 @@ final class MFAResolutionUITests: XCTestCase {
     signInButton.tap()
   }
 
-  private func enrollSMSMFA(app: XCUIApplication) throws {
+  @MainActor private func enrollSMSMFA(app: XCUIApplication) throws {
     // Navigate to MFA management
     let mfaManagementButton = app.buttons["mfa-management-button"]
     XCTAssertTrue(mfaManagementButton.waitForExistence(timeout: 5))