Skip to content

Fix Swift integration tests for a returning user. #518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brnnmrls merged 1 commit into from
May 9, 2025
Merged

Fix Swift integration tests for a returning user. #518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion .../Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ class DaysUntilBirthdayUITests_iOS: XCTestCase {
"Would you like to save this password to use with apps and websites?"
private let signInDisclaimerHeaderText =
"Sign in to Days Until Birthday"
private let returningUserSignInDisclaimerHeaderText =
"You’re signing back in to Days Until Birthday"
private let additionalAccessHeaderText = "Days Until Birthday wants additional access to your Google Account"
private let appTrustWarningText = "Make sure you trust Days Until Birthday"
private let chooseAnAccountHeaderText = "Choose an account"
Expand Down Expand Up @@ -189,7 +191,7 @@ extension DaysUntilBirthdayUITests_iOS {
return false
}

handleSignInDisclaimerIfNeeded()
handleReturningUserSignInDisclaimerIfNeeded()
handleAccessRequestIfNeeded()

return true
Expand Down Expand Up @@ -287,6 +289,18 @@ extension DaysUntilBirthdayUITests_iOS {
}
}

func handleReturningUserSignInDisclaimerIfNeeded() {
let currentlyShowingReturningUserSignInDisclaimer =
sampleApp.staticTexts[returningUserSignInDisclaimerHeaderText]
.waitForExistence(timeout: timeout) &&
sampleApp.buttons["Continue"]
.waitForExistence(timeout: timeout)

if currentlyShowingReturningUserSignInDisclaimer {
sampleApp.buttons["Continue"].tap()
}
}

/// This method looks for an account in the current view that reflects an already-signed-in state, and taps it.
/// - returns: true if the signed-in account was found and tapped, otherwise returns false.
func findAndTapExistingSignedInEmail() -> Bool {
Expand Down