refactor(wizard): show all steps at once with validation gating

- Replace progressive reveal with single fade-in of all steps
- Add canPlanTrip validation requiring all fields before planning
- Disable Plan Trip button until all selections are made
- Simplify ViewModel by removing step-by-step visibility logic
- Update tests for new validation-based approach

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Trey t
2026-01-12 21:19:35 -06:00
parent 94bb68d431
commit ed526cabeb
4 changed files with 102 additions and 273 deletions

View File

@@ -8,122 +8,90 @@ import XCTest
final class TripWizardViewModelTests: XCTestCase {
func test_initialState_onlyPlanningModeStepVisible() {
// MARK: - Visibility Tests
func test_initialState_stepsNotVisible() {
let viewModel = TripWizardViewModel()
XCTAssertTrue(viewModel.isPlanningModeStepVisible)
XCTAssertFalse(viewModel.isSportsStepVisible)
XCTAssertFalse(viewModel.isDatesStepVisible)
XCTAssertFalse(viewModel.isRegionsStepVisible)
XCTAssertFalse(viewModel.areStepsVisible)
}
func test_selectingPlanningMode_revealsSportsStep() {
func test_selectingPlanningMode_revealsAllSteps() {
let viewModel = TripWizardViewModel()
viewModel.planningMode = .dateRange
XCTAssertTrue(viewModel.isSportsStepVisible)
XCTAssertTrue(viewModel.areStepsVisible)
}
func test_selectingSport_revealsDatesStep() {
let viewModel = TripWizardViewModel()
viewModel.planningMode = .dateRange
// MARK: - canPlanTrip Validation Tests
func test_canPlanTrip_initiallyFalse() {
let viewModel = TripWizardViewModel()
XCTAssertFalse(viewModel.canPlanTrip)
}
func test_canPlanTrip_requiresAllFields() {
let viewModel = TripWizardViewModel()
// None set
XCTAssertFalse(viewModel.canPlanTrip)
// Only planning mode
viewModel.planningMode = .dateRange
XCTAssertFalse(viewModel.canPlanTrip)
// Add dates
viewModel.hasSetDates = true
XCTAssertFalse(viewModel.canPlanTrip)
// Add sports
viewModel.selectedSports = [.mlb]
XCTAssertFalse(viewModel.canPlanTrip)
XCTAssertTrue(viewModel.isDatesStepVisible)
// Add regions
viewModel.selectedRegions = [.east]
XCTAssertFalse(viewModel.canPlanTrip)
// Add route preference
viewModel.hasSetRoutePreference = true
XCTAssertFalse(viewModel.canPlanTrip)
// Add repeat cities - now all required fields are set
viewModel.hasSetRepeatCities = true
XCTAssertTrue(viewModel.canPlanTrip)
}
func test_changingPlanningMode_resetsDownstreamSelections() {
func test_canPlanTrip_trueWhenAllFieldsSet() {
let viewModel = TripWizardViewModel()
viewModel.planningMode = .dateRange
viewModel.hasSetDates = true
viewModel.selectedSports = [.mlb, .nba]
viewModel.hasSetDates = true
viewModel.planningMode = .gameFirst
XCTAssertTrue(viewModel.selectedSports.isEmpty)
XCTAssertFalse(viewModel.hasSetDates)
}
// MARK: - Full Flow Integration Tests
func test_fullWizardFlow_reachesReviewStep() {
let viewModel = TripWizardViewModel()
// Step 1: Select planning mode
viewModel.planningMode = .dateRange
XCTAssertTrue(viewModel.isSportsStepVisible)
// Step 2: Select sport
viewModel.selectedSports = [.mlb]
XCTAssertTrue(viewModel.isDatesStepVisible)
// Step 3: Set dates
viewModel.hasSetDates = true
XCTAssertTrue(viewModel.isRegionsStepVisible)
// Step 4: Select regions
viewModel.selectedRegions = [.east]
XCTAssertTrue(viewModel.isRoutePreferenceStepVisible)
// Step 5: Set route preference
viewModel.selectedRegions = [.east, .central]
viewModel.hasSetRoutePreference = true
XCTAssertTrue(viewModel.isRepeatCitiesStepVisible)
// Step 6: Set repeat cities preference
viewModel.hasSetRepeatCities = true
XCTAssertTrue(viewModel.isMustStopsStepVisible)
XCTAssertTrue(viewModel.isReviewStepVisible)
XCTAssertTrue(viewModel.canPlanTrip)
}
func test_regionSelection_revealsRoutePreference() {
func test_canPlanTrip_mustStopsOptional() {
let viewModel = TripWizardViewModel()
viewModel.planningMode = .dateRange
viewModel.hasSetDates = true
viewModel.selectedSports = [.nba]
viewModel.hasSetDates = true
XCTAssertFalse(viewModel.isRoutePreferenceStepVisible)
viewModel.selectedRegions = [.central, .west]
XCTAssertTrue(viewModel.isRoutePreferenceStepVisible)
}
func test_routePreference_revealsRepeatCities() {
let viewModel = TripWizardViewModel()
viewModel.planningMode = .dateRange
viewModel.selectedSports = [.mlb]
viewModel.hasSetDates = true
viewModel.selectedRegions = [.east]
XCTAssertFalse(viewModel.isRepeatCitiesStepVisible)
viewModel.selectedRegions = [.west]
viewModel.hasSetRoutePreference = true
XCTAssertTrue(viewModel.isRepeatCitiesStepVisible)
}
func test_repeatCities_revealsMustStopsAndReview() {
let viewModel = TripWizardViewModel()
viewModel.planningMode = .dateRange
viewModel.selectedSports = [.mlb]
viewModel.hasSetDates = true
viewModel.selectedRegions = [.east]
viewModel.hasSetRoutePreference = true
XCTAssertFalse(viewModel.isMustStopsStepVisible)
XCTAssertFalse(viewModel.isReviewStepVisible)
viewModel.hasSetRepeatCities = true
XCTAssertTrue(viewModel.isMustStopsStepVisible)
XCTAssertTrue(viewModel.isReviewStepVisible)
// canPlanTrip should be true even without must stops
XCTAssertTrue(viewModel.canPlanTrip)
XCTAssertTrue(viewModel.mustStopLocations.isEmpty)
}
// MARK: - Reset Behavior Tests
func test_changingPlanningMode_resetsAllDownstreamState() {
func test_changingPlanningMode_resetsAllSelections() {
let viewModel = TripWizardViewModel()
// Set up full wizard state
@@ -138,7 +106,7 @@ final class TripWizardViewModelTests: XCTestCase {
// Change planning mode
viewModel.planningMode = .locations
// Verify all downstream state is reset
// Verify all state is reset
XCTAssertTrue(viewModel.selectedSports.isEmpty)
XCTAssertFalse(viewModel.hasSetDates)
XCTAssertTrue(viewModel.selectedRegions.isEmpty)
@@ -161,77 +129,6 @@ final class TripWizardViewModelTests: XCTestCase {
XCTAssertTrue(viewModel.hasSetDates)
}
// MARK: - Edge Cases
func test_emptyRegionSelection_hidesRoutePreference() {
let viewModel = TripWizardViewModel()
viewModel.planningMode = .dateRange
viewModel.selectedSports = [.mlb]
viewModel.hasSetDates = true
viewModel.selectedRegions = [.west]
XCTAssertTrue(viewModel.isRoutePreferenceStepVisible)
viewModel.selectedRegions = []
XCTAssertFalse(viewModel.isRoutePreferenceStepVisible)
}
func test_multipleSports_canBeSelected() {
let viewModel = TripWizardViewModel()
viewModel.planningMode = .dateRange
viewModel.selectedSports = [.mlb, .nba, .nhl]
XCTAssertEqual(viewModel.selectedSports.count, 3)
XCTAssertTrue(viewModel.isDatesStepVisible)
}
func test_multipleRegions_canBeSelected() {
let viewModel = TripWizardViewModel()
viewModel.planningMode = .dateRange
viewModel.selectedSports = [.mlb]
viewModel.hasSetDates = true
viewModel.selectedRegions = [.east, .central, .west]
XCTAssertEqual(viewModel.selectedRegions.count, 3)
XCTAssertTrue(viewModel.isRoutePreferenceStepVisible)
}
// MARK: - Reveal State Bitmask Tests
func test_revealState_initialValue() {
let viewModel = TripWizardViewModel()
XCTAssertEqual(viewModel.revealState, 0)
}
func test_revealState_incrementsWithProgress() {
let viewModel = TripWizardViewModel()
viewModel.planningMode = .dateRange
XCTAssertEqual(viewModel.revealState, 1) // Sports visible
viewModel.selectedSports = [.mlb]
XCTAssertEqual(viewModel.revealState, 3) // Sports + Dates
viewModel.hasSetDates = true
XCTAssertEqual(viewModel.revealState, 7) // Sports + Dates + Regions
}
func test_revealState_fullFlow() {
let viewModel = TripWizardViewModel()
viewModel.planningMode = .dateRange
viewModel.selectedSports = [.mlb]
viewModel.hasSetDates = true
viewModel.selectedRegions = [.east]
viewModel.hasSetRoutePreference = true
viewModel.hasSetRepeatCities = true
// 1 + 2 + 4 + 8 + 16 + 32 + 64 = 127
XCTAssertEqual(viewModel.revealState, 127)
}
// MARK: - Sport Availability Tests
func test_canSelectSport_defaultsToTrue() {
@@ -251,6 +148,24 @@ final class TripWizardViewModelTests: XCTestCase {
XCTAssertTrue(viewModel.canSelectSport(.nhl))
}
// MARK: - Multi-Selection Tests
func test_multipleSports_canBeSelected() {
let viewModel = TripWizardViewModel()
viewModel.selectedSports = [.mlb, .nba, .nhl]
XCTAssertEqual(viewModel.selectedSports.count, 3)
}
func test_multipleRegions_canBeSelected() {
let viewModel = TripWizardViewModel()
viewModel.selectedRegions = [.east, .central, .west]
XCTAssertEqual(viewModel.selectedRegions.count, 3)
}
// MARK: - Planning State Tests
func test_isPlanning_defaultsToFalse() {