From 4d39dfed0dcdc329cf09df886eafc014fdc3d0e2 Mon Sep 17 00:00:00 2001 From: brianna Date: Thu, 8 May 2025 15:30:28 -0700 Subject: [PATCH] Fix login integration tests. --- .../DaysUntilBirthdayUITests_iOS.swift | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift index cb3cc1e4..5156e607 100644 --- a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift +++ b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift @@ -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" @@ -189,7 +191,7 @@ extension DaysUntilBirthdayUITests_iOS { return false } - handleSignInDisclaimerIfNeeded() + handleReturningUserSignInDisclaimerIfNeeded() handleAccessRequestIfNeeded() return true @@ -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 {