Merge pull request #1538 from Automattic/fix-ui-tests

[UI Tests] Handle "Save Password" prompt from iOS.

Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -41,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Automattic/XCUITestHelpers",
       "state" : {
-        "revision" : "2cf059427b0f0362ddd8c14109493141cf710cc8",
-        "version" : "0.2.0"
+        "revision" : "5179cb69d58b90761cc713bdee7740c4889d3295",
+        "version" : "0.4.0"
       }
     }
   ],

SimplenoteUITests/EmailLogin.swift

@@ -3,7 +3,10 @@ import XCTest
 class EmailLogin {
 
     class func open() {
+        app.buttons[UID.Button.logIn].waitForIsHittable()
         app.buttons[UID.Button.logIn].tap()
+
+        app.buttons[UID.Button.logInWithEmail].waitForIsHittable()
         app.buttons[UID.Button.logInWithEmail].tap()
     }
 
@@ -12,6 +15,7 @@ class EmailLogin {
         guard backButton.isHittable else { return }
 
         backButton.tap()
+        handleSavePasswordPrompt()
     }
 
     class func logIn() {
@@ -33,6 +37,7 @@ class EmailLogin {
         enterEmail(enteredValue: email)
         enterPassword(enteredValue: password)
         app.buttons[UID.Button.logIn].tap()
+        handleSavePasswordPrompt()
     }
 
     class func enterEmail(enteredValue: String) {
@@ -46,4 +51,13 @@ class EmailLogin {
         field.tap()
         field.typeText(enteredValue)
     }
+
+    class func handleSavePasswordPrompt() {
+        // As of Xcode 14.3, the Simulator might ask to save the password which, of course, we don't want to do.
+        if app.buttons["Save Password"].waitForExistence(timeout: 5) {
+            // There should be no need to wait for this button to exist since it's part of the same
+            // alert where "Save Password" is.
+            app.buttons["Not Now"].tap()
+        }
+    }
 }