@@ -24,7 +24,7 @@ class DaysUntilBirthdayUITests_iOS: XCTestCase {
2424 private let signInDisclaimerHeaderText =
2525 " Sign in to DaysUntilBirthday (iOS) "
2626 private let returningUserSignInDisclaimerHeaderText =
27- " You’ re signing back in to DaysUntilBirthday (iOS) "
27+ " You' re signing back in to DaysUntilBirthday (iOS) "
2828 private let additionalAccessHeaderText = " DaysUntilBirthday (iOS) wants additional access to your Google Account "
2929 private let appTrustWarningText = " Make sure you trust DaysUntilBirthday (iOS) "
3030 private let chooseAnAccountHeaderText = " Choose an account "
@@ -126,41 +126,23 @@ extension DaysUntilBirthdayUITests_iOS {
126126 /// This will assumme the full flow where a user must type in an email and
127127 /// password to sign in with.
128128 func signInForTheFirstTime( ) -> Bool {
129- guard sampleApp. textFields [ " Email or phone " ]
130- . waitForExistence ( timeout: timeout) else {
129+ let emailField = sampleApp. textFields [ " Email or phone " ]
130+ guard emailField . waitForExistence ( timeout: timeout) else {
131131 XCTFail ( " Failed to find email textfield " )
132132 return false
133133 }
134- guard sampleApp
135- . keyboards
136- . element
137- . buttons [ " return " ]
138- . waitForExistence ( timeout: timeout) else {
139- XCTFail ( " Failed to find 'return' button " )
140- return false
141- }
142134
143- sampleApp . textFields [ " Email or phone " ] . typeText ( Credential . email . rawValue )
144- sampleApp . keyboards . element . buttons [ " return " ] . tap ( )
135+ emailField . tap ( )
136+ emailField . typeText ( " \( Credential . email . rawValue ) \n " )
145137
146- guard sampleApp. secureTextFields [ " Enter your password " ]
147- . waitForExistence ( timeout: timeout) else {
138+ let passwordField = sampleApp. secureTextFields [ " Enter your password " ]
139+ guard passwordField . waitForExistence ( timeout: timeout) else {
148140 XCTFail ( " Failed to find password textfield " )
149141 return false
150142 }
151- guard sampleApp
152- . keyboards
153- . element
154- . buttons [ " return " ]
155- . waitForExistence ( timeout: timeout) else {
156- XCTFail ( " Failed to find 'return' button " )
157- return false
158- }
159143
160- sampleApp
161- . secureTextFields [ " Enter your password " ]
162- . typeText ( Credential . password. rawValue)
163- sampleApp. keyboards. element. buttons [ " return " ] . tap ( )
144+ passwordField. tap ( )
145+ passwordField. typeText ( " \( Credential . password. rawValue) \n " )
164146
165147 if sampleApp
166148 . staticTexts [ passwordManagerPrompt]
0 commit comments