Fix UI test failures: registration dismiss cascade, onboarding reset, test stability
- Fix registration flow dismiss cascade: chain fullScreenCover → sheet onDismiss so auth state is set only after all UIKit presentations are removed, preventing RootView from swapping LoginView→MainTabView behind a stale sheet - Fix onboarding reset: set hasCompletedOnboarding directly instead of calling completeOnboarding() which has an auth guard that fails after DataManager.clear() - Stabilize Suite1 registration tests, Suite6 task tests, Suite7 contractor tests - Add clean-slate-per-suite via AuthenticatedUITestCase reset state - Improve test account seeding and screen object reliability Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Trey T
@@ -4,7 +4,6 @@ import XCTest
|
||||
/// Tests verify both positive AND negative conditions to ensure robust validation
|
||||
final class Suite1_RegistrationTests: BaseUITestCase {
|
||||
override var completeOnboarding: Bool { true }
|
||||
override var includeResetStateLaunchArgument: Bool { false }
|
||||
override var relaunchBetweenTests: Bool { true }
|
||||
|
||||
|
||||
@@ -154,8 +153,26 @@ final class Suite1_RegistrationTests: BaseUITestCase {
|
||||
return app.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Verify'")).firstMatch
|
||||
}
|
||||
|
||||
/// Dismiss keyboard safely — use the Done button if available, or tap
|
||||
/// a non-interactive area. Avoid nav bar (has Cancel button) and Return key (triggers onSubmit).
|
||||
/// Submit the registration form after filling it. Uses keyboard "Go" button
|
||||
/// or falls back to dismissing keyboard and tapping the register button.
|
||||
private func submitRegistrationForm() {
|
||||
let goButton = app.keyboards.buttons["Go"]
|
||||
if goButton.waitForExistence(timeout: 2) && goButton.isHittable {
|
||||
goButton.tap()
|
||||
return
|
||||
}
|
||||
// Fallback: dismiss keyboard, then tap register button
|
||||
dismissKeyboard()
|
||||
let registerButton = app.buttons[AccessibilityIdentifiers.Authentication.registerButton]
|
||||
registerButton.waitForExistenceOrFail(timeout: 5)
|
||||
if !registerButton.isHittable {
|
||||
let scrollView = app.scrollViews.firstMatch
|
||||
if scrollView.exists { registerButton.scrollIntoView(in: scrollView) }
|
||||
}
|
||||
registerButton.forceTap()
|
||||
}
|
||||
|
||||
/// Dismiss keyboard safely by tapping a neutral area.
|
||||
private func dismissKeyboard() {
|
||||
guard app.keyboards.firstMatch.exists else { return }
|
||||
// Try toolbar Done button first
|
||||
@@ -165,63 +182,44 @@ final class Suite1_RegistrationTests: BaseUITestCase {
|
||||
_ = app.keyboards.firstMatch.waitForNonExistence(timeout: 2)
|
||||
return
|
||||
}
|
||||
// Tap the sheet title area (safe neutral zone in the registration form)
|
||||
let title = app.staticTexts.containing(NSPredicate(format: "label CONTAINS[c] 'Create' OR label CONTAINS[c] 'Register' OR label CONTAINS[c] 'Account'")).firstMatch
|
||||
if title.exists && title.isHittable {
|
||||
title.tap()
|
||||
// Try navigation bar (works on most screens)
|
||||
let navBar = app.navigationBars.firstMatch
|
||||
if navBar.exists && navBar.isHittable {
|
||||
navBar.tap()
|
||||
_ = app.keyboards.firstMatch.waitForNonExistence(timeout: 2)
|
||||
return
|
||||
}
|
||||
// Last resort: tap the form area above the keyboard
|
||||
let formArea = app.scrollViews.firstMatch
|
||||
if formArea.exists {
|
||||
let topCenter = formArea.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.1))
|
||||
topCenter.tap()
|
||||
}
|
||||
// Fallback: tap top-center of the app
|
||||
app.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.1)).tap()
|
||||
_ = app.keyboards.firstMatch.waitForNonExistence(timeout: 2)
|
||||
}
|
||||
|
||||
/// Fill registration form with given credentials
|
||||
/// Fill registration form with given credentials.
|
||||
/// Uses Return key (\n) to trigger SwiftUI's .onSubmit / @FocusState field
|
||||
/// transitions. Direct field taps fail on iOS 26 when transitioning from
|
||||
/// TextField to SecureTextField (keyboard never appears).
|
||||
private func fillRegistrationForm(username: String, email: String, password: String, confirmPassword: String) {
|
||||
// iOS 26 bug: SecureTextField won't gain keyboard focus when tapped directly.
|
||||
// Workaround: toggle password visibility first to convert SecureField → TextField.
|
||||
let scrollView = app.scrollViews.firstMatch
|
||||
if scrollView.exists { scrollView.swipeUp() }
|
||||
|
||||
let toggleButtons = app.buttons.matching(NSPredicate(format: "label == 'Toggle password visibility'"))
|
||||
for i in 0..<toggleButtons.count {
|
||||
let toggle = toggleButtons.element(boundBy: i)
|
||||
if toggle.exists && toggle.isHittable { toggle.tap() }
|
||||
}
|
||||
|
||||
// Don't swipeDown — it dismisses the sheet. focusAndType() auto-scrolls via tap().
|
||||
let usernameField = app.textFields[AccessibilityIdentifiers.Authentication.registerUsernameField]
|
||||
let emailField = app.textFields[AccessibilityIdentifiers.Authentication.registerEmailField]
|
||||
let passwordField = app.secureTextFields[AccessibilityIdentifiers.Authentication.registerPasswordField]
|
||||
let confirmPasswordField = app.secureTextFields[AccessibilityIdentifiers.Authentication.registerConfirmPasswordField]
|
||||
|
||||
// STRICT: All fields must exist and be hittable
|
||||
XCTAssertTrue(usernameField.isHittable, "Username field must be hittable")
|
||||
XCTAssertTrue(emailField.isHittable, "Email field must be hittable")
|
||||
XCTAssertTrue(passwordField.isHittable, "Password field must be hittable")
|
||||
XCTAssertTrue(confirmPasswordField.isHittable, "Confirm password field must be hittable")
|
||||
let passwordField = app.textFields[AccessibilityIdentifiers.Authentication.registerPasswordField]
|
||||
let confirmPasswordField = app.textFields[AccessibilityIdentifiers.Authentication.registerConfirmPasswordField]
|
||||
|
||||
usernameField.focusAndType(username, app: app)
|
||||
|
||||
emailField.focusAndType(email, app: app)
|
||||
|
||||
// SecureTextFields: tap, handle strong password suggestion, type directly
|
||||
passwordField.tap()
|
||||
let chooseOwn = app.buttons["Choose My Own Password"]
|
||||
if chooseOwn.waitForExistence(timeout: 2) { chooseOwn.tap() }
|
||||
let notNow = app.buttons["Not Now"]
|
||||
if notNow.exists && notNow.isHittable { notNow.tap() }
|
||||
_ = app.keyboards.firstMatch.waitForExistence(timeout: 2)
|
||||
app.typeText(password)
|
||||
|
||||
// Use Next keyboard button to advance to confirm password (avoids tap-interception)
|
||||
let nextButton = app.keyboards.buttons["Next"]
|
||||
let goButton = app.keyboards.buttons["Go"]
|
||||
if nextButton.exists && nextButton.isHittable {
|
||||
nextButton.tap()
|
||||
} else if goButton.exists && goButton.isHittable {
|
||||
// Don't tap Go — it would submit the form. Tap the field instead.
|
||||
confirmPasswordField.tap()
|
||||
} else {
|
||||
confirmPasswordField.tap()
|
||||
}
|
||||
if chooseOwn.waitForExistence(timeout: 2) { chooseOwn.tap() }
|
||||
if notNow.exists && notNow.isHittable { notNow.tap() }
|
||||
_ = app.keyboards.firstMatch.waitForExistence(timeout: 2)
|
||||
app.typeText(confirmPassword)
|
||||
passwordField.focusAndType(password, app: app)
|
||||
confirmPasswordField.focusAndType(confirmPassword, app: app)
|
||||
}
|
||||
|
||||
// MARK: - 1. UI/Element Tests (no backend, pure UI verification)
|
||||
@@ -386,43 +384,19 @@ final class Suite1_RegistrationTests: BaseUITestCase {
|
||||
let username = testUsername
|
||||
let email = testEmail
|
||||
|
||||
// Use the proven RegisterScreenObject approach (navigates + fills via screen object)
|
||||
let login = TestFlows.navigateToLoginFromOnboarding(app: app)
|
||||
login.waitForLoad(timeout: defaultTimeout)
|
||||
login.tapSignUp()
|
||||
// Use the same proven flow as tests 09-12
|
||||
navigateToRegistration()
|
||||
fillRegistrationForm(
|
||||
username: username,
|
||||
email: email,
|
||||
password: testPassword,
|
||||
confirmPassword: testPassword
|
||||
)
|
||||
|
||||
let register = RegisterScreenObject(app: app)
|
||||
register.waitForLoad(timeout: navigationTimeout)
|
||||
register.fill(username: username, email: email, password: testPassword)
|
||||
submitRegistrationForm()
|
||||
|
||||
// Dismiss keyboard, then scroll to and tap the register button
|
||||
let registerButton = app.buttons[AccessibilityIdentifiers.Authentication.registerButton]
|
||||
registerButton.waitForExistenceOrFail(timeout: defaultTimeout, message: "Register button should exist")
|
||||
if !registerButton.isHittable {
|
||||
let scrollView = app.scrollViews.firstMatch
|
||||
if scrollView.exists { registerButton.scrollIntoView(in: scrollView) }
|
||||
}
|
||||
// Try keyboard Go button first (confirm password has .submitLabel(.go) + .onSubmit { register() })
|
||||
let goButton = app.keyboards.buttons["Go"]
|
||||
if goButton.exists && goButton.isHittable {
|
||||
goButton.tap()
|
||||
} else {
|
||||
// Fallback: scroll to and tap the register button
|
||||
if !registerButton.isHittable {
|
||||
let scrollView = app.scrollViews.firstMatch
|
||||
if scrollView.exists { registerButton.scrollIntoView(in: scrollView) }
|
||||
}
|
||||
registerButton.forceTap()
|
||||
}
|
||||
|
||||
// Wait for form to dismiss (API call completes and navigates to verification)
|
||||
let regUsernameField = app.textFields[AccessibilityIdentifiers.Authentication.registerUsernameField]
|
||||
XCTAssertTrue(regUsernameField.waitForNonExistence(timeout: 15),
|
||||
"Registration form must disappear. If this fails consistently, iOS Strong Password autofill " +
|
||||
"may be interfering with SecureTextField input in the simulator.")
|
||||
|
||||
// STRICT: Verification screen must appear
|
||||
XCTAssertTrue(waitForVerificationScreen(timeout: 10), "Verification screen must appear after registration")
|
||||
// Wait for verification screen to appear (registration form may still exist underneath)
|
||||
XCTAssertTrue(waitForVerificationScreen(timeout: 15), "Verification screen must appear after registration")
|
||||
|
||||
// NEGATIVE CHECK: Tab bar should NOT be hittable while on verification
|
||||
let tabBar = app.tabBars.firstMatch
|
||||
@@ -430,55 +404,43 @@ final class Suite1_RegistrationTests: BaseUITestCase {
|
||||
XCTAssertFalse(tabBar.isHittable, "Tab bar should NOT be interactive while verification is required")
|
||||
}
|
||||
|
||||
// Enter verification code
|
||||
// Enter verification code — the verification screen auto-submits when 6 digits are typed.
|
||||
// IMPORTANT: Do NOT use focusAndType() here — it taps the nav bar to dismiss the keyboard,
|
||||
// which can accidentally hit the logout button in the toolbar.
|
||||
let codeField = verificationCodeField()
|
||||
XCTAssertTrue(codeField.waitForExistence(timeout: 5), "Verification code field must exist")
|
||||
XCTAssertTrue(codeField.isHittable, "Verification code field must be tappable")
|
||||
codeField.tap()
|
||||
_ = app.keyboards.firstMatch.waitForExistence(timeout: 3)
|
||||
codeField.typeText(testVerificationCode)
|
||||
|
||||
codeField.focusAndType(testVerificationCode, app: app)
|
||||
// Auto-submit: typing 6 digits triggers verifyEmail() and navigates to main app.
|
||||
// Wait for the main app to appear (RootView sets ui.root.mainTabs when showing MainTabView).
|
||||
let mainTabs = app.otherElements["ui.root.mainTabs"]
|
||||
let mainAppAppeared = mainTabs.waitForExistence(timeout: 15)
|
||||
|
||||
dismissKeyboard()
|
||||
let verifyButton = verificationButton()
|
||||
XCTAssertTrue(verifyButton.exists && verifyButton.isHittable, "Verify button must be tappable")
|
||||
verifyButton.tap()
|
||||
if !mainAppAppeared {
|
||||
// Diagnostic: capture what's on screen
|
||||
let screenshot = XCTAttachment(screenshot: app.screenshot())
|
||||
screenshot.name = "post-verification-no-main-tabs"
|
||||
screenshot.lifetime = .keepAlways
|
||||
add(screenshot)
|
||||
|
||||
// STRICT: Verification screen must DISAPPEAR
|
||||
XCTAssertTrue(waitForElementToDisappear(codeField, timeout: 15), "Verification code field MUST disappear after successful verification")
|
||||
// Check if we're stuck on verification screen or login
|
||||
let stillOnVerify = codeField.exists
|
||||
let onLogin = app.textFields[AccessibilityIdentifiers.Authentication.usernameField].exists
|
||||
XCTFail("Main app did not appear after verification. StillOnVerify=\(stillOnVerify), OnLogin=\(onLogin)")
|
||||
return
|
||||
}
|
||||
|
||||
// STRICT: Must be on main app screen
|
||||
let residencesTab = app.tabBars.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Residences'")).firstMatch
|
||||
XCTAssertTrue(residencesTab.waitForExistence(timeout: 15), "Tab bar must appear after verification")
|
||||
XCTAssertTrue(waitForElementToBeHittable(residencesTab, timeout: 5), "Residences tab MUST be tappable after verification")
|
||||
// STRICT: Tab bar must exist and be interactive
|
||||
XCTAssertTrue(app.tabBars.firstMatch.waitForExistence(timeout: 5), "Tab bar must exist in main app")
|
||||
|
||||
// NEGATIVE CHECK: Verification screen should be completely gone
|
||||
XCTAssertFalse(codeField.exists, "Verification code field must NOT exist after successful verification")
|
||||
|
||||
// Verify we can interact with the app (tap tab)
|
||||
// Cleanup: Logout via profile tab → settings → logout
|
||||
dismissKeyboard()
|
||||
residencesTab.tap()
|
||||
|
||||
// Cleanup: Logout via settings button on Residences tab
|
||||
dismissKeyboard()
|
||||
residencesTab.tap()
|
||||
|
||||
let settingsButton = app.buttons[AccessibilityIdentifiers.Navigation.settingsButton]
|
||||
XCTAssertTrue(settingsButton.waitForExistence(timeout: 5) && settingsButton.isHittable, "Settings button must be tappable")
|
||||
settingsButton.tap()
|
||||
|
||||
let logoutButton = app.buttons[AccessibilityIdentifiers.Profile.logoutButton].firstMatch
|
||||
XCTAssertTrue(logoutButton.waitForExistence(timeout: 5) && logoutButton.isHittable, "Logout button must be tappable")
|
||||
dismissKeyboard()
|
||||
logoutButton.tap()
|
||||
|
||||
let alertLogout = app.alerts.buttons["Log Out"]
|
||||
if alertLogout.waitForExistence(timeout: 3) {
|
||||
dismissKeyboard()
|
||||
alertLogout.tap()
|
||||
}
|
||||
|
||||
// STRICT: Must return to login screen
|
||||
let welcomeText = app.textFields[AccessibilityIdentifiers.Authentication.usernameField]
|
||||
XCTAssertTrue(welcomeText.waitForExistence(timeout: 5), "Must return to login screen after logout")
|
||||
ensureLoggedOut()
|
||||
}
|
||||
|
||||
// MARK: - 4. Server-Side Validation Tests (NOW a user exists from test07)
|
||||
@@ -517,7 +479,7 @@ final class Suite1_RegistrationTests: BaseUITestCase {
|
||||
func test09_registrationWithInvalidVerificationCode() {
|
||||
let username = testUsername
|
||||
let email = testEmail
|
||||
|
||||
|
||||
navigateToRegistration()
|
||||
fillRegistrationForm(
|
||||
username: username,
|
||||
@@ -525,26 +487,24 @@ final class Suite1_RegistrationTests: BaseUITestCase {
|
||||
password: testPassword,
|
||||
confirmPassword: testPassword
|
||||
)
|
||||
|
||||
dismissKeyboard()
|
||||
app.buttons[AccessibilityIdentifiers.Authentication.registerButton].tap()
|
||||
|
||||
submitRegistrationForm()
|
||||
|
||||
// Wait for verification screen
|
||||
XCTAssertTrue(waitForVerificationScreen(timeout: 10), "Must navigate to verification screen")
|
||||
|
||||
// Enter INVALID code
|
||||
let codeField = verificationCodeField()
|
||||
XCTAssertTrue(codeField.waitForExistence(timeout: 5) && codeField.isHittable)
|
||||
codeField.focusAndType("000000", app: app) // Wrong code
|
||||
|
||||
let verifyButton = verificationButton()
|
||||
dismissKeyboard()
|
||||
verifyButton.tap()
|
||||
|
||||
// STRICT: Error message must appear
|
||||
let errorPredicate = NSPredicate(format: "label CONTAINS[c] 'invalid' OR label CONTAINS[c] 'error' OR label CONTAINS[c] 'incorrect' OR label CONTAINS[c] 'wrong'")
|
||||
// Enter INVALID code — auto-submits at 6 digits
|
||||
// Don't use focusAndType() — it taps nav bar which can hit the logout button
|
||||
let codeField = verificationCodeField()
|
||||
XCTAssertTrue(codeField.waitForExistence(timeout: 5))
|
||||
codeField.tap()
|
||||
_ = app.keyboards.firstMatch.waitForExistence(timeout: 3)
|
||||
codeField.typeText("000000") // Wrong code → auto-submit → API error
|
||||
|
||||
// STRICT: Error message must appear (auto-submit verifies with wrong code)
|
||||
let errorPredicate = NSPredicate(format: "label CONTAINS[c] 'invalid' OR label CONTAINS[c] 'error' OR label CONTAINS[c] 'incorrect' OR label CONTAINS[c] 'wrong' OR label CONTAINS[c] 'expired'")
|
||||
let errorMessage = app.staticTexts.containing(errorPredicate).firstMatch
|
||||
XCTAssertTrue(errorMessage.waitForExistence(timeout: 5), "Error message MUST appear for invalid verification code")
|
||||
XCTAssertTrue(errorMessage.waitForExistence(timeout: 10), "Error message MUST appear for invalid verification code")
|
||||
}
|
||||
|
||||
func test10_verificationCodeFieldValidation() {
|
||||
@@ -559,26 +519,20 @@ final class Suite1_RegistrationTests: BaseUITestCase {
|
||||
confirmPassword: testPassword
|
||||
)
|
||||
|
||||
dismissKeyboard()
|
||||
app.buttons[AccessibilityIdentifiers.Authentication.registerButton].tap()
|
||||
submitRegistrationForm()
|
||||
|
||||
XCTAssertTrue(waitForVerificationScreen(timeout: 10))
|
||||
|
||||
// Enter incomplete code (only 3 digits)
|
||||
// Enter incomplete code (only 3 digits — won't trigger auto-submit)
|
||||
// Don't use focusAndType() — it taps nav bar which can hit the logout button
|
||||
let codeField = verificationCodeField()
|
||||
XCTAssertTrue(codeField.waitForExistence(timeout: 5) && codeField.isHittable)
|
||||
codeField.focusAndType("123", app: app) // Incomplete
|
||||
XCTAssertTrue(codeField.waitForExistence(timeout: 5))
|
||||
codeField.tap()
|
||||
_ = app.keyboards.firstMatch.waitForExistence(timeout: 3)
|
||||
codeField.typeText("123") // Incomplete
|
||||
|
||||
let verifyButton = verificationButton()
|
||||
|
||||
// Button might be disabled with incomplete code
|
||||
if verifyButton.isEnabled {
|
||||
dismissKeyboard()
|
||||
verifyButton.tap()
|
||||
}
|
||||
|
||||
// STRICT: Must still be on verification screen
|
||||
XCTAssertTrue(codeField.exists && codeField.isHittable, "Must remain on verification screen with incomplete code")
|
||||
// STRICT: Must still be on verification screen (3 digits won't auto-submit)
|
||||
XCTAssertTrue(codeField.exists, "Must remain on verification screen with incomplete code")
|
||||
|
||||
// NEGATIVE CHECK: Should NOT have navigated to main app
|
||||
let residencesTab = app.tabBars.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Residences'")).firstMatch
|
||||
@@ -588,7 +542,7 @@ final class Suite1_RegistrationTests: BaseUITestCase {
|
||||
}
|
||||
|
||||
func test11_appRelaunchWithUnverifiedUser() {
|
||||
// This test verifies the fix for: user kills app on verification screen, relaunches, should see verification again
|
||||
// This test verifies: user kills app on verification screen, relaunches, should see verification again
|
||||
|
||||
let username = testUsername
|
||||
let email = testEmail
|
||||
@@ -601,35 +555,37 @@ final class Suite1_RegistrationTests: BaseUITestCase {
|
||||
confirmPassword: testPassword
|
||||
)
|
||||
|
||||
dismissKeyboard()
|
||||
app.buttons[AccessibilityIdentifiers.Authentication.registerButton].tap()
|
||||
submitRegistrationForm()
|
||||
|
||||
// Wait for verification screen
|
||||
XCTAssertTrue(waitForVerificationScreen(timeout: 10), "Must reach verification screen")
|
||||
XCTAssertTrue(waitForVerificationScreen(timeout: 20), "Must reach verification screen")
|
||||
|
||||
// Simulate app kill and relaunch (terminate and launch)
|
||||
// Relaunch WITHOUT --reset-state so the unverified session persists.
|
||||
// Keep --ui-testing and --disable-animations but remove --reset-state and --complete-onboarding.
|
||||
app.terminate()
|
||||
app.launchArguments = ["--ui-testing", "--disable-animations"]
|
||||
app.launch()
|
||||
|
||||
// Wait for app to fully initialize
|
||||
app.otherElements["ui.app.ready"].waitForExistenceOrFail(timeout: 15)
|
||||
|
||||
// STRICT: After relaunch, unverified user MUST see verification screen, NOT main app
|
||||
let authCodeFieldAfterRelaunch = app.textFields[AccessibilityIdentifiers.Authentication.verificationCodeField]
|
||||
let onboardingCodeFieldAfterRelaunch = app.textFields[AccessibilityIdentifiers.Onboarding.verificationCodeField]
|
||||
let loginScreen = app.textFields[AccessibilityIdentifiers.Authentication.usernameField]
|
||||
let tabBar = app.tabBars.firstMatch
|
||||
|
||||
// Wait for app to settle
|
||||
// Wait for one of the expected screens to appear
|
||||
_ = authCodeFieldAfterRelaunch.waitForExistence(timeout: 10)
|
||||
|| onboardingCodeFieldAfterRelaunch.waitForExistence(timeout: 10)
|
||||
|| loginScreen.waitForExistence(timeout: 10)
|
||||
|| onboardingCodeFieldAfterRelaunch.waitForExistence(timeout: 5)
|
||||
|| loginScreen.waitForExistence(timeout: 5)
|
||||
|
||||
// User should either be on verification screen OR login screen (if token expired)
|
||||
// They should NEVER be on main app with unverified email
|
||||
// User should NEVER be on main app with unverified email
|
||||
if tabBar.exists && tabBar.isHittable {
|
||||
// If tab bar is accessible, that's a FAILURE - unverified user should not access main app
|
||||
XCTFail("CRITICAL: Unverified user should NOT have access to main app after relaunch. Tab bar is hittable!")
|
||||
}
|
||||
|
||||
// Acceptable states: verification screen OR login screen
|
||||
// Acceptable states: verification screen OR login screen (if token expired)
|
||||
let onVerificationScreen =
|
||||
(authCodeFieldAfterRelaunch.exists && authCodeFieldAfterRelaunch.isHittable)
|
||||
|| (onboardingCodeFieldAfterRelaunch.exists && onboardingCodeFieldAfterRelaunch.isHittable)
|
||||
@@ -638,10 +594,10 @@ final class Suite1_RegistrationTests: BaseUITestCase {
|
||||
XCTAssertTrue(onVerificationScreen || onLoginScreen,
|
||||
"After relaunch, unverified user must be on verification screen or login screen, NOT main app")
|
||||
|
||||
// Cleanup
|
||||
// Cleanup: logout from whatever screen we're on
|
||||
if onVerificationScreen {
|
||||
let logoutButton = app.buttons[AccessibilityIdentifiers.Profile.logoutButton].firstMatch
|
||||
if logoutButton.exists && logoutButton.isHittable {
|
||||
let logoutButton = app.buttons[AccessibilityIdentifiers.Authentication.verificationLogoutButton]
|
||||
if logoutButton.waitForExistence(timeout: 3) && logoutButton.isHittable {
|
||||
dismissKeyboard()
|
||||
logoutButton.tap()
|
||||
}
|
||||
@@ -660,18 +616,15 @@ final class Suite1_RegistrationTests: BaseUITestCase {
|
||||
confirmPassword: testPassword
|
||||
)
|
||||
|
||||
dismissKeyboard()
|
||||
app.buttons[AccessibilityIdentifiers.Authentication.registerButton].tap()
|
||||
submitRegistrationForm()
|
||||
|
||||
// Wait for verification screen
|
||||
XCTAssertTrue(waitForVerificationScreen(timeout: 10), "Must navigate to verification screen")
|
||||
|
||||
// STRICT: Logout button must exist and be tappable
|
||||
let logoutButton = app.buttons[AccessibilityIdentifiers.Profile.logoutButton].firstMatch
|
||||
// STRICT: Logout button must exist and be tappable (uses dedicated verify screen ID)
|
||||
let logoutButton = app.buttons[AccessibilityIdentifiers.Authentication.verificationLogoutButton]
|
||||
XCTAssertTrue(logoutButton.waitForExistence(timeout: 5), "Logout button MUST exist on verification screen")
|
||||
XCTAssertTrue(logoutButton.isHittable, "Logout button MUST be tappable on verification screen")
|
||||
|
||||
dismissKeyboard()
|
||||
logoutButton.waitUntilHittable(timeout: 5)
|
||||
logoutButton.tap()
|
||||
|
||||
// STRICT: Verification screen must disappear
|
||||
|
||||
Reference in New Issue
Block a user