test: fix up UI testa and format

Author: russellwheatley

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/App/ContentView.swift

@@ -20,14 +20,14 @@
 //
 
 import AppTrackingTransparency
+import FirebaseAppleSwiftUI
 import FirebaseAuth
 import FirebaseAuthSwiftUI
 import FirebaseFacebookSwiftUI
 import FirebaseGoogleSwiftUI
+import FirebaseOAuthSwiftUI
 import FirebasePhoneAuthSwiftUI
 import FirebaseTwitterSwiftUI
-import FirebaseAppleSwiftUI
-import FirebaseOAuthSwiftUI
 import SwiftUI
 
 struct ContentView: View {
@@ -44,7 +44,7 @@ struct ContentView: View {
       emailLinkSignInActionCodeSettings: actionCodeSettings,
       mfaEnabled: true
     )
-    
+
     authService = AuthService(
       configuration: configuration
     )
@@ -67,16 +67,16 @@ struct ContentView: View {
     )
     .withEmailSignIn()
   }
-  
+
   let authService: AuthService
-  
+
   var body: some View {
     AuthPickerView {
       usersApp
     }
     .environment(authService)
   }
-  
+
   var usersApp: some View {
     NavigationStack {
       VStack {
@@ -91,7 +91,7 @@ struct ContentView: View {
         } else {
           Text("Authenticated - \(authService.currentUser?.email ?? "")")
           Button {
-            authService.isPresented = true  // Reopen the sheet
+            authService.isPresented = true // Reopen the sheet
           } label: {
             Text("Manage Account")
           }
@@ -111,7 +111,7 @@ struct ContentView: View {
     .onAppear {
       authService.isPresented = authService.authenticationState == .unauthenticated
     }
-    .onChange(of: authService.authenticationState) { oldValue, newValue in
+    .onChange(of: authService.authenticationState) { _, newValue in
       debugPrint("authService.authenticationState - \(newValue)")
       if newValue != .authenticating {
         authService.isPresented = newValue == .unauthenticated

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/App/FirebaseSwiftUIExampleApp.swift

@@ -79,7 +79,6 @@ struct FirebaseSwiftUIExampleApp: App {
 
   var body: some Scene {
     WindowGroup {
-      // ContentViewSheetExample()
       if testRunner {
         TestView()
       } else {

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/TestView.swift

@@ -19,14 +19,14 @@
 //  Created by Russell Wheatley on 23/04/2025.
 //
 
+import FirebaseAppleSwiftUI
 import FirebaseAuth
 import FirebaseAuthSwiftUI
 import FirebaseFacebookSwiftUI
 import FirebaseGoogleSwiftUI
+import FirebaseOAuthSwiftUI
 import FirebasePhoneAuthSwiftUI
-import FirebaseAppleSwiftUI
 import FirebaseTwitterSwiftUI
-import FirebaseOAuthSwiftUI
 import SwiftUI
 
 struct TestView: View {

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/UITestUtils.swift

@@ -13,4 +13,3 @@ public let testRunner = CommandLine.arguments.contains("--test-view-enabled")
 func signOut() throws {
   try Auth.auth().signOut()
 }
-

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleTests/FirebaseSwiftUIExampleTests.swift

@@ -101,7 +101,7 @@ struct FirebaseSwiftUIExampleTests {
     let service = try await prepareFreshAuthService()
 
     #expect(service.authenticationState == .unauthenticated)
-    #expect(service.authView == .authPicker)
+    #expect(service.authView == nil)
     #expect(service.currentError == nil)
     #expect(service.currentUser == nil)
     try await service.createUser(email: createEmail(), password: kPassword)
@@ -115,7 +115,7 @@ struct FirebaseSwiftUIExampleTests {
       service.currentUser != nil
     }
     #expect(service.currentUser != nil)
-    #expect(service.authView == .authPicker)
+    #expect(service.authView == nil)
     #expect(service.currentError == nil)
   }
 
@@ -136,7 +136,7 @@ struct FirebaseSwiftUIExampleTests {
       service.currentUser == nil
     }
     #expect(service.currentUser == nil)
-    #expect(service.authView == .authPicker)
+    #expect(service.authView == nil)
     #expect(service.currentError == nil)
 
     try await service.signIn(email: email, password: kPassword)
@@ -150,7 +150,7 @@ struct FirebaseSwiftUIExampleTests {
       service.currentUser != nil
     }
     #expect(service.currentUser != nil)
-    #expect(service.authView == .authPicker)
+    #expect(service.authView == nil)
     #expect(service.currentError == nil)
   }
 }

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests/FirebaseSwiftUIExampleUITests.swift

@@ -47,11 +47,11 @@ final class FirebaseSwiftUIExampleUITests: XCTestCase {
   func testSignInDisplaysSignedInView() async throws {
     let email = createEmail()
     let password = "123456"
-    
+
     // Create user in test runner BEFORE launching app
     // User will exist in emulator, but app starts unauthenticated
     try await createTestUser(email: email, password: password)
-    
+
     // Now launch the app - it connects to emulator but isn't signed in
     let app = createTestApp()
     app.launch()
@@ -94,13 +94,14 @@ final class FirebaseSwiftUIExampleUITests: XCTestCase {
     let passwordRecoveryButton = app.buttons["password-recovery-button"]
     XCTAssertTrue(passwordRecoveryButton.exists, "Password recovery button should exist")
     passwordRecoveryButton.tap()
-    let passwordRecoveryText = app.staticTexts["password-recovery-text"]
+    let passwordRecoveryText = app.staticTexts["Send a password recovery link to your email"]
+      .firstMatch
     XCTAssertTrue(
       passwordRecoveryText.waitForExistence(timeout: 10),
       "Password recovery text should exist after routing to PasswordRecoveryView"
     )
 
-    let passwordRecoveryBackButton = app.buttons["password-recovery-back-button"]
+    let passwordRecoveryBackButton = app.navigationBars.buttons.element(boundBy: 0)
     XCTAssertTrue(passwordRecoveryBackButton.exists, "Password back button should exist")
     passwordRecoveryBackButton.tap()
 
@@ -114,14 +115,14 @@ final class FirebaseSwiftUIExampleUITests: XCTestCase {
     XCTAssertTrue(emailLinkSignInButton.exists, "Email link sign-in button should exist")
     emailLinkSignInButton.tap()
 
-    let emailLinkText = app.staticTexts["email-link-title-text"]
+    let emailLinkText = app.staticTexts["Send a sign-in link to your email"].firstMatch
 
     XCTAssertTrue(
       emailLinkText.waitForExistence(timeout: 10),
       "Email link text should exist after pressing email link button in AuthPickerView"
     )
 
-    let emailLinkBackButton = app.buttons["email-link-back-button"]
+    let emailLinkBackButton = app.navigationBars.buttons.element(boundBy: 0)
     XCTAssertTrue(emailLinkBackButton.exists, "Email link back button should exist")
     emailLinkBackButton.tap()
 
@@ -176,10 +177,12 @@ final class FirebaseSwiftUIExampleUITests: XCTestCase {
 
     // Wait for the auth screen to disappear (email field should no longer exist)
     let emailFieldDisappeared = NSPredicate(format: "exists == false")
-    let expectation = XCTNSPredicateExpectation(predicate: emailFieldDisappeared, object: emailField)
+    let expectation = XCTNSPredicateExpectation(
+      predicate: emailFieldDisappeared,
+      object: emailField
+    )
     let result = XCTWaiter().wait(for: [expectation], timeout: 10.0)
     XCTAssertEqual(result, .completed, "Email field should disappear after sign-up")
-    
 
     // Wait for user creation and signed-in view to appear
     let signedInText = app.staticTexts["signed-in-text"]