Better Waiting

Author: thecoolwinter

CodeEdit.xcodeproj/project.pbxproj

@@ -3041,12 +3041,12 @@
 		6C96191F2C3F27E3009733CE /* CodeEditUITests */ = {
 			isa = PBXGroup;
 			children = (
-				6C510CB62D2E462D006EBE85 /* Extensions */,
 				6CFBA54A2C4E168A00E3A914 /* App.swift */,
-				6C9619232C3F2809009733CE /* ProjectPath.swift */,
-				6C9619212C3F27F1009733CE /* Query.swift */,
+				6C510CB62D2E462D006EBE85 /* Extensions */,
 				6C96191E2C3F27E3009733CE /* Features */,
 				6CFBA54E2C4E182100E3A914 /* Other Tests */,
+				6C9619232C3F2809009733CE /* ProjectPath.swift */,
+				6C9619212C3F27F1009733CE /* Query.swift */,
 			);
 			path = CodeEditUITests;
 			sourceTree = "<group>";

CodeEditUITests/Extensions/XCUITest+waitForNonExistence.swift

@@ -13,14 +13,13 @@ extension XCUIElement {
     /// Waits the specified amount of time for the element’s `exists` property to become `false`.
     /// - Parameter timeout: The amount of time to wait.
     /// - Returns: `false` if the timeout expires without the element coming out of existence.
-    ///
     func waitForNonExistence(timeout: TimeInterval) -> Bool {
-        let timeStart = Date().timeIntervalSince1970
-
-        while Date().timeIntervalSince1970 <= (timeStart + timeout) {
-            if !exists { return true }
+        let predicate = NSPredicate(format: "exists == false")
+        switch XCTWaiter.wait(for: [XCTNSPredicateExpectation(predicate: predicate, object: self)], timeout: timeout) {
+        case .completed:
+            return true
+        default:
+            return false
         }
-
-        return false
     }
 }

CodeEditUITests/Features/ActivityViewer/Tasks/TasksMenuUITests.swift

@@ -45,22 +45,22 @@ final class ActivityViewerTasksMenuTests: XCTestCase {
         let taskDropdown = viewer.buttons["Active Task"]
         taskDropdown.click()
         let popover = app.popovers.firstMatch
-        XCTAssertTrue(popover.waitForExistence(timeout: 2.0), "Popover did not appear on click")
+        XCTAssertTrue(popover.exists, "Popover did not appear on click")
 
         let addTaskListOption = popover.buttons["Add Task..."]
         XCTAssertTrue(addTaskListOption.exists, "No add task option in dropdown")
         addTaskListOption.click()
 
         let workspaceSettingsWindow = window.sheets["Workspace Settings"]
-        XCTAssertTrue(workspaceSettingsWindow.waitForExistence(timeout: 2.0), "Workspace settings did not appear")
+        XCTAssertTrue(workspaceSettingsWindow.waitForExistence(timeout: 1.0), "Workspace settings did not appear")
 
         let addTaskButton = workspaceSettingsWindow.buttons["Add Task..."]
         XCTAssertTrue(addTaskButton.exists, "No add task button")
         addTaskButton.click()
 
         // Enter in task information
         let newSheet = workspaceSettingsWindow.sheets.firstMatch
-        XCTAssertTrue(newSheet.waitForExistence(timeout: 2.0), "New task sheet did not appear")
+        XCTAssertTrue(newSheet.waitForExistence(timeout: 1.0), "New task sheet did not appear")
         let taskName = newSheet.textFields["Task Name"]
         XCTAssertTrue(taskName.exists)
         taskName.click()
@@ -79,7 +79,7 @@ final class ActivityViewerTasksMenuTests: XCTestCase {
 
         workspaceSettingsWindow.buttons["Done"].click()
         XCTAssertFalse(
-            workspaceSettingsWindow.waitForNonExistence(timeout: 2.0),
+            workspaceSettingsWindow.waitForNonExistence(timeout: 1.0),
             "Workspace Settings should have dismissed"
         )