Address Project Navigator UI test review feedback

Author: jkaunert

CodeEdit/AppDelegate.swift

@@ -80,8 +80,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
         let url = baseURL.appending(path: id)
 
         do {
-            if FileManager.default.fileExists(atPath: baseURL.path(percentEncoded: false)) {
-                try FileManager.default.removeItem(at: baseURL)
+            if FileManager.default.fileExists(atPath: url.path(percentEncoded: false)) {
+                try FileManager.default.removeItem(at: url)
             }
             try FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
         } catch {

CodeEditUITests/ProjectPath.swift

@@ -41,7 +41,28 @@ func appWritableTempProjectID() -> String {
 }
 
 func cleanUpTempProjectPaths() throws {
+    let fileManager = FileManager.default
     let baseDir = FileManager.default.temporaryDirectory.appending(path: "CodeEditUITests")
-    try FileManager.default.removeItem(at: baseDir)
-    tempProjectPathIds.removeAll()
+    var cleanupError: Error?
+    var remainingIDs = Set<String>()
+
+    for id in tempProjectPathIds {
+        let path = baseDir.appending(path: id)
+        guard fileManager.fileExists(atPath: path.path(percentEncoded: false)) else {
+            continue
+        }
+
+        do {
+            try fileManager.removeItem(at: path)
+        } catch {
+            cleanupError = cleanupError ?? error
+            remainingIDs.insert(id)
+        }
+    }
+
+    tempProjectPathIds = remainingIDs
+
+    if let cleanupError {
+        throw cleanupError
+    }
 }

CodeEditUITests/Query.swift

@@ -57,14 +57,6 @@ enum Query {
         }
 
         static func getAddButton(_ window: XCUIElement) -> XCUIElement {
-            if window.buttons["addButton"].exists {
-                return window.buttons["addButton"]
-            }
-
-            if window.popUpButtons["addButton"].exists {
-                return window.popUpButtons["addButton"]
-            }
-
             return window.descendants(matching: .any).matching(identifier: "addButton").firstMatch
         }