Tests/ICCeryUITests/AboutHelpUITests.swift

@@ -46,8 +46,8 @@ final class AboutHelpUITests: XCTestCase {
         _ = waitFor("aboutVersion", timeout: 10)
         XCTAssertTrue(element("aboutBuildDate").exists)
 
-        let close = app.buttons["closeAboutBtn"]
-        XCTAssertTrue(close.exists)
+        let close = app.sheets.firstMatch.buttons["closeAboutBtn"]
+        XCTAssertTrue(close.waitForExistence(timeout: 5))
         close.click()
 
         XCTAssertFalse(element("aboutDialog").exists)

Tests/ICCeryUITests/Milestone3UITests.swift

@@ -210,10 +210,10 @@ final class Milestone3UITests: XCTestCase {
         _ = waitFor("printerStatusBadge")
 
         app.buttons["btnPrintAll"].click()
-        let notice = element("printNotificationText")
+        let predicate = NSPredicate(format: "label CONTAINS[c] %@", "Print failed")
+        let notice = app.staticTexts.containing(predicate).firstMatch
         XCTAssertTrue(notice.waitForExistence(timeout: 10))
-        XCTAssertTrue((notice.value as? String ?? "")
-            .contains("Print failed"))
+        XCTAssertTrue(notice.label.contains("Print failed"))
     }
 
     /// wizardState.printerName records the queue used for spooling (#95).

Tests/ICCeryUITests/Milestone6CalibrationUITests.swift

@@ -75,6 +75,6 @@ final class Milestone6CalibrationUITests: XCTestCase {
         // After generation the wizard should advance to Stage 2 (layout) because
         // a CAL_ .ti1 now exists and the session is in calibration mode.
         let layout = app.buttons["btnCreateLayout"]
-        XCTAssertTrue(layout.waitForExistence(timeout: 10))
+        XCTAssertTrue(layout.waitForExistence(timeout: 25))
     }
 }