test: further UI View tests

russellwheatley · russellwheatley · commit ba6d0bce7a0e · 2025-05-21T08:47:59.000+01:00
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift
@@ -16,46 +16,48 @@ public struct AuthPickerView {
 extension AuthPickerView: View {
   public var body: some View {
     VStack {
-      Text(authService.string.authPickerTitle)
-        .font(.largeTitle)
-        .fontWeight(.bold)
-        .padding()
-      if authService.authenticationState == .authenticated {
-        SignedInView()
-      } else if authService.authView == .passwordRecovery {
-        PasswordRecoveryView()
-      } else if authService.authView == .emailLink {
-        EmailLinkView()
-      } else {
-        if authService.emailSignInEnabled {
-          Text(authService.authenticationFlow == .login ? authService.string
-            .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
-          Divider()
-          EmailAuthView()
-        }
-        VStack {
-          authService.renderButtons()
-        }.padding(.horizontal)
-        if authService.emailSignInEnabled {
-          Divider()
-          HStack {
-            Text(authService
-              .authenticationFlow == .login ? authService.string.dontHaveAnAccountYetLabel :
-              authService.string.alreadyHaveAnAccountLabel)
-            Button(action: {
-              withAnimation {
-                switchFlow()
-              }
-            }) {
-              Text(authService.authenticationFlow == .signUp ? authService.string
-                .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
-                .fontWeight(.semibold)
-                .foregroundColor(.blue)
-            }.accessibilityIdentifier("switch-auth-flow")
+      ScrollView {
+        Text(authService.string.authPickerTitle)
+          .font(.largeTitle)
+          .fontWeight(.bold)
+          .padding()
+        if authService.authenticationState == .authenticated {
+          SignedInView()
+        } else if authService.authView == .passwordRecovery {
+          PasswordRecoveryView()
+        } else if authService.authView == .emailLink {
+          EmailLinkView()
+        } else {
+          if authService.emailSignInEnabled {
+            Text(authService.authenticationFlow == .login ? authService.string
+              .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
+            Divider()
+            EmailAuthView()
+          }
+          VStack {
+            authService.renderButtons()
+          }.padding(.horizontal)
+          if authService.emailSignInEnabled {
+            Divider()
+            HStack {
+              Text(authService
+                .authenticationFlow == .login ? authService.string.dontHaveAnAccountYetLabel :
+                authService.string.alreadyHaveAnAccountLabel)
+              Button(action: {
+                withAnimation {
+                  switchFlow()
+                }
+              }) {
+                Text(authService.authenticationFlow == .signUp ? authService.string
+                  .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
+                  .fontWeight(.semibold)
+                  .foregroundColor(.blue)
+              }.accessibilityIdentifier("switch-auth-flow")
+            }
           }
+          PrivacyTOCsView(displayMode: .footer)
+          Text(authService.errorMessage).foregroundColor(.red)
         }
-        PrivacyTOCsView(displayMode: .footer)
-        Text(authService.errorMessage).foregroundColor(.red)
       }
     }
   }
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailAuthView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailAuthView.swift
@@ -89,7 +89,7 @@ extension EmailAuthView: View {
           authService.authView = .passwordRecovery
         }) {
           Text(authService.string.passwordButtonLabel)
-        }
+        }.accessibilityIdentifier("password-recovery-button")
       }
 
       if authService.authenticationFlow == .signUp {
@@ -138,7 +138,7 @@ extension EmailAuthView: View {
         authService.authView = .emailLink
       }) {
         Text(authService.string.signUpWithEmailLinkButtonLabel)
-      }
+      }.accessibilityIdentifier("sign-in-with-email-link-button")
     }
   }
 }
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailLinkView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailLinkView.swift
@@ -21,6 +21,7 @@ extension EmailLinkView: View {
   public var body: some View {
     VStack {
       Text(authService.string.signInWithEmailLinkViewTitle)
+        .accessibilityIdentifier("email-link-title-text")
       LabeledContent {
         TextField(authService.string.emailInputLabel, text: $email)
           .textInputAutocapitalization(.never)
@@ -70,7 +71,7 @@ extension EmailLinkView: View {
         .foregroundColor(.blue)
       Text(authService.string.backButtonLabel)
         .foregroundColor(.blue)
-    })
+    }.accessibilityIdentifier("email-link-back-button"))
   }
 }
 
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/PasswordRecoveryView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/PasswordRecoveryView.swift
@@ -23,6 +23,7 @@ extension PasswordRecoveryView: View {
         .font(.largeTitle)
         .fontWeight(.bold)
         .padding()
+        .accessibilityIdentifier("password-recovery-text")
 
       Divider()
 
@@ -78,7 +79,7 @@ extension PasswordRecoveryView: View {
         .foregroundColor(.blue)
       Text(authService.string.backButtonLabel)
         .foregroundColor(.blue)
-    })
+    }.accessibilityIdentifier("password-recovery-back-button"))
   }
 }
 
diff --git a/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/SignedInView.swift b/FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/SignedInView.swift
@@ -41,7 +41,7 @@ extension SignedInView: View {
               try await authService.signOut()
             } catch {}
           }
-        }
+        }.accessibilityIdentifier("sign-out-button")
         Divider()
         Button(authService.string.deleteAccountButtonLabel) {
           Task {
diff --git a/samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests/FirebaseSwiftUIExampleUITests.swift b/samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests/FirebaseSwiftUIExampleUITests.swift
@@ -15,6 +15,12 @@ func createEmail() -> String {
   return "\(before)@\(after).com"
 }
 
+func dismissAlert(app: XCUIApplication) {
+  if app.scrollViews.otherElements.buttons["Not Now"].waitForExistence(timeout: 2) {
+    app.scrollViews.otherElements.buttons["Not Now"].tap()
+  }
+}
+
 final class FirebaseSwiftUIExampleUITests: XCTestCase {
   override func setUpWithError() throws {
     continueAfterFailure = false
@@ -65,6 +71,60 @@ final class FirebaseSwiftUIExampleUITests: XCTestCase {
       signedInText.waitForExistence(timeout: 10),
       "SignedInView should be visible after login"
     )
+
+    dismissAlert(app: app)
+    // Check the Views are updated
+    let signOutButton = app.buttons["sign-out-button"]
+    XCTAssertTrue(
+      signOutButton.waitForExistence(timeout: 10),
+      "Sign-Out button should exist and be visible"
+    )
+
+    signOutButton.tap()
+    XCTAssertTrue(
+      signInButton.waitForExistence(timeout: 10),
+      "Sign-In button should exist after logout"
+    )
+
+    let passwordRecoveryButton = app.buttons["password-recovery-button"]
+    XCTAssertTrue(passwordRecoveryButton.exists, "Password recovery button should exist")
+    passwordRecoveryButton.tap()
+    let passwordRecoveryText = app.staticTexts["password-recovery-text"]
+    XCTAssertTrue(
+      passwordRecoveryText.waitForExistence(timeout: 10),
+      "Password recovery text should exist after routing to PasswordRecoveryView"
+    )
+
+    let passwordRecoveryBackButton = app.buttons["password-recovery-back-button"]
+    XCTAssertTrue(passwordRecoveryBackButton.exists, "Password back button should exist")
+    passwordRecoveryBackButton.tap()
+
+    let signInButton2 = app.buttons["sign-in-button"]
+    XCTAssertTrue(
+      signInButton2.waitForExistence(timeout: 10),
+      "Sign-In button should exist after pressing password recovery back button"
+    )
+
+    let emailLinkSignInButton = app.buttons["sign-in-with-email-link-button"]
+    XCTAssertTrue(emailLinkSignInButton.exists, "Email link sign-in button should exist")
+    emailLinkSignInButton.tap()
+
+    let emailLinkText = app.staticTexts["email-link-title-text"]
+
+    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"]
+    XCTAssertTrue(emailLinkBackButton.exists, "Email link back button should exist")
+    emailLinkBackButton.tap()
+
+    let signInButton3 = app.buttons["sign-in-button"]
+    XCTAssertTrue(
+      signInButton3.waitForExistence(timeout: 10),
+      "Sign-In button should exist after pressing password recovery back button"
+    )
   }
 
   @MainActor

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ extension EmailAuthView: View {`
`89`	`89`	`authService.authView = .passwordRecovery`
`90`	`90`	`}) {`
`91`	`91`	`Text(authService.string.passwordButtonLabel)`
`92`		`- }`
	`92`	`+ }.accessibilityIdentifier("password-recovery-button")`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`if authService.authenticationFlow == .signUp {`
`@@ -138,7 +138,7 @@ extension EmailAuthView: View {`
`138`	`138`	`authService.authView = .emailLink`
`139`	`139`	`}) {`
`140`	`140`	`Text(authService.string.signUpWithEmailLinkButtonLabel)`
`141`		`- }`
	`141`	`+ }.accessibilityIdentifier("sign-in-with-email-link-button")`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ extension PasswordRecoveryView: View {`
`23`	`23`	`.font(.largeTitle)`
`24`	`24`	`.fontWeight(.bold)`
`25`	`25`	`.padding()`
	`26`	`+ .accessibilityIdentifier("password-recovery-text")`
`26`	`27`
`27`	`28`	`Divider()`
`28`	`29`
`@@ -78,7 +79,7 @@ extension PasswordRecoveryView: View {`
`78`	`79`	`.foregroundColor(.blue)`
`79`	`80`	`Text(authService.string.backButtonLabel)`
`80`	`81`	`.foregroundColor(.blue)`
`81`		`- })`
	`82`	`+ }.accessibilityIdentifier("password-recovery-back-button"))`
`82`	`83`	`}`
`83`	`84`	`}`
`84`	`85`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ extension SignedInView: View {`
`41`	`41`	`try await authService.signOut()`
`42`	`42`	`} catch {}`
`43`	`43`	`}`
`44`		`- }`
	`44`	`+ }.accessibilityIdentifier("sign-out-button")`
`45`	`45`	`Divider()`
`46`	`46`	`Button(authService.string.deleteAccountButtonLabel) {`
`47`	`47`	`Task {`