test: fix tests to match latest UI

Author: russellwheatley

e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExample/TestView.swift

@@ -34,8 +34,6 @@ struct TestView: View {
 
   init() {
     Auth.auth().useEmulator(withHost: "localhost", port: 9099)
-
-    Auth.auth().settings?.isAppVerificationDisabledForTesting = true
     Task {
       try signOut()
     }

e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests/MFAEnrolmentUITests.swift

@@ -196,7 +196,7 @@ final class MFAEnrollmentUITests: XCTestCase {
     // 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"]
+    let countrySelector = app.buttons["phone-number-field"].firstMatch
     XCTAssertTrue(countrySelector.waitForExistence(timeout: 5))
 
     countrySelector.tap()
@@ -229,18 +229,31 @@ final class MFAEnrollmentUITests: XCTestCase {
     sendCodeButton.tap()
 
     // 7) Retrieve verification code from the Auth Emulator and complete setup
-    let verificationCodeField = app.textFields["verification-code-field"]
-    XCTAssertTrue(verificationCodeField.waitForExistence(timeout: 15))
+    let verificationCodeField1 = app.otherElements["Digit 1 of 6"].textFields.firstMatch
+    let verificationCodeField2 = app.otherElements["Digit 2 of 6"].textFields.firstMatch
+    let verificationCodeField3 = app.otherElements["Digit 3 of 6"].textFields.firstMatch
+    let verificationCodeField4 = app.otherElements["Digit 4 of 6"].textFields.firstMatch
+    let verificationCodeField5 = app.otherElements["Digit 5 of 6"].textFields.firstMatch
+    let verificationCodeField6 = app.otherElements["Digit 6 of 6"].textFields.firstMatch
+    XCTAssertTrue(verificationCodeField1.waitForExistence(timeout: 15))
 
     // Fetch the latest SMS verification code generated by the emulator for this phone number
     // 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()
-    verificationCodeField.press(forDuration: 1.2)
-    app.menuItems["Paste"].tap()
+    // Paste each digit into the corresponding text field
+    let codeDigits = Array(code)
+    let fields = [verificationCodeField1, verificationCodeField2, verificationCodeField3, 
+                  verificationCodeField4, verificationCodeField5, verificationCodeField6]
+    
+    for (index, digit) in codeDigits.enumerated() where index < fields.count {
+      let field = fields[index]
+      UIPasteboard.general.string = String(digit)
+      field.tap()
+      field.press(forDuration: 1.2)
+      app.menuItems["Paste"].tap()
+    }
 
     // Test resend code button exists
     let resendButton = app.buttons["resend-code-button"]

e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests/TestUtils.swift

@@ -96,20 +96,17 @@ func createEmail() -> String {
     "idToken": idToken,
   ])
 
-  let (_, sendResp) = try await URLSession.shared.data(for: sendReq)
+  let (sendData, sendResp) = try await URLSession.shared.data(for: sendReq)
   guard let http = sendResp as? HTTPURLResponse, http.statusCode == 200 else {
+    let errorBody = String(data: sendData, encoding: .utf8) ?? "Unknown error"
     throw NSError(domain: "EmulatorError", code: 1,
-                  userInfo: [NSLocalizedDescriptionKey: "Failed to send verification email"])
+                  userInfo: [NSLocalizedDescriptionKey: "Failed to send verification email: \(errorBody)"])
   }
 
-  // Step 2: Fetch OOB codes from emulator
-  let oobURL = URL(string: "\(base)/emulator/v1/projects/\(projectID)/oobCodes")!
-  let (oobData, oobResp) = try await URLSession.shared.data(from: oobURL)
-  guard (oobResp as? HTTPURLResponse)?.statusCode == 200 else {
-    throw NSError(domain: "EmulatorError", code: 2,
-                  userInfo: [NSLocalizedDescriptionKey: "Failed to fetch OOB codes"])
-  }
+  // Add a small delay to ensure the OOB code is registered in the emulator
+  try await Task.sleep(nanoseconds: 500_000_000) // 0.5 seconds
 
+  // Define structs for OOB response parsing
   struct OobEnvelope: Decodable { let oobCodes: [OobItem] }
   struct OobItem: Decodable {
     let oobCode: String
@@ -118,20 +115,50 @@ func createEmail() -> String {
     let creationTime: String?
   }
 
-  let envelope = try JSONDecoder().decode(OobEnvelope.self, from: oobData)
-
-  // Step 3: Find most recent VERIFY_EMAIL code for this email
-  let iso = ISO8601DateFormatter()
-  let codeItem = envelope.oobCodes
-    .filter {
-      $0.email.caseInsensitiveCompare(email) == .orderedSame && $0.requestType == "VERIFY_EMAIL"
+  // Step 2: Fetch OOB codes from emulator with retry logic
+  let oobURL = URL(string: "\(base)/emulator/v1/projects/\(projectID)/oobCodes")!
+  
+  var codeItem: OobItem?
+  var attempts = 0
+  let maxAttempts = 5
+  
+  while codeItem == nil && attempts < maxAttempts {
+    let (oobData, oobResp) = try await URLSession.shared.data(from: oobURL)
+    guard (oobResp as? HTTPURLResponse)?.statusCode == 200 else {
+      throw NSError(domain: "EmulatorError", code: 2,
+                    userInfo: [NSLocalizedDescriptionKey: "Failed to fetch OOB codes"])
     }
-    .sorted {
-      let d0 = $0.creationTime.flatMap { iso.date(from: $0) } ?? .distantPast
-      let d1 = $1.creationTime.flatMap { iso.date(from: $0) } ?? .distantPast
-      return d0 > d1
+
+    let envelope = try JSONDecoder().decode(OobEnvelope.self, from: oobData)
+
+    // Step 3: Find most recent VERIFY_EMAIL code for this email
+    let iso = ISO8601DateFormatter()
+    codeItem = envelope.oobCodes
+      .filter {
+        $0.email.caseInsensitiveCompare(email) == .orderedSame && $0.requestType == "VERIFY_EMAIL"
+      }
+      .sorted {
+        let d0 = $0.creationTime.flatMap { iso.date(from: $0) } ?? .distantPast
+        let d1 = $1.creationTime.flatMap { iso.date(from: $0) } ?? .distantPast
+        return d0 > d1
+      }
+      .first
+    
+    if codeItem == nil {
+      attempts += 1
+      if attempts < maxAttempts {
+        // Wait before retrying
+        try await Task.sleep(nanoseconds: 500_000_000) // 0.5 seconds
+      } else {
+        // Log available codes for debugging
+        let availableCodes = envelope.oobCodes.map { "Email: \($0.email), Type: \($0.requestType)" }.joined(separator: "; ")
+        throw NSError(domain: "EmulatorError", code: 3,
+                      userInfo: [
+                        NSLocalizedDescriptionKey: "No VERIFY_EMAIL OOB code found for \(email) after \(maxAttempts) attempts. Available codes: \(availableCodes)",
+                      ])
+      }
     }
-    .first
+  }
 
   guard let oobCode = codeItem?.oobCode else {
     throw NSError(domain: "EmulatorError", code: 3,