Re-architect iOS XCUITest suite: per-test isolation + domain organization
Migrate the XCUITest suite off the legacy shared-account model (and the prior Django-style auth assumptions) to a parallel-safe, domain-organized architecture, validated end-to-end against the live Kratos stack. Isolation (parallel-safe by construction): - Core/Fixtures/TestAccount.swift: each test mints its own pre-verified Kratos identity (uit_<domain>_<uuid>@test.honeydue.local), logs in, seeds under its own token, and deletes the identity in teardown (cascading all data + clearing Kratos). No shared testuser; parallel workers no longer race. - AuthenticatedUITestCase rewritten to that model (member surface preserved); adds requiresResidence / seedAccountPreconditions to seed UI-gated data BEFORE login (a fresh account is empty at login). Organization (255 tests preserved, none dropped): - 21 domain suites under Auth/ Onboarding/ Residence/ Task/ Contractor/ Document/ Sharing/ Navigation/ Smoke/ CrossCutting/ E2E/, consistent <Domain>UITests naming. Removes the Suite1..11 / AAA_ / ZZ_ / Tests/Rebuild naming chaos and the overlapping task/residence/auth suites. Runner + test plans: - run_ui_tests.sh: Smoke gate -> Seed -> Parallel(8 workers) -> Sweep. The parallel phase runs the whole target minus phase-managed suites via -skip-testing, so new suites auto-include (no hand-maintained list to drift). Drops the 2-worker cap and Suite6 isolation (isolation made them moot). - HoneyDueUITests.xctestplan skips the 4 phase-managed suites; adds Smoke.xctestplan. Kratos auth fixes folded in (login/verify/reset endpoints removed under Kratos): real Mailpit verification codes replace the obsolete fixed "123456"; teardown deletes Kratos identities; admin-panel login uses the correct seeded password. Build green; isolation, parallelism, and the precondition/sharing migrations validated against the live stack (0 leaked accounts). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Trey T
@@ -0,0 +1,387 @@
|
||||
import XCTest
|
||||
|
||||
/// Residence MUTATION coverage: validation, creation (incl. edge-case names and
|
||||
/// addresses), and editing.
|
||||
///
|
||||
/// Migrated from the mutation half of Suite4_ComprehensiveResidenceTests. The
|
||||
/// view/navigation/refresh/persistence tests from that suite live in
|
||||
/// `ResidenceUITests`.
|
||||
///
|
||||
/// Per-test isolation comes from `AuthenticatedUITestCase` (fresh account per
|
||||
/// test, deleted in teardown). These tests CREATE residences through the UI, so
|
||||
/// they need no seeded precondition — creation doesn't require existing data.
|
||||
final class ResidenceManagementUITests: AuthenticatedUITestCase {
|
||||
|
||||
// Test data tracking — names created through the UI, reconciled to IDs for
|
||||
// API cleanup in tearDown.
|
||||
var createdResidenceNames: [String] = []
|
||||
|
||||
override func setUpWithError() throws {
|
||||
try super.setUpWithError()
|
||||
|
||||
// Dismiss any open form/sheet from a previous test
|
||||
let cancelButton = app.buttons[AccessibilityIdentifiers.Residence.formCancelButton].firstMatch
|
||||
if cancelButton.exists { cancelButton.tap() }
|
||||
|
||||
navigateToResidences()
|
||||
residenceList.addButton.waitForExistenceOrFail(timeout: navigationTimeout, message: "Residence add button should appear after navigation")
|
||||
}
|
||||
|
||||
override func tearDownWithError() throws {
|
||||
// Ensure all UI-created residences are tracked for API cleanup
|
||||
if !createdResidenceNames.isEmpty,
|
||||
let allResidences = TestAccountAPIClient.listResidences(token: session.token) {
|
||||
for name in createdResidenceNames {
|
||||
if let res = allResidences.first(where: { $0.name.contains(name) }) {
|
||||
cleaner.trackResidence(res.id)
|
||||
}
|
||||
}
|
||||
}
|
||||
createdResidenceNames.removeAll()
|
||||
try super.tearDownWithError()
|
||||
}
|
||||
|
||||
// MARK: - Page Objects
|
||||
|
||||
private var residenceList: ResidenceListScreen { ResidenceListScreen(app: app) }
|
||||
private var residenceForm: ResidenceFormScreen { ResidenceFormScreen(app: app) }
|
||||
private var residenceDetail: ResidenceDetailScreen { ResidenceDetailScreen(app: app) }
|
||||
|
||||
// MARK: - Helper Methods
|
||||
|
||||
private func openResidenceForm(file: StaticString = #filePath, line: UInt = #line) {
|
||||
let addButton = residenceList.addButton
|
||||
addButton.waitForExistenceOrFail(timeout: defaultTimeout, message: "Residence add button should exist", file: file, line: line)
|
||||
XCTAssertTrue(addButton.isEnabled, "Residence add button should be enabled", file: file, line: line)
|
||||
addButton.tap()
|
||||
residenceForm.nameField.waitForExistenceOrFail(timeout: defaultTimeout, message: "Residence form should open", file: file, line: line)
|
||||
}
|
||||
|
||||
/// Fill address fields. Dismisses keyboard between each field for clean focus.
|
||||
private func fillAddressFields(street: String, city: String, state: String, postal: String) {
|
||||
// Scroll address section into view — may need multiple swipes on smaller screens
|
||||
let streetField = app.textFields[AccessibilityIdentifiers.Residence.streetAddressField].firstMatch
|
||||
for _ in 0..<3 {
|
||||
if streetField.exists && streetField.isHittable { break }
|
||||
app.swipeUp()
|
||||
}
|
||||
streetField.waitForExistenceOrFail(timeout: navigationTimeout, message: "Street field should appear after scroll")
|
||||
|
||||
fillTextField(identifier: AccessibilityIdentifiers.Residence.streetAddressField, text: street)
|
||||
dismissKeyboard()
|
||||
fillTextField(identifier: AccessibilityIdentifiers.Residence.cityField, text: city)
|
||||
dismissKeyboard()
|
||||
fillTextField(identifier: AccessibilityIdentifiers.Residence.stateProvinceField, text: state)
|
||||
dismissKeyboard()
|
||||
fillTextField(identifier: AccessibilityIdentifiers.Residence.postalCodeField, text: postal)
|
||||
dismissKeyboard()
|
||||
}
|
||||
|
||||
private func selectPropertyType(type: String) {
|
||||
let picker = app.buttons[AccessibilityIdentifiers.Residence.propertyTypePicker].firstMatch
|
||||
guard picker.waitForExistence(timeout: defaultTimeout) else {
|
||||
XCTFail("Property type picker not found")
|
||||
return
|
||||
}
|
||||
picker.tap()
|
||||
|
||||
// SwiftUI Picker in Form pushes a selection list — find the option by text
|
||||
let option = app.staticTexts[type]
|
||||
option.waitForExistenceOrFail(timeout: navigationTimeout, message: "Property type '\(type)' should appear in picker list")
|
||||
option.tap()
|
||||
}
|
||||
|
||||
private func createResidence(
|
||||
name: String,
|
||||
propertyType: String? = nil,
|
||||
street: String = "123 Test St",
|
||||
city: String = "TestCity",
|
||||
state: String = "TS",
|
||||
postal: String = "12345"
|
||||
) {
|
||||
openResidenceForm()
|
||||
|
||||
residenceForm.enterName(name)
|
||||
if let propertyType = propertyType {
|
||||
selectPropertyType(type: propertyType)
|
||||
}
|
||||
dismissKeyboard()
|
||||
fillAddressFields(street: street, city: city, state: state, postal: postal)
|
||||
residenceForm.save()
|
||||
|
||||
createdResidenceNames.append(name)
|
||||
|
||||
// Track for API cleanup
|
||||
if let items = TestAccountAPIClient.listResidences(token: session.token),
|
||||
let created = items.first(where: { $0.name.contains(name) }) {
|
||||
cleaner.trackResidence(created.id)
|
||||
}
|
||||
}
|
||||
|
||||
private func findResidence(name: String) -> XCUIElement {
|
||||
return app.staticTexts.containing(NSPredicate(format: "label CONTAINS %@", name)).firstMatch
|
||||
}
|
||||
|
||||
// MARK: - 1. Error / Validation Tests
|
||||
|
||||
func test01_cannotCreateResidenceWithEmptyName() {
|
||||
openResidenceForm()
|
||||
|
||||
// Leave name empty, fill only address
|
||||
fillAddressFields(street: "123 Test St", city: "TestCity", state: "TS", postal: "12345")
|
||||
|
||||
// Scroll to save button if needed
|
||||
app.swipeUp()
|
||||
|
||||
// Submit button should be disabled when name is empty (may be labeled "Add" or "Save")
|
||||
let saveButton = app.buttons[AccessibilityIdentifiers.Residence.saveButton].firstMatch
|
||||
_ = saveButton.waitForExistence(timeout: defaultTimeout)
|
||||
XCTAssertTrue(saveButton.exists, "Submit button should exist")
|
||||
XCTAssertFalse(saveButton.isEnabled, "Submit button should be disabled when name is empty")
|
||||
|
||||
// Clean up: dismiss the form so next test starts on the list
|
||||
residenceForm.cancel()
|
||||
}
|
||||
|
||||
func test02_cancelResidenceCreation() {
|
||||
openResidenceForm()
|
||||
|
||||
// Fill some data
|
||||
let nameField = app.textFields[AccessibilityIdentifiers.Residence.nameField].firstMatch
|
||||
nameField.tap()
|
||||
// Wait for keyboard to appear before typing
|
||||
let keyboard = app.keyboards.firstMatch
|
||||
_ = keyboard.waitForExistence(timeout: 3)
|
||||
nameField.typeText("This will be canceled")
|
||||
|
||||
// Tap cancel
|
||||
let cancelButton = app.buttons[AccessibilityIdentifiers.Residence.formCancelButton].firstMatch
|
||||
XCTAssertTrue(cancelButton.exists, "Cancel button should exist")
|
||||
cancelButton.tap()
|
||||
|
||||
// Should be back on residences list
|
||||
let residencesTab = app.tabBars.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Residences'")).firstMatch
|
||||
_ = residencesTab.waitForExistence(timeout: defaultTimeout)
|
||||
XCTAssertTrue(residencesTab.exists, "Should be back on residences list")
|
||||
|
||||
// Residence should not exist
|
||||
let residence = findResidence(name: "This will be canceled")
|
||||
XCTAssertFalse(residence.exists, "Canceled residence should not exist")
|
||||
}
|
||||
|
||||
// MARK: - 2. Creation Tests
|
||||
|
||||
func test03_createResidenceWithMinimalData() {
|
||||
let timestamp = Int(Date().timeIntervalSince1970)
|
||||
let residenceName = "Minimal Home \(timestamp)"
|
||||
|
||||
createResidence(name: residenceName)
|
||||
|
||||
let residenceInList = findResidence(name: residenceName)
|
||||
XCTAssertTrue(residenceInList.waitForExistence(timeout: 10), "Residence should appear in list")
|
||||
}
|
||||
|
||||
// test04_createResidenceWithAllPropertyTypes — removed in source: backend has no seeded residence types
|
||||
|
||||
func test05_createMultipleResidencesInSequence() {
|
||||
let timestamp = Int(Date().timeIntervalSince1970)
|
||||
|
||||
for i in 1...3 {
|
||||
let residenceName = "Sequential Home \(i) - \(timestamp)"
|
||||
createResidence(name: residenceName)
|
||||
|
||||
navigateToResidences()
|
||||
}
|
||||
|
||||
// Verify all residences exist
|
||||
for i in 1...3 {
|
||||
let residenceName = "Sequential Home \(i) - \(timestamp)"
|
||||
let residence = findResidence(name: residenceName)
|
||||
XCTAssertTrue(residence.exists, "Residence \(i) should exist in list")
|
||||
}
|
||||
}
|
||||
|
||||
func test06_createResidenceWithVeryLongName() {
|
||||
let timestamp = Int(Date().timeIntervalSince1970)
|
||||
let longName = "This is an extremely long residence name that goes on and on and on to test how the system handles very long text input in the name field \(timestamp)"
|
||||
|
||||
createResidence(name: longName)
|
||||
|
||||
// Verify it appears (may be truncated in display)
|
||||
let residence = app.staticTexts.containing(NSPredicate(format: "label CONTAINS 'extremely long residence'")).firstMatch
|
||||
XCTAssertTrue(residence.waitForExistence(timeout: 10), "Long name residence should exist")
|
||||
}
|
||||
|
||||
func test07_createResidenceWithSpecialCharacters() {
|
||||
let timestamp = Int(Date().timeIntervalSince1970)
|
||||
let specialName = "Special !@#$%^&*() Home \(timestamp)"
|
||||
|
||||
createResidence(name: specialName)
|
||||
|
||||
let residence = findResidence(name: "Special")
|
||||
XCTAssertTrue(residence.waitForExistence(timeout: 10), "Residence with special chars should exist")
|
||||
}
|
||||
|
||||
func test08_createResidenceWithEmojis() {
|
||||
let timestamp = Int(Date().timeIntervalSince1970)
|
||||
let emojiName = "Beach House \(timestamp)"
|
||||
|
||||
createResidence(name: emojiName)
|
||||
|
||||
let residence = findResidence(name: "Beach House")
|
||||
XCTAssertTrue(residence.waitForExistence(timeout: 10), "Residence with emojis should exist")
|
||||
}
|
||||
|
||||
func test09_createResidenceWithInternationalCharacters() {
|
||||
let timestamp = Int(Date().timeIntervalSince1970)
|
||||
let internationalName = "Chateau Montreal \(timestamp)"
|
||||
|
||||
createResidence(name: internationalName)
|
||||
|
||||
let residence = findResidence(name: "Chateau")
|
||||
XCTAssertTrue(residence.waitForExistence(timeout: 10), "Residence with international chars should exist")
|
||||
}
|
||||
|
||||
func test10_createResidenceWithVeryLongAddress() {
|
||||
let timestamp = Int(Date().timeIntervalSince1970)
|
||||
let residenceName = "Long Address Home \(timestamp)"
|
||||
|
||||
createResidence(
|
||||
name: residenceName,
|
||||
street: "123456789 Very Long Street Name That Goes On And On Boulevard Apartment Complex Unit 42B",
|
||||
city: "VeryLongCityNameThatTestsTheLimit",
|
||||
state: "CA",
|
||||
postal: "12345-6789"
|
||||
)
|
||||
|
||||
let residence = findResidence(name: residenceName)
|
||||
XCTAssertTrue(residence.waitForExistence(timeout: 10), "Residence with long address should exist")
|
||||
}
|
||||
|
||||
// MARK: - 3. Edit / Update Tests
|
||||
|
||||
func test11_editResidenceName() {
|
||||
let timestamp = Int(Date().timeIntervalSince1970)
|
||||
let originalName = "Original Name \(timestamp)"
|
||||
let newName = "Edited Name \(timestamp)"
|
||||
|
||||
// Create residence
|
||||
createResidence(name: originalName)
|
||||
|
||||
navigateToResidences()
|
||||
|
||||
// Find and tap residence
|
||||
let residence = findResidence(name: originalName)
|
||||
XCTAssertTrue(residence.waitForExistence(timeout: defaultTimeout), "Residence should exist")
|
||||
residence.tap()
|
||||
|
||||
// Tap edit button
|
||||
let editButton = app.buttons[AccessibilityIdentifiers.Residence.editButton].firstMatch
|
||||
if editButton.waitForExistence(timeout: defaultTimeout) {
|
||||
editButton.tap()
|
||||
|
||||
// Edit name
|
||||
let nameField = app.textFields[AccessibilityIdentifiers.Residence.nameField].firstMatch
|
||||
if nameField.waitForExistence(timeout: defaultTimeout) {
|
||||
nameField.clearAndEnterText(newName, app: app)
|
||||
|
||||
// Save
|
||||
let saveButton = app.buttons[AccessibilityIdentifiers.Residence.saveButton].firstMatch
|
||||
if saveButton.exists {
|
||||
saveButton.tap()
|
||||
|
||||
// Track new name
|
||||
createdResidenceNames.append(newName)
|
||||
|
||||
// Verify new name appears
|
||||
navigateToResidences()
|
||||
let updatedResidence = findResidence(name: newName)
|
||||
XCTAssertTrue(updatedResidence.waitForExistence(timeout: defaultTimeout), "Residence should show updated name")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func test12_updateAllResidenceFields() {
|
||||
let timestamp = Int(Date().timeIntervalSince1970)
|
||||
let originalName = "Update All Fields \(timestamp)"
|
||||
let newName = "All Fields Updated \(timestamp)"
|
||||
let newStreet = "999 Updated Avenue"
|
||||
let newCity = "NewCity"
|
||||
let newState = "NC"
|
||||
let newPostal = "99999"
|
||||
|
||||
// Create residence with initial values
|
||||
createResidence(name: originalName, street: "123 Old St", city: "OldCity", state: "OC", postal: "11111")
|
||||
|
||||
navigateToResidences()
|
||||
|
||||
// Find and tap residence
|
||||
let residence = findResidence(name: originalName)
|
||||
XCTAssertTrue(residence.waitForExistence(timeout: defaultTimeout), "Residence should exist")
|
||||
residence.tap()
|
||||
|
||||
// Tap edit button
|
||||
let editButton = app.buttons[AccessibilityIdentifiers.Residence.editButton].firstMatch
|
||||
XCTAssertTrue(editButton.waitForExistence(timeout: defaultTimeout), "Edit button should exist")
|
||||
editButton.tap()
|
||||
|
||||
// Update name
|
||||
let nameField = app.textFields[AccessibilityIdentifiers.Residence.nameField].firstMatch
|
||||
XCTAssertTrue(nameField.waitForExistence(timeout: defaultTimeout), "Name field should exist")
|
||||
nameField.clearAndEnterText(newName, app: app)
|
||||
|
||||
// Property type update skipped — backend has no seeded residence types
|
||||
|
||||
// Dismiss keyboard from name edit, scroll to address fields
|
||||
dismissKeyboard()
|
||||
app.swipeUp()
|
||||
|
||||
// Update address fields
|
||||
let streetField = app.textFields[AccessibilityIdentifiers.Residence.streetAddressField].firstMatch
|
||||
if streetField.waitForExistence(timeout: defaultTimeout) {
|
||||
streetField.clearAndEnterText(newStreet, app: app)
|
||||
dismissKeyboard()
|
||||
}
|
||||
|
||||
let cityField = app.textFields[AccessibilityIdentifiers.Residence.cityField].firstMatch
|
||||
if cityField.waitForExistence(timeout: defaultTimeout) {
|
||||
cityField.clearAndEnterText(newCity, app: app)
|
||||
dismissKeyboard()
|
||||
}
|
||||
|
||||
let stateField = app.textFields[AccessibilityIdentifiers.Residence.stateProvinceField].firstMatch
|
||||
if stateField.waitForExistence(timeout: defaultTimeout) {
|
||||
stateField.clearAndEnterText(newState, app: app)
|
||||
dismissKeyboard()
|
||||
}
|
||||
|
||||
// Update postal code
|
||||
let postalField = app.textFields[AccessibilityIdentifiers.Residence.postalCodeField].firstMatch
|
||||
if postalField.exists {
|
||||
postalField.clearAndEnterText(newPostal, app: app)
|
||||
}
|
||||
|
||||
// Scroll to save button
|
||||
app.swipeUp()
|
||||
|
||||
// Save
|
||||
let saveButton = app.buttons[AccessibilityIdentifiers.Residence.saveButton].firstMatch
|
||||
_ = saveButton.waitForExistence(timeout: defaultTimeout)
|
||||
XCTAssertTrue(saveButton.exists, "Save button should exist")
|
||||
saveButton.tap()
|
||||
|
||||
// Wait for form to dismiss after API call
|
||||
_ = saveButton.waitForNonExistence(timeout: defaultTimeout)
|
||||
|
||||
// Track new name
|
||||
createdResidenceNames.append(newName)
|
||||
|
||||
// Verify updated residence appears in list with new name
|
||||
navigateToResidences()
|
||||
let updatedResidence = findResidence(name: newName)
|
||||
XCTAssertTrue(updatedResidence.waitForExistence(timeout: defaultTimeout), "Residence should show updated name in list")
|
||||
|
||||
// Name update verified in list — detail view doesn't display address fields
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,459 @@
|
||||
import XCTest
|
||||
|
||||
/// Residence READ / navigation / list / detail behaviour.
|
||||
///
|
||||
/// Merged from three legacy suites:
|
||||
/// - ResidenceIntegrationTests (CRUD round-trips against the real backend)
|
||||
/// - Suite3_ResidenceRebuildTests (rebuilt navigation/list/detail coverage —
|
||||
/// manual login scaffolding removed; the base now provides a logged-in session)
|
||||
/// - Suite4_ComprehensiveResidenceTests (the view/navigation/refresh/persistence tests)
|
||||
///
|
||||
/// Per-test isolation: `AuthenticatedUITestCase` mints a fresh, pre-verified
|
||||
/// account, logs in, and deletes it in teardown. A fresh account starts EMPTY,
|
||||
/// so tests that need to SEE a pre-existing residence seed it in
|
||||
/// `seedAccountPreconditions` (before login) and reference `seededResidence`.
|
||||
final class ResidenceUITests: AuthenticatedUITestCase {
|
||||
|
||||
// MARK: - Page Objects
|
||||
|
||||
private var residenceList: ResidenceListScreen { ResidenceListScreen(app: app) }
|
||||
private var residenceForm: ResidenceFormScreen { ResidenceFormScreen(app: app) }
|
||||
|
||||
// MARK: - Helpers
|
||||
|
||||
private func findResidence(name: String) -> XCUIElement {
|
||||
app.staticTexts.containing(NSPredicate(format: "label CONTAINS %@", name)).firstMatch
|
||||
}
|
||||
|
||||
// Suite3's createResidence helper, stripped of the manual login (the base
|
||||
// now lands us on the main app already authenticated).
|
||||
@discardableResult
|
||||
private func createResidenceViaUI(name: String) -> String {
|
||||
navigateToResidences()
|
||||
|
||||
let list = ResidenceListScreen(app: app)
|
||||
list.waitForLoad(timeout: defaultTimeout)
|
||||
list.openCreateResidence()
|
||||
|
||||
let form = ResidenceFormScreen(app: app)
|
||||
form.waitForLoad(timeout: defaultTimeout)
|
||||
form.enterName(name)
|
||||
form.save()
|
||||
return name
|
||||
}
|
||||
|
||||
// MARK: - Create (round-trip) — from ResidenceIntegrationTests
|
||||
|
||||
func testRES_CreateResidenceAppearsInList() {
|
||||
navigateToResidences()
|
||||
|
||||
let list = ResidenceListScreen(app: app)
|
||||
list.waitForLoad(timeout: defaultTimeout)
|
||||
|
||||
list.openCreateResidence()
|
||||
|
||||
let form = ResidenceFormScreen(app: app)
|
||||
form.waitForLoad(timeout: defaultTimeout)
|
||||
|
||||
let uniqueName = "IntTest Residence \(Int(Date().timeIntervalSince1970))"
|
||||
form.enterName(uniqueName)
|
||||
form.save()
|
||||
|
||||
let newResidence = app.staticTexts[uniqueName]
|
||||
XCTAssertTrue(
|
||||
newResidence.waitForExistence(timeout: loginTimeout),
|
||||
"Newly created residence should appear in the list"
|
||||
)
|
||||
}
|
||||
|
||||
// MARK: - Edit (round-trip) — from ResidenceIntegrationTests
|
||||
|
||||
func testRES_EditResidenceUpdatesInList() {
|
||||
// Seed a residence via API so we have a known target to edit, then
|
||||
// pull-to-refresh so the fresh account's empty list picks it up.
|
||||
let seeded = cleaner.seedResidence(name: "Edit Target \(Int(Date().timeIntervalSince1970))")
|
||||
|
||||
navigateToResidences()
|
||||
pullToRefresh()
|
||||
|
||||
let list = ResidenceListScreen(app: app)
|
||||
list.waitForLoad(timeout: defaultTimeout)
|
||||
|
||||
// Find and tap the seeded residence
|
||||
let card = app.staticTexts[seeded.name]
|
||||
pullToRefreshUntilVisible(card, maxRetries: 3)
|
||||
card.waitForExistenceOrFail(timeout: loginTimeout)
|
||||
card.forceTap()
|
||||
|
||||
// Tap edit button on detail view
|
||||
let editButton = app.buttons[AccessibilityIdentifiers.Residence.editButton]
|
||||
editButton.waitForExistenceOrFail(timeout: defaultTimeout)
|
||||
editButton.forceTap()
|
||||
|
||||
let form = ResidenceFormScreen(app: app)
|
||||
form.waitForLoad(timeout: defaultTimeout)
|
||||
|
||||
// Clear and re-enter name
|
||||
let nameField = form.nameField
|
||||
nameField.waitUntilHittable(timeout: 10).tap()
|
||||
nameField.press(forDuration: 1.0)
|
||||
let selectAll = app.menuItems["Select All"]
|
||||
if selectAll.waitForExistence(timeout: 2) {
|
||||
selectAll.tap()
|
||||
}
|
||||
|
||||
let updatedName = "Updated Res \(Int(Date().timeIntervalSince1970))"
|
||||
nameField.typeText(updatedName)
|
||||
form.save()
|
||||
|
||||
let updatedText = app.staticTexts[updatedName]
|
||||
XCTAssertTrue(
|
||||
updatedText.waitForExistence(timeout: loginTimeout),
|
||||
"Updated residence name should appear after edit"
|
||||
)
|
||||
}
|
||||
|
||||
// MARK: - Set Primary (RES-007) — from ResidenceIntegrationTests
|
||||
|
||||
func test18_setPrimaryResidence() {
|
||||
// Seed two residences via API; the second one will be promoted to primary
|
||||
let firstResidence = cleaner.seedResidence(name: "Primary Test A \(Int(Date().timeIntervalSince1970))")
|
||||
let secondResidence = cleaner.seedResidence(name: "Primary Test B \(Int(Date().timeIntervalSince1970))")
|
||||
|
||||
navigateToResidences()
|
||||
pullToRefresh()
|
||||
|
||||
let list = ResidenceListScreen(app: app)
|
||||
list.waitForLoad(timeout: defaultTimeout)
|
||||
|
||||
// Open the second residence's detail
|
||||
let secondCard = app.staticTexts[secondResidence.name]
|
||||
pullToRefreshUntilVisible(secondCard, maxRetries: 3)
|
||||
secondCard.waitForExistenceOrFail(timeout: loginTimeout)
|
||||
secondCard.forceTap()
|
||||
|
||||
// Tap edit
|
||||
let editButton = app.buttons[AccessibilityIdentifiers.Residence.editButton]
|
||||
editButton.waitForExistenceOrFail(timeout: defaultTimeout)
|
||||
editButton.forceTap()
|
||||
|
||||
let form = ResidenceFormScreen(app: app)
|
||||
form.waitForLoad(timeout: defaultTimeout)
|
||||
|
||||
// Find and toggle the "is primary" toggle
|
||||
let isPrimaryToggle = app.switches[AccessibilityIdentifiers.Residence.isPrimaryToggle]
|
||||
isPrimaryToggle.scrollIntoView(in: app.scrollViews.firstMatch)
|
||||
isPrimaryToggle.waitForExistenceOrFail(timeout: defaultTimeout)
|
||||
|
||||
// Toggle it on (value "0" means off, "1" means on)
|
||||
if (isPrimaryToggle.value as? String) == "0" {
|
||||
isPrimaryToggle.forceTap()
|
||||
}
|
||||
|
||||
form.save()
|
||||
|
||||
// After saving, a primary indicator should be visible — either a label,
|
||||
// badge, or the toggle being on in the refreshed detail view.
|
||||
let primaryIndicator = app.staticTexts.containing(
|
||||
NSPredicate(format: "label CONTAINS[c] 'Primary'")
|
||||
).firstMatch
|
||||
|
||||
let primaryBadge = app.images.containing(
|
||||
NSPredicate(format: "label CONTAINS[c] 'Primary'")
|
||||
).firstMatch
|
||||
|
||||
let indicatorVisible = primaryIndicator.waitForExistence(timeout: loginTimeout)
|
||||
|| primaryBadge.waitForExistence(timeout: 3)
|
||||
|
||||
XCTAssertTrue(
|
||||
indicatorVisible,
|
||||
"A primary residence indicator should appear after setting '\(secondResidence.name)' as primary"
|
||||
)
|
||||
|
||||
// Clean up: remove unused firstResidence id from tracking (already tracked via cleaner)
|
||||
_ = firstResidence
|
||||
}
|
||||
|
||||
// MARK: - Double Submit Protection (OFF-004) — from ResidenceIntegrationTests
|
||||
|
||||
func test19_doubleSubmitProtection() {
|
||||
navigateToResidences()
|
||||
|
||||
let list = ResidenceListScreen(app: app)
|
||||
list.waitForLoad(timeout: defaultTimeout)
|
||||
|
||||
list.openCreateResidence()
|
||||
|
||||
let form = ResidenceFormScreen(app: app)
|
||||
form.waitForLoad(timeout: defaultTimeout)
|
||||
|
||||
let uniqueName = "DoubleSubmit \(Int(Date().timeIntervalSince1970))"
|
||||
form.enterName(uniqueName)
|
||||
|
||||
// Rapidly tap save twice to test double-submit protection
|
||||
let saveButton = app.buttons[AccessibilityIdentifiers.Residence.saveButton]
|
||||
saveButton.scrollIntoView(in: app.scrollViews.firstMatch)
|
||||
saveButton.forceTap()
|
||||
// Second tap immediately after — if the button is already disabled this will be a no-op
|
||||
if saveButton.isHittable {
|
||||
saveButton.forceTap()
|
||||
}
|
||||
|
||||
// Wait for the form to dismiss (sheet closes, we return to the list)
|
||||
let formDismissed = saveButton.waitForNonExistence(timeout: loginTimeout)
|
||||
XCTAssertTrue(formDismissed, "Form should dismiss after save")
|
||||
|
||||
// Back on the residences list — count how many cells with the unique name exist
|
||||
let matchingTexts = app.staticTexts.matching(
|
||||
NSPredicate(format: "label == %@", uniqueName)
|
||||
)
|
||||
|
||||
// Allow time for the list to fully load
|
||||
_ = app.staticTexts[uniqueName].waitForExistence(timeout: defaultTimeout)
|
||||
|
||||
XCTAssertEqual(
|
||||
matchingTexts.count, 1,
|
||||
"Only one residence named '\(uniqueName)' should exist — double-submit protection should prevent duplicates"
|
||||
)
|
||||
|
||||
// Track the created residence for cleanup
|
||||
if let residences = TestAccountAPIClient.listResidences(token: session.token) {
|
||||
if let created = residences.first(where: { $0.name == uniqueName }) {
|
||||
cleaner.trackResidence(created.id)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Delete (round-trip) — from ResidenceIntegrationTests
|
||||
|
||||
func testRES_DeleteResidenceRemovesFromList() {
|
||||
// Seed a residence via API — don't track it since we'll delete through the UI
|
||||
let deleteName = "Delete Me \(Int(Date().timeIntervalSince1970))"
|
||||
TestDataSeeder.createResidence(token: session.token, name: deleteName)
|
||||
|
||||
navigateToResidences()
|
||||
pullToRefresh()
|
||||
|
||||
let list = ResidenceListScreen(app: app)
|
||||
list.waitForLoad(timeout: defaultTimeout)
|
||||
|
||||
// Find and tap the seeded residence
|
||||
let target = app.staticTexts[deleteName]
|
||||
pullToRefreshUntilVisible(target, maxRetries: 3)
|
||||
target.waitForExistenceOrFail(timeout: loginTimeout)
|
||||
target.forceTap()
|
||||
|
||||
// Tap delete button
|
||||
let deleteButton = app.buttons[AccessibilityIdentifiers.Residence.deleteButton]
|
||||
deleteButton.waitForExistenceOrFail(timeout: defaultTimeout)
|
||||
deleteButton.forceTap()
|
||||
|
||||
// Confirm deletion in alert
|
||||
let confirmButton = app.buttons[AccessibilityIdentifiers.Alert.confirmButton]
|
||||
let alertDelete = app.alerts.buttons.containing(
|
||||
NSPredicate(format: "label CONTAINS[c] 'Delete' OR label CONTAINS[c] 'Confirm'")
|
||||
).firstMatch
|
||||
|
||||
if confirmButton.waitForExistence(timeout: defaultTimeout) {
|
||||
confirmButton.tap()
|
||||
} else if alertDelete.waitForExistence(timeout: defaultTimeout) {
|
||||
alertDelete.tap()
|
||||
}
|
||||
|
||||
let deletedResidence = app.staticTexts[deleteName]
|
||||
XCTAssertTrue(
|
||||
deletedResidence.waitForNonExistence(timeout: loginTimeout),
|
||||
"Deleted residence should no longer appear in the list"
|
||||
)
|
||||
}
|
||||
|
||||
// MARK: - Rebuilt navigation / list / detail — from Suite3
|
||||
//
|
||||
// The original Suite3 ran on BaseUITestCase and logged in manually inside
|
||||
// each test (a `loginAndOpenResidences` helper plus a verification-gate
|
||||
// loop). The base class now provides a logged-in session, so that
|
||||
// scaffolding is removed and only the residence assertions remain.
|
||||
|
||||
func testR301_authenticatedPreconditionCanReachMainApp() throws {
|
||||
navigateToResidences()
|
||||
RebuildSessionAssertions.assertOnMainApp(app, timeout: defaultTimeout)
|
||||
}
|
||||
|
||||
func testR302_residencesTabIsPresentAndNavigable() throws {
|
||||
navigateToResidences()
|
||||
let residencesTab = app.tabBars.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Residences'")).firstMatch
|
||||
XCTAssertTrue(residencesTab.exists, "Residences tab should exist")
|
||||
}
|
||||
|
||||
func testR303_residencesListLoadsAfterTabSelection() throws {
|
||||
navigateToResidences()
|
||||
let list = ResidenceListScreen(app: app)
|
||||
list.waitForLoad(timeout: defaultTimeout)
|
||||
XCTAssertTrue(list.addButton.exists, "Add residence button should be visible")
|
||||
}
|
||||
|
||||
func testR304_openAddResidenceFormFromResidencesList() throws {
|
||||
navigateToResidences()
|
||||
let list = ResidenceListScreen(app: app)
|
||||
list.waitForLoad(timeout: defaultTimeout)
|
||||
list.openCreateResidence()
|
||||
|
||||
let form = ResidenceFormScreen(app: app)
|
||||
form.waitForLoad(timeout: defaultTimeout)
|
||||
XCTAssertTrue(form.saveButton.exists, "Residence save button should exist")
|
||||
}
|
||||
|
||||
func testR305_cancelAddResidenceReturnsToResidenceList() throws {
|
||||
navigateToResidences()
|
||||
let list = ResidenceListScreen(app: app)
|
||||
list.waitForLoad(timeout: defaultTimeout)
|
||||
list.openCreateResidence()
|
||||
|
||||
let form = ResidenceFormScreen(app: app)
|
||||
form.waitForLoad(timeout: defaultTimeout)
|
||||
form.cancel()
|
||||
|
||||
list.waitForLoad(timeout: defaultTimeout)
|
||||
}
|
||||
|
||||
func testR306_createResidenceMinimalDataSubmitsSuccessfully() throws {
|
||||
let name = "UITest Home \(Int(Date().timeIntervalSince1970))"
|
||||
_ = createResidenceViaUI(name: name)
|
||||
let created = app.staticTexts.containing(NSPredicate(format: "label CONTAINS[c] %@", name)).firstMatch
|
||||
XCTAssertTrue(created.waitForExistence(timeout: loginTimeout), "Created residence should appear in list")
|
||||
}
|
||||
|
||||
func testR307_newResidenceAppearsInResidenceList() throws {
|
||||
let name = "UITest Verify \(Int(Date().timeIntervalSince1970))"
|
||||
_ = createResidenceViaUI(name: name)
|
||||
let created = app.staticTexts.containing(NSPredicate(format: "label CONTAINS[c] %@", name)).firstMatch
|
||||
XCTAssertTrue(created.waitForExistence(timeout: loginTimeout), "New residence should be visible in residences list")
|
||||
}
|
||||
|
||||
func testR308_openResidenceDetailsFromResidenceList() throws {
|
||||
let name = "UITest Detail \(Int(Date().timeIntervalSince1970))"
|
||||
_ = createResidenceViaUI(name: name)
|
||||
|
||||
let row = app.staticTexts.containing(NSPredicate(format: "label CONTAINS[c] %@", name)).firstMatch
|
||||
row.waitForExistenceOrFail(timeout: loginTimeout).forceTap()
|
||||
|
||||
let edit = app.buttons[AccessibilityIdentifiers.Residence.editButton]
|
||||
let delete = app.buttons[AccessibilityIdentifiers.Residence.deleteButton]
|
||||
let loaded = edit.waitForExistence(timeout: defaultTimeout) || delete.waitForExistence(timeout: defaultTimeout)
|
||||
XCTAssertTrue(loaded, "Residence details should expose edit or delete actions")
|
||||
}
|
||||
|
||||
func testR309_navigationAcrossPrimaryTabsAndBackToResidences() throws {
|
||||
navigateToResidences()
|
||||
|
||||
let tabBar = app.tabBars.firstMatch
|
||||
tabBar.waitForExistenceOrFail(timeout: defaultTimeout)
|
||||
|
||||
let tasksTab = tabBar.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Tasks'")).firstMatch
|
||||
XCTAssertTrue(tasksTab.exists, "Tasks tab should exist")
|
||||
tasksTab.forceTap()
|
||||
|
||||
let contractorsTab = tabBar.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Contractors'")).firstMatch
|
||||
XCTAssertTrue(contractorsTab.exists, "Contractors tab should exist")
|
||||
contractorsTab.forceTap()
|
||||
|
||||
let residencesTab = tabBar.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Residences'")).firstMatch
|
||||
residencesTab.forceTap()
|
||||
|
||||
let list = ResidenceListScreen(app: app)
|
||||
list.waitForLoad(timeout: defaultTimeout)
|
||||
}
|
||||
|
||||
// MARK: - View / navigation / refresh / persistence — from Suite4
|
||||
|
||||
func test13_viewResidenceDetails() {
|
||||
let timestamp = Int(Date().timeIntervalSince1970)
|
||||
let residenceName = "Detail View Test \(timestamp)"
|
||||
|
||||
// Create residence through the UI, then open its detail
|
||||
_ = createResidenceViaUI(name: residenceName)
|
||||
|
||||
navigateToResidences()
|
||||
|
||||
let residence = findResidence(name: residenceName)
|
||||
XCTAssertTrue(residence.waitForExistence(timeout: defaultTimeout), "Residence should exist")
|
||||
residence.tap()
|
||||
|
||||
// Verify detail view appears with edit button or tasks section
|
||||
let editButton = app.buttons[AccessibilityIdentifiers.Residence.editButton].firstMatch
|
||||
let tasksSection = app.staticTexts.containing(NSPredicate(format: "label CONTAINS[c] 'Tasks' OR label CONTAINS[c] 'Maintenance'")).firstMatch
|
||||
|
||||
_ = editButton.waitForExistence(timeout: defaultTimeout)
|
||||
XCTAssertTrue(editButton.exists || tasksSection.exists, "Detail view should show with edit button or tasks section")
|
||||
}
|
||||
|
||||
func test14_navigateFromResidencesToOtherTabs() {
|
||||
// From Residences tab
|
||||
navigateToResidences()
|
||||
|
||||
// Navigate to Tasks
|
||||
let tasksTab = app.tabBars.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Tasks'")).firstMatch
|
||||
XCTAssertTrue(tasksTab.exists, "Tasks tab should exist")
|
||||
tasksTab.tap()
|
||||
_ = tasksTab.waitForExistence(timeout: defaultTimeout)
|
||||
XCTAssertTrue(tasksTab.isSelected, "Should be on Tasks tab")
|
||||
|
||||
// Navigate back to Residences
|
||||
let residencesTab = app.tabBars.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Residences'")).firstMatch
|
||||
residencesTab.tap()
|
||||
_ = residencesTab.waitForExistence(timeout: defaultTimeout)
|
||||
XCTAssertTrue(residencesTab.isSelected, "Should be back on Residences tab")
|
||||
|
||||
// Navigate to Contractors
|
||||
let contractorsTab = app.tabBars.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Contractors'")).firstMatch
|
||||
XCTAssertTrue(contractorsTab.exists, "Contractors tab should exist")
|
||||
contractorsTab.tap()
|
||||
_ = contractorsTab.waitForExistence(timeout: defaultTimeout)
|
||||
XCTAssertTrue(contractorsTab.isSelected, "Should be on Contractors tab")
|
||||
|
||||
// Back to Residences
|
||||
residencesTab.tap()
|
||||
_ = residencesTab.waitForExistence(timeout: defaultTimeout)
|
||||
XCTAssertTrue(residencesTab.isSelected, "Should be back on Residences tab again")
|
||||
}
|
||||
|
||||
func test15_refreshResidencesList() {
|
||||
navigateToResidences()
|
||||
|
||||
// Pull to refresh (if implemented) or use refresh button
|
||||
let refreshButton = app.navigationBars.buttons.containing(NSPredicate(format: "label CONTAINS 'arrow.clockwise' OR label CONTAINS 'refresh'")).firstMatch
|
||||
if refreshButton.waitForExistence(timeout: defaultTimeout) {
|
||||
refreshButton.tap()
|
||||
_ = app.activityIndicators.firstMatch.waitForNonExistence(timeout: defaultTimeout)
|
||||
}
|
||||
|
||||
// Verify we're still on residences tab
|
||||
let residencesTab = app.tabBars.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Residences'")).firstMatch
|
||||
XCTAssertTrue(residencesTab.isSelected, "Should still be on Residences tab after refresh")
|
||||
}
|
||||
|
||||
func test16_residencePersistsAfterBackgroundingApp() {
|
||||
let timestamp = Int(Date().timeIntervalSince1970)
|
||||
let residenceName = "Persistence Test \(timestamp)"
|
||||
|
||||
// Create residence through the UI
|
||||
_ = createResidenceViaUI(name: residenceName)
|
||||
|
||||
navigateToResidences()
|
||||
|
||||
// Verify residence exists
|
||||
var residence = findResidence(name: residenceName)
|
||||
XCTAssertTrue(residence.waitForExistence(timeout: defaultTimeout), "Residence should exist before backgrounding")
|
||||
|
||||
// Background and reactivate app
|
||||
XCUIDevice.shared.press(.home)
|
||||
_ = app.wait(for: .runningForeground, timeout: 10)
|
||||
|
||||
// Navigate back to residences
|
||||
navigateToResidences()
|
||||
|
||||
// Verify residence still exists
|
||||
residence = findResidence(name: residenceName)
|
||||
XCTAssertTrue(residence.waitForExistence(timeout: defaultTimeout), "Residence should persist after backgrounding app")
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user