test: harden email and password input that causes tests to flake occasionally

Author: russellwheatley

e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests/FirebaseSwiftUIExampleUITests.swift

@@ -139,13 +139,11 @@ final class FirebaseSwiftUIExampleUITests: XCTestCase {
 
     let emailField = app.textFields["email-field"]
     XCTAssertTrue(emailField.waitForExistence(timeout: 6), "Email field should exist")
-    emailField.tap()
-    emailField.typeText(email)
+    try enterText(email, into: emailField, app: app)
 
     let passwordField = app.secureTextFields["password-field"]
     XCTAssertTrue(passwordField.exists, "Password field should exist")
-    passwordField.tap()
-    passwordField.typeText(password)
+    try enterText(password, into: passwordField, app: app)
 
     let signInButton = app.buttons["sign-in-button"]
     XCTAssertTrue(signInButton.exists, "Sign-In button should exist")
@@ -233,20 +231,24 @@ final class FirebaseSwiftUIExampleUITests: XCTestCase {
     let emailField = app.textFields["email-field"]
 
     XCTAssertTrue(emailField.waitForExistence(timeout: 2), "Email field should exist")
-    try pasteIntoField(emailField, text: email, app: app)
+    try enterText(email, into: emailField, app: app)
 
     let passwordField = app.secureTextFields["password-field"]
     XCTAssertTrue(passwordField.exists, "Password field should exist")
-    try pasteIntoField(passwordField, text: password, app: app)
+    try enterText(password, into: passwordField, app: app)
 
     let confirmPasswordField = app.secureTextFields["confirm-password-field"]
     XCTAssertTrue(confirmPasswordField.exists, "Confirm password field should exist")
-    try pasteIntoField(confirmPasswordField, text: password, app: app)
+    try enterText(password, into: confirmPasswordField, app: app)
 
     // Create the user (sign up)
     let signUpButton = app
       .buttons["sign-in-button"] // This button changes context after switch-auth-flow
     XCTAssertTrue(signUpButton.exists, "Sign-Up button should exist")
+    XCTAssertTrue(
+      waitForElementToBecomeEnabled(signUpButton, timeout: 5),
+      "Sign-up button should become enabled after entering credentials"
+    )
     signUpButton.tap()
 
     // Wait for user creation and signed-in view to appear

e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests/MFAEnrolmentUITests.swift

@@ -212,14 +212,11 @@ final class MFAEnrollmentUITests: XCTestCase {
     // Generate unique phone number using timestamp to avoid conflicts between tests
     let uniqueId = Int(Date().timeIntervalSince1970 * 1000) % 1_000_000
     let phoneNumberWithoutDialCode = "7\(String(format: "%09d", uniqueId))"
-    UIPasteboard.general.string = phoneNumberWithoutDialCode
-    phoneField.tap()
-    phoneField.press(forDuration: 1.2)
-    app.menuItems["Paste"].tap()
+    try enterText(phoneNumberWithoutDialCode, into: phoneField, app: app)
 
     let displayNameField = app.textFields["display-name-field"]
     XCTAssertTrue(displayNameField.waitForExistence(timeout: 10))
-    try pasteIntoField(displayNameField, text: "test user", app: app)
+    try enterText("test user", into: displayNameField, app: app)
 
     let sendCodeButton = app.buttons["send-sms-button"]
     XCTAssertTrue(sendCodeButton.waitForExistence(timeout: 10))
@@ -406,26 +403,28 @@ final class MFAEnrollmentUITests: XCTestCase {
     // Fill email field
     let emailField = app.textFields["email-field"]
     XCTAssertTrue(emailField.waitForExistence(timeout: 10), "Email field should exist")
-    // Workaround for updating SecureFields with ConnectHardwareKeyboard enabled
-    try pasteIntoField(emailField, text: email, app: app)
+    try enterText(email, into: emailField, app: app)
 
     // Fill password field
     let passwordField = app.secureTextFields["password-field"]
     XCTAssertTrue(passwordField.exists, "Password field should exist")
-    try pasteIntoField(passwordField, text: password, app: app)
+    try enterText(password, into: passwordField, app: app)
 
     // Create the user (sign up)
     let signUpButton = app
       .buttons["sign-in-button"] // This button changes context after switch-auth-flow
     XCTAssertTrue(signUpButton.exists, "Sign-up button should exist")
+    XCTAssertTrue(
+      waitForElementToBecomeEnabled(signUpButton, timeout: 5),
+      "Sign-up button should become enabled after entering credentials"
+    )
     signUpButton.tap()
 
     let notNowButton = app.scrollViews.containing(.button, identifier: "Not Now").firstMatch
     if notNowButton.waitForExistence(timeout: 5) {
       notNowButton.tap()
     }
 
-    // Wait for signed-in state
     // Wait for signed-in state
     let signedInText = app.staticTexts["signed-in-text"]
     XCTAssertTrue(

e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests/TestUtils.swift

@@ -40,26 +40,36 @@ func createEmail() -> String {
 
 // MARK: - Text Input Helpers
 
-/// Pastes text into a text field using the system paste menu
-/// - Parameters:
-///   - field: The XCUIElement representing the text field
-///   - text: The text to paste
-///   - app: The XCUIApplication instance
-@MainActor func pasteIntoField(_ field: XCUIElement, text: String, app: XCUIApplication) throws {
-  UIPasteboard.general.string = text
+@MainActor private func waitForFieldValue(_ field: XCUIElement,
+                                          expectedText: String,
+                                          timeout: TimeInterval = 2) -> Bool {
+  let deadline = Date().addingTimeInterval(timeout)
+
+  while Date() < deadline {
+    if (field.value as? String) == expectedText {
+      return true
+    }
+    RunLoop.current.run(until: Date().addingTimeInterval(0.1))
+  }
+
+  return (field.value as? String) == expectedText
+}
+
+@MainActor private func showPasteMenu(for field: XCUIElement,
+                                      text: String,
+                                      app: XCUIApplication) throws -> XCUIElement {
   field.tap()
 
-  // Give field time to become first responder
+  // Give field time to become first responder.
   usleep(200_000) // 0.2 seconds
 
-  // Press and hold to bring up paste menu
+  // Press and hold to bring up paste menu.
   field.press(forDuration: 1.5)
 
   let pasteMenuItem = app.menuItems["Paste"]
 
-  // Wait for paste menu to appear
+  // Fallback to double-tap if the context menu did not appear.
   if !pasteMenuItem.waitForExistence(timeout: 3) {
-    // Fallback: try double tap approach
     field.doubleTap()
     usleep(300_000) // 0.3 seconds
 
@@ -74,7 +84,72 @@ func createEmail() -> String {
     }
   }
 
+  return pasteMenuItem
+}
+
+@MainActor private func typeIntoField(_ field: XCUIElement,
+                                      text: String) throws {
+  field.tap()
+  field.typeText(text)
+
+  guard waitForFieldValue(field, expectedText: text) else {
+    throw NSError(
+      domain: "TestError",
+      code: 2,
+      userInfo: [
+        NSLocalizedDescriptionKey: "Failed to type expected text into field. Text was: \(text)",
+      ]
+    )
+  }
+}
+
+@MainActor private func pasteIntoSecureField(_ field: XCUIElement,
+                                             text: String,
+                                             app: XCUIApplication) throws {
+  let originalValue = field.value as? String
+  UIPasteboard.general.string = text
+  let pasteMenuItem = try showPasteMenu(for: field, text: text, app: app)
   pasteMenuItem.tap()
+  usleep(200_000) // 0.2 seconds
+  UIPasteboard.general.string = nil
+
+  guard (field.value as? String) != originalValue else {
+    throw NSError(
+      domain: "TestError",
+      code: 3,
+      userInfo: [
+        NSLocalizedDescriptionKey: "Failed to paste expected text into secure field. Text was: \(text)",
+      ]
+    )
+  }
+}
+
+/// Enters text into a UI test field.
+/// - Parameters:
+///   - field: The XCUIElement representing the text field
+///   - text: The text to enter
+///   - app: The XCUIApplication instance
+@MainActor func enterText(_ text: String, into field: XCUIElement, app: XCUIApplication) throws {
+  switch field.elementType {
+  case .secureTextField:
+    try pasteIntoSecureField(field, text: text, app: app)
+  default:
+    try typeIntoField(field, text: text)
+  }
+}
+
+@MainActor func waitForElementToBecomeEnabled(_ element: XCUIElement,
+                                              timeout: TimeInterval = 5) -> Bool {
+  let deadline = Date().addingTimeInterval(timeout)
+
+  while Date() < deadline {
+    if element.isEnabled {
+      return true
+    }
+    RunLoop.current.run(until: Date().addingTimeInterval(0.1))
+  }
+
+  return element.isEnabled
 }
 
 // MARK: - User Creation