Another attempt to fix UI tests

okta · Nov 23, 2023 · 4cdc43d · 4cdc43d
1 parent e9d9396
commit 4cdc43d
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/Samples/DirectAuthSignIn/UITests/Pages/SignInScreen.swift b/Samples/DirectAuthSignIn/UITests/Pages/SignInScreen.swift
@@ -81,9 +81,15 @@ class SignInScreen: Screen {
     }
 
     func login(username: String? = nil, factor: Factor, value: String? = nil) {
-        if let username = username {
+        if factorTypeButton.label != factor.rawValue {
+            factorTypeButton.tap()
+            app.buttons[factor.rawValue].tap()
+        }
+
+        if let username = username,
+           app.textFields.firstMatch.waitForExistence(timeout: .standard)
+        {
             let field = app.textFields["username_field"]
-            _ = field.waitForExistence(timeout: .standard)
             field.tap()
 
             if let fieldValue = field.value as? String,
@@ -96,11 +102,6 @@ class SignInScreen: Screen {
             field.typeText(username)
         }
 
-        if factorTypeButton.label != factor.rawValue {
-            factorTypeButton.tap()
-            app.buttons[factor.rawValue].tap()
-        }
-
         if let value = factor.value(from: value) {
             var field = app.textFields[factor.accessibilityIdentifier]
             if !field.exists {