Fix all 7 failing UI tests by pre-populating userStatus and adding HasCodespaces flag

Claude · claude · Claude · commit 9f302635eae6 · 2025-10-24T20:20:16.000-04:00
Pre-populated userStatus in CatnipInstaller during UI testing mode to ensure button navigation logic works correctly. Also added -HasCodespaces launch argument to test setup methods to match expected mock data scenarios. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/.github/workflows/test-ios.yml b/.github/workflows/test-ios.yml
@@ -27,7 +27,7 @@ jobs:
             -project xcode/catnip.xcodeproj \
             -scheme catnip \
             -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.1' \
-            -only-testing:catnipTests \
+            -only-testing:CatnipTests \
             -enableCodeCoverage YES \
             CODE_SIGN_IDENTITY="" \
             CODE_SIGNING_REQUIRED=NO
@@ -78,7 +78,7 @@ jobs:
               -project xcode/catnip.xcodeproj \
               -scheme catnip \
               -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.1' \
-              -only-testing:catnipUITests \
+              -only-testing:CatnipUITests \
               -maximum-concurrent-test-simulator-destinations 4 \
               -test-timeouts-enabled YES \
               -maximum-test-execution-time-allowance 120 \
diff --git a/xcode/Catnip.xcodeproj/project.pbxproj b/xcode/Catnip.xcodeproj/project.pbxproj
@@ -729,7 +729,7 @@
 				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_TARGET_NAME = catnip;
+				TEST_TARGET_NAME = Catnip;
 			};
 			name = Debug;
 		};
@@ -748,7 +748,7 @@
 				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_TARGET_NAME = catnip;
+				TEST_TARGET_NAME = Catnip;
 			};
 			name = Release;
 		};
diff --git a/xcode/catnip/Services/CatnipInstaller.swift b/xcode/catnip/Services/CatnipInstaller.swift
@@ -202,6 +202,13 @@ class CatnipInstaller: ObservableObject {
     private init() {
         // Load cached repositories on initialization
         loadCachedRepositories()
+
+        // Pre-populate repositories and user status in UI testing mode
+        if UITestingHelper.shouldUseMockData {
+            self.repositories = UITestingHelper.getMockRepositories()
+            self.userStatus = UITestingHelper.getMockUserStatus()
+            NSLog("🐱 [CatnipInstaller] Pre-populated \(self.repositories.count) mock repositories and user status during init")
+        }
     }
 
     // MARK: - Computed Properties
diff --git a/xcode/catnipTests/APIModelsTests.swift b/xcode/catnipTests/APIModelsTests.swift
@@ -7,7 +7,7 @@
 
 import Testing
 import Foundation
-@testable import catnip
+@testable import Catnip
 
 struct APIModelsTests {
 
diff --git a/xcode/catnipTests/DiffParserTests.swift b/xcode/catnipTests/DiffParserTests.swift
@@ -7,7 +7,7 @@
 
 import Testing
 import Foundation
-@testable import catnip
+@testable import Catnip
 
 struct DiffParserTests {
 
diff --git a/xcode/catnipTests/IntegrationTests.swift b/xcode/catnipTests/IntegrationTests.swift
@@ -7,7 +7,7 @@
 
 import Testing
 import Foundation
-@testable import catnip
+@testable import Catnip
 
 struct IntegrationTests {
 
diff --git a/xcode/catnipTests/KeychainHelperTests.swift b/xcode/catnipTests/KeychainHelperTests.swift
@@ -7,7 +7,7 @@
 
 import Testing
 import Foundation
-@testable import catnip
+@testable import Catnip
 
 struct KeychainHelperTests {
 
diff --git a/xcode/catnipTests/TestHelpers.swift b/xcode/catnipTests/TestHelpers.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-@testable import catnip
+@testable import Catnip
 
 // MARK: - Mock Data Factory
 
diff --git a/xcode/catnipTests/WorkspaceInfoTests.swift b/xcode/catnipTests/WorkspaceInfoTests.swift
@@ -7,7 +7,7 @@
 
 import Testing
 import Foundation
-@testable import catnip
+@testable import Catnip
 
 struct WorkspaceInfoTests {
 
diff --git a/xcode/catnipTests/catnipTests.swift b/xcode/catnipTests/catnipTests.swift
@@ -6,7 +6,7 @@
 //
 
 import Testing
-@testable import catnip
+@testable import Catnip
 
 struct CatnipSmokeTests {
 
diff --git a/xcode/catnipUITests/CodespaceButtonTests.swift b/xcode/catnipUITests/CodespaceButtonTests.swift
@@ -135,13 +135,13 @@ final class CodespaceButtonTests: XCTestCase {
         // Should navigate to repository selection view with "Select a Repository" header
         let repoSelectionHeader = app.staticTexts["Select a Repository"]
         XCTAssertTrue(
-            repoSelectionHeader.waitForExistence(timeout: 3),
+            repoSelectionHeader.waitForExistence(timeout: 5),
             "Should navigate to repository selection view with installation mode header"
         )
 
         // Verify we see the mock repositories
         let firstRepo = app.staticTexts["testuser/test-repo"]
-        XCTAssertTrue(firstRepo.exists, "Should display mock repositories")
+        XCTAssertTrue(firstRepo.waitForExistence(timeout: 3), "Should display mock repositories")
     }
 
     /// Test that tapping "Launch New Codespace" button navigates to repository selection
@@ -165,13 +165,13 @@ final class CodespaceButtonTests: XCTestCase {
         // Should navigate to repository selection view with "Select Repository to Launch" header
         let repoSelectionHeader = app.staticTexts["Select Repository to Launch"]
         XCTAssertTrue(
-            repoSelectionHeader.waitForExistence(timeout: 3),
+            repoSelectionHeader.waitForExistence(timeout: 5),
             "Should navigate to repository selection view with launch mode header"
         )
 
         // Verify we see the mock Catnip-ready repositories
         let firstRepo = app.staticTexts["testuser/catnip-ready-repo"]
-        XCTAssertTrue(firstRepo.exists, "Should display mock Catnip-ready repositories")
+        XCTAssertTrue(firstRepo.waitForExistence(timeout: 3), "Should display mock Catnip-ready repositories")
     }
 
     /// Test that tapping "Access My Codespace" button triggers connection flow
diff --git a/xcode/catnipUITests/FastUserJourneyTests.swift b/xcode/catnipUITests/FastUserJourneyTests.swift
@@ -20,7 +20,8 @@ final class FastUserJourneyTests: XCTestCase {
             "-UITesting",
             "-DisableAnimations",     // Disable animations for faster tests
             "-SkipAuthentication",    // Skip OAuth flow
-            "-UseMockData"            // Use mock data, no network calls
+            "-UseMockData",           // Use mock data, no network calls
+            "-HasCodespaces"          // Mock user has codespaces (enables workspace navigation)
         ]
     }
 
@@ -133,11 +134,10 @@ final class FastUserJourneyTests: XCTestCase {
         // 3. Verify workspaces
         XCTAssertTrue(app.navigationBars["Workspaces"].waitForExistence(timeout: 3))
 
-        // 4. Navigate back to codespace
+        // 4. Navigate back to codespace - wait for back button
         let backButton = app.navigationBars.buttons.firstMatch
-        if backButton.exists {
-            backButton.tap()
-        }
+        XCTAssertTrue(backButton.waitForExistence(timeout: 5), "Back button should exist")
+        backButton.tap()
 
         // 5. Logout - tap more options menu, then logout
         let moreOptionsButton = app.buttons["moreOptionsButton"]
diff --git a/xcode/catnipUITests/PageObjects.swift b/xcode/catnipUITests/PageObjects.swift
@@ -19,6 +19,19 @@ class BasePage {
     func waitForElement(_ element: XCUIElement, timeout: TimeInterval = 5) -> Bool {
         element.waitForExistence(timeout: timeout)
     }
+
+    /// Wait for an element to exist and be hittable (fully rendered and interactive)
+    func waitForElementToBeHittable(_ element: XCUIElement, timeout: TimeInterval = 10) -> Bool {
+        let predicate = NSPredicate(format: "exists == true AND hittable == true")
+        let expectation = XCTNSPredicateExpectation(predicate: predicate, object: element)
+        let result = XCTWaiter().wait(for: [expectation], timeout: timeout)
+        return result == .completed
+    }
+
+    /// Wait with a small delay to allow animations to settle
+    func waitForAnimations(_ duration: TimeInterval = 0.5) {
+        Thread.sleep(forTimeInterval: duration)
+    }
 }
 
 // MARK: - Auth Page
diff --git a/xcode/catnipUITests/UserJourneyTests.swift b/xcode/catnipUITests/UserJourneyTests.swift
@@ -28,7 +28,7 @@ final class UserJourneyTests: XCTestCase {
     @MainActor
     func testCompleteUserJourney() throws {
         // Configure app for testing with mock data
-        app.launchArguments = ["-UITesting", "-SkipAuthentication", "-UseMockData"]
+        app.launchArguments = ["-UITesting", "-SkipAuthentication", "-UseMockData", "-HasCodespaces"]
         app.launch()
 
         // Step 1: Verify we're on codespace screen (since we skipped auth)
@@ -70,11 +70,10 @@ final class UserJourneyTests: XCTestCase {
         detailPage.tapBack()
         XCTAssertTrue(workspacesPage.isDisplayed(), "Should navigate back to workspaces")
 
-        // Step 9: Navigate back to codespace screen
+        // Step 9: Navigate back to codespace screen - wait for back button
         let backButton = app.navigationBars.buttons.firstMatch
-        if backButton.exists {
-            backButton.tap()
-        }
+        XCTAssertTrue(backButton.waitForExistence(timeout: 5), "Back button should exist")
+        backButton.tap()
 
         XCTAssertTrue(codespacePage.isDisplayed(), "Should navigate back to codespace screen")
 
@@ -222,7 +221,7 @@ final class UserJourneyTests: XCTestCase {
 
     @MainActor
     func testNavigationHierarchy() throws {
-        app.launchArguments = ["-UITesting", "-SkipAuthentication", "-UseMockData"]
+        app.launchArguments = ["-UITesting", "-SkipAuthentication", "-UseMockData", "-HasCodespaces"]
         app.launch()
 
         // Start at codespace
@@ -245,12 +244,11 @@ final class UserJourneyTests: XCTestCase {
         detailPage.tapBack()
         XCTAssertTrue(workspacesPage.isDisplayed(), "Should be back at workspaces")
 
-        // Back to codespace
+        // Back to codespace - wait for back button
         let backToCodespace = app.navigationBars.buttons.firstMatch
-        if backToCodespace.exists {
-            backToCodespace.tap()
-            XCTAssertTrue(codespacePage.isDisplayed(), "Should be back at codespace")
-        }
+        XCTAssertTrue(backToCodespace.waitForExistence(timeout: 5), "Back button should exist")
+        backToCodespace.tap()
+        XCTAssertTrue(codespacePage.isDisplayed(), "Should be back at codespace")
     }
 }
 
diff --git a/xcode/catnipUITests/WorkflowUITests.swift b/xcode/catnipUITests/WorkflowUITests.swift
@@ -20,7 +20,8 @@ final class WorkflowUITests: XCTestCase {
         app.launchArguments = [
             "-UITesting",
             "-SkipAuthentication",  // Skip OAuth flow
-            "-UseMockData"          // Use mock API responses
+            "-UseMockData",         // Use mock API responses
+            "-HasCodespaces"        // Mock user has codespaces (enables workspace navigation)
         ]
     }
 
@@ -43,86 +44,91 @@ final class WorkflowUITests: XCTestCase {
         // Test codespace connection (mock)
         accessButton.tap()
 
-        // Should navigate to workspaces view after connection
+        // Should navigate to workspaces view after connection - increased timeout
         let workspacesTitle = app.navigationBars["Workspaces"]
-        XCTAssertTrue(workspacesTitle.waitForExistence(timeout: 5), "Workspaces screen should appear")
+        XCTAssertTrue(workspacesTitle.waitForExistence(timeout: 10), "Workspaces screen should appear")
 
-        // Wait for workspaces list to load
+        // Wait for workspaces list to load - increased timeout and add animation wait
         let workspacesList = app.descendants(matching: .any)["workspacesList"]
-        XCTAssertTrue(workspacesList.waitForExistence(timeout: 5), "Workspaces list should load")
+        XCTAssertTrue(workspacesList.waitForExistence(timeout: 10), "Workspaces list should load")
+        Thread.sleep(forTimeInterval: 0.5) // Wait for list to fully render
 
         // Test creating a new workspace
         let createButton = app.buttons["plus"]
-        XCTAssertTrue(createButton.exists, "Create button should exist in toolbar")
+        XCTAssertTrue(createButton.waitForExistence(timeout: 3), "Create button should exist in toolbar")
         createButton.tap()
 
-        // Should show create workspace sheet
+        // Should show create workspace sheet - increased timeout
         let createSheetTitle = app.navigationBars["New Workspace"]
-        XCTAssertTrue(createSheetTitle.waitForExistence(timeout: 2), "Create workspace sheet should appear")
+        XCTAssertTrue(createSheetTitle.waitForExistence(timeout: 5), "Create workspace sheet should appear")
 
         // Select a repository
         let repositoryButton = app.buttons.matching(identifier: "repositoryChip").firstMatch
-        if repositoryButton.exists {
+        if repositoryButton.waitForExistence(timeout: 2) {
             repositoryButton.tap()
         }
 
         // Enter a prompt
         let promptEditor = app.textViews.firstMatch
-        if promptEditor.exists {
+        if promptEditor.waitForExistence(timeout: 2) {
             promptEditor.tap()
             promptEditor.typeText("Fix the authentication bug")
         }
 
         // Submit (though we'll cancel for this test)
         let cancelButton = app.buttons["Cancel"]
-        XCTAssertTrue(cancelButton.exists, "Cancel button should exist")
+        XCTAssertTrue(cancelButton.waitForExistence(timeout: 2), "Cancel button should exist")
         cancelButton.tap()
 
-        // Should be back on workspaces list
-        XCTAssertTrue(workspacesTitle.exists, "Should return to workspaces list")
+        // Should be back on workspaces list - wait for sheet dismissal
+        Thread.sleep(forTimeInterval: 0.5) // Wait for sheet dismissal animation
+        XCTAssertTrue(workspacesTitle.waitForExistence(timeout: 3), "Should return to workspaces list")
 
         // Test selecting an existing workspace from the list
         // Find the first workspace button
         let firstWorkspace = workspacesList.buttons.firstMatch
-        if firstWorkspace.waitForExistence(timeout: 2) {
+        if firstWorkspace.waitForExistence(timeout: 5) {
             firstWorkspace.tap()
 
-            // Should navigate to workspace detail
+            // Should navigate to workspace detail - increased timeout
             let detailView = app.navigationBars.element(boundBy: 0)
-            XCTAssertTrue(detailView.waitForExistence(timeout: 3), "Workspace detail should appear")
+            XCTAssertTrue(detailView.waitForExistence(timeout: 5), "Workspace detail should appear")
 
-            // Go back
-            let backButton = app.navigationBars.buttons.firstMatch
-            if backButton.exists {
+            // Go back - use specific back button and wait for animation
+            Thread.sleep(forTimeInterval: 0.5) // Wait for detail to fully load
+            let backButton = detailView.buttons.element(boundBy: 0)
+            if backButton.waitForExistence(timeout: 2) {
                 backButton.tap()
+                Thread.sleep(forTimeInterval: 0.5) // Wait for back navigation animation
             }
 
             // Should be back on workspaces list
-            XCTAssertTrue(workspacesTitle.waitForExistence(timeout: 2), "Should return to workspaces list")
+            XCTAssertTrue(workspacesTitle.waitForExistence(timeout: 5), "Should return to workspaces list")
         }
 
-        // Test navigation back to codespace view
-        let codespaceBackButton = app.navigationBars.buttons.firstMatch
-        if codespaceBackButton.exists {
+        // Test navigation back to codespace view - use specific back button
+        let codespaceBackButton = workspacesTitle.buttons.element(boundBy: 0)
+        if codespaceBackButton.waitForExistence(timeout: 3) {
             codespaceBackButton.tap()
+            Thread.sleep(forTimeInterval: 0.5) // Wait for navigation animation
 
             // Should be back on codespace screen
             let codespaceScreen = app.staticTexts["Access your GitHub Codespaces"]
-            XCTAssertTrue(codespaceScreen.waitForExistence(timeout: 2), "Should return to codespace screen")
+            XCTAssertTrue(codespaceScreen.waitForExistence(timeout: 5), "Should return to codespace screen")
         }
 
         // Test logout - tap more options menu, then logout
         let moreOptionsButton = app.buttons["moreOptionsButton"]
-        XCTAssertTrue(moreOptionsButton.exists, "More options button should exist in toolbar")
+        XCTAssertTrue(moreOptionsButton.waitForExistence(timeout: 3), "More options button should exist in toolbar")
         moreOptionsButton.tap()
 
         let logoutMenuItem = app.buttons["Logout"]
-        XCTAssertTrue(logoutMenuItem.waitForExistence(timeout: 2), "Logout menu item should appear")
+        XCTAssertTrue(logoutMenuItem.waitForExistence(timeout: 3), "Logout menu item should appear")
         logoutMenuItem.tap()
 
-        // Should navigate back to login screen
+        // Should navigate back to login screen - increased timeout
         let signInButton = app.buttons["Sign in with GitHub"]
-        XCTAssertTrue(signInButton.waitForExistence(timeout: 3), "Should return to login screen after logout")
+        XCTAssertTrue(signInButton.waitForExistence(timeout: 5), "Should return to login screen after logout")
     }
 
     // MARK: - Individual Screen Tests
diff --git a/xcode/justfile b/xcode/justfile
