Fix remaining 12 UI test failures: subscription state, hittability, tab selection
- IAPManager: add resetForTesting() to discard stale cached subscription state - UITestMode: call resetForTesting() after clearing defaults (fixes 5 banner tests) - StabilityTests: use NSPredicate wait for isSelected (iOS 26 Liquid Glass) - SettingsActionTests: use coordinate tap for clear data and analytics toggle - IconPackTests: add horizontal scroll fallback for off-screen icon packs Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -349,6 +349,16 @@ class IAPManager: ObservableObject {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if DEBUG
|
||||||
|
/// Reset subscription state for UI testing. Called after group defaults are cleared
|
||||||
|
/// so that stale cached state from previous test runs is discarded.
|
||||||
|
func resetForTesting() {
|
||||||
|
state = .unknown
|
||||||
|
lastStatusCheckTime = nil
|
||||||
|
updateTrialState()
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
private func updateTrialState() {
|
private func updateTrialState() {
|
||||||
let daysSinceInstall = Calendar.current.dateComponents([.day], from: firstLaunchDate, to: Date()).day ?? 0
|
let daysSinceInstall = Calendar.current.dateComponents([.day], from: firstLaunchDate, to: Date()).day ?? 0
|
||||||
let daysRemaining = trialDays - daysSinceInstall
|
let daysRemaining = trialDays - daysSinceInstall
|
||||||
|
|||||||
@@ -77,6 +77,10 @@ enum UITestMode {
|
|||||||
|
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
IAPManager.shared.bypassSubscription = bypassSubscription
|
IAPManager.shared.bypassSubscription = bypassSubscription
|
||||||
|
// Reset subscription state to discard stale cached state from previous test runs.
|
||||||
|
// IAPManager.shared was already initialized (as @StateObject in FeelsApp) before
|
||||||
|
// configureIfNeeded runs, so it may have restored stale subscription data.
|
||||||
|
IAPManager.shared.resetForTesting()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Seed fixture data if requested
|
// Seed fixture data if requested
|
||||||
|
|||||||
@@ -36,7 +36,11 @@ final class IconPackTests: BaseUITestCase {
|
|||||||
for pack in allIconPacks {
|
for pack in allIconPacks {
|
||||||
let button = app.buttons["customize_iconpack_\(pack)"]
|
let button = app.buttons["customize_iconpack_\(pack)"]
|
||||||
if !button.exists {
|
if !button.exists {
|
||||||
// Scroll more to reveal buttons off-screen
|
// Icon packs may be in a horizontal scroll — try swipe left first
|
||||||
|
app.swipeLeft()
|
||||||
|
}
|
||||||
|
if !button.exists {
|
||||||
|
// If still not found, try scrolling the page down
|
||||||
app.swipeUp()
|
app.swipeUp()
|
||||||
}
|
}
|
||||||
if button.waitForExistence(timeout: 3) {
|
if button.waitForExistence(timeout: 3) {
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ final class SettingsActionTests: BaseUITestCase {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
clearButton.tap()
|
clearButton.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.5)).tap()
|
||||||
|
|
||||||
// Navigate back to Day tab
|
// Navigate back to Day tab
|
||||||
tabBar.tapDay()
|
tabBar.tapDay()
|
||||||
@@ -94,7 +94,7 @@ final class SettingsActionTests: BaseUITestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Tap the toggle
|
// Tap the toggle
|
||||||
analyticsToggle.tap()
|
analyticsToggle.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.5)).tap()
|
||||||
|
|
||||||
captureScreenshot(name: "analytics_toggled")
|
captureScreenshot(name: "analytics_toggled")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ final class StabilityTests: BaseUITestCase {
|
|||||||
let tabBar = TabBarScreen(app: app)
|
let tabBar = TabBarScreen(app: app)
|
||||||
|
|
||||||
// 1. Day tab (default) - verify loaded
|
// 1. Day tab (default) - verify loaded
|
||||||
XCTAssertTrue(tabBar.dayTab.isSelected, "Should start on Day tab")
|
assertTabSelected(tabBar.dayTab, name: "Day (initial)")
|
||||||
captureScreenshot(name: "stability_day")
|
captureScreenshot(name: "stability_day")
|
||||||
|
|
||||||
// 2. Open entry detail
|
// 2. Open entry detail
|
||||||
@@ -34,22 +34,22 @@ final class StabilityTests: BaseUITestCase {
|
|||||||
|
|
||||||
// 3. Month tab
|
// 3. Month tab
|
||||||
tabBar.tapMonth()
|
tabBar.tapMonth()
|
||||||
XCTAssertTrue(tabBar.monthTab.isSelected, "Month tab should be selected")
|
assertTabSelected(tabBar.monthTab, name: "Month")
|
||||||
captureScreenshot(name: "stability_month")
|
captureScreenshot(name: "stability_month")
|
||||||
|
|
||||||
// 4. Year tab
|
// 4. Year tab
|
||||||
tabBar.tapYear()
|
tabBar.tapYear()
|
||||||
XCTAssertTrue(tabBar.yearTab.isSelected, "Year tab should be selected")
|
assertTabSelected(tabBar.yearTab, name: "Year")
|
||||||
captureScreenshot(name: "stability_year")
|
captureScreenshot(name: "stability_year")
|
||||||
|
|
||||||
// 5. Insights tab
|
// 5. Insights tab
|
||||||
tabBar.tapInsights()
|
tabBar.tapInsights()
|
||||||
XCTAssertTrue(tabBar.insightsTab.isSelected, "Insights tab should be selected")
|
assertTabSelected(tabBar.insightsTab, name: "Insights")
|
||||||
captureScreenshot(name: "stability_insights")
|
captureScreenshot(name: "stability_insights")
|
||||||
|
|
||||||
// 6. Settings tab - Customize sub-tab
|
// 6. Settings tab - Customize sub-tab
|
||||||
tabBar.tapSettings()
|
tabBar.tapSettings()
|
||||||
XCTAssertTrue(tabBar.settingsTab.isSelected, "Settings tab should be selected")
|
assertTabSelected(tabBar.settingsTab, name: "Settings")
|
||||||
captureScreenshot(name: "stability_settings_customize")
|
captureScreenshot(name: "stability_settings_customize")
|
||||||
|
|
||||||
// 7. Settings tab - Settings sub-tab
|
// 7. Settings tab - Settings sub-tab
|
||||||
@@ -63,8 +63,16 @@ final class StabilityTests: BaseUITestCase {
|
|||||||
|
|
||||||
// 9. Back to Day
|
// 9. Back to Day
|
||||||
tabBar.tapDay()
|
tabBar.tapDay()
|
||||||
XCTAssertTrue(tabBar.dayTab.isSelected, "Day tab should be selected")
|
assertTabSelected(tabBar.dayTab, name: "Day")
|
||||||
|
|
||||||
captureScreenshot(name: "stability_full_navigation_complete")
|
captureScreenshot(name: "stability_full_navigation_complete")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Wait for a tab to become selected (iOS 26 Liquid Glass may delay state updates).
|
||||||
|
private func assertTabSelected(_ tab: XCUIElement, name: String, timeout: TimeInterval = 3) {
|
||||||
|
let predicate = NSPredicate(format: "isSelected == true")
|
||||||
|
let expectation = XCTNSPredicateExpectation(predicate: predicate, object: tab)
|
||||||
|
let result = XCTWaiter.wait(for: [expectation], timeout: timeout)
|
||||||
|
XCTAssertEqual(result, .completed, "\(name) tab should be selected")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user