fix: complete Command presentation teardown

2026-10-16 15:36:04 +02:00
parent 586c8a7560
commit cd2e3da330
6 changed files with 115 additions and 25 deletions
@@ -19,7 +19,6 @@ import Testing
    picker.input = { query }
    picker.closed = { closed = true }
    picker.pasteRequested = {
-        #expect(closed)
        #expect(pasteboard.string(forType: .string) == EmojiCatalog.search(query)[1].value)
        pasteRequests += 1
    }
@@ -28,7 +27,7 @@ import Testing
    #expect(picker.handle(#selector(NSResponder.moveRight(_:))))
    #expect(picker.handle(#selector(NSResponder.insertNewline(_:))))
    #expect(pasteboard.string(forType: .string) == matches[1].value)
-    #expect(closed)
+    #expect(!closed)
    #expect(pasteRequests == 1)
    #expect(defaults.stringArray(forKey: "recentEmoji") == [matches[1].value])

@@ -85,13 +84,84 @@ import Testing
    #expect(pasteRequests == 1)
 }

+@Test @MainActor func closingEmojiRemovesActionsEvenDuringBackAnimation() throws {
+    _ = NSApplication.shared
+    let suite = "ConjureEmojiLifetime.\(UUID().uuidString)"
+    let defaults = UserDefaults(suiteName: suite)!
+    let pasteboard = NSPasteboard.withUniqueName()
+    defer { defaults.removePersistentDomain(forName: suite); pasteboard.releaseGlobally() }
+    let picker = EmojiPickerController(defaults: defaults, pasteboard: pasteboard)
+    picker.input = { "👩‍💻" }
+    let window = NSWindow(contentRect: NSRect(x: 0, y: 0, width: 750, height: 400),
+                          styleMask: [.borderless], backing: .buffered, defer: false)
+    let host = try #require(window.contentView)
+    host.addSubview(picker.view)
+    picker.showActions()
+    let overlay = try #require(host.subviews.first { $0 !== picker.view })
+    picker.goBack()
+    var closed = false
+    picker.closed = { closed = true }
+    picker.close()
+    #expect(closed)
+    #expect(overlay.superview == nil)
+}
+
+@Test(arguments: ["replace", "dismiss", "copy", "paste"])
+@MainActor func commandFullExitRemovesEmojiAndItsActions(_ exit: String) throws {
+    _ = NSApplication.shared
+    let suite = "ConjureCommandExit.\(UUID().uuidString)"
+    let defaults = UserDefaults(suiteName: suite)!
+    let pasteboard = NSPasteboard.withUniqueName()
+    defer { defaults.removePersistentDomain(forName: suite); pasteboard.releaseGlobally() }
+    let launcher = LauncherWindowController(
+        history: LaunchHistory(defaults: defaults, now: { Date(timeIntervalSinceReferenceDate: 12_000) }),
+        defaults: defaults, pasteboard: pasteboard)
+    let window = try #require(launcher.window)
+    defer { window.orderOut(nil) }
+    let content = try #require(window.contentView)
+    func descendants(_ view: NSView) -> [NSView] { [view] + view.subviews.flatMap(descendants) }
+    let search = try #require(descendants(content).compactMap { $0 as? NSSearchField }.first)
+    search.stringValue = "emoji"
+    launcher.controlTextDidChange(Notification(name: NSControl.textDidChangeNotification, object: search))
+    _ = launcher.control(search, textView: NSTextView(), doCommandBy: #selector(NSResponder.insertNewline(_:)))
+    search.stringValue = "👩‍💻"
+    launcher.controlTextDidChange(Notification(name: NSControl.textDidChangeNotification, object: search))
+    window.orderFront(nil)
+    let button = try #require(descendants(content).compactMap { $0 as? NSButton }.first {
+        $0.title == "Actions" && $0.target is EmojiPickerController
+    })
+    let existing = Set(content.subviews.map(ObjectIdentifier.init))
+    (button.target as? EmojiPickerController)?.showActions()
+    let overlay = try #require(content.subviews.last { !existing.contains(ObjectIdentifier($0)) })
+    switch exit {
+    case "replace": launcher.present(command: .translate)
+    case "dismiss": window.performClose(nil)
+    case "copy": (button.target as? EmojiPickerController)?.copySelection()
+    default: _ = launcher.control(search, textView: NSTextView(), doCommandBy: #selector(NSResponder.insertNewline(_:)))
+    }
+    #expect(overlay.superview == nil)
+    #expect(!descendants(content).contains { $0 is NSCollectionView })
+    if exit == "replace" {
+        #expect(search.accessibilityLabel() == "English text to translate into Japanese")
+        #expect(search.stringValue.isEmpty)
+    } else {
+        #expect(!window.isVisible)
+        #expect(search.stringValue == "emoji")
+        #expect(search.accessibilityLabel() == "Search applications, calculate, or convert units and currencies")
+    }
+    if exit == "copy" || exit == "paste" {
+        #expect(pasteboard.string(forType: .string) == "👩‍💻")
+        #expect(defaults.stringArray(forKey: "recentEmoji") == ["👩‍💻"])
+    }
+}
+
@Test @MainActor func emojiCommandRestoresLauncherSearchOnEscape() throws {
    _ = NSApplication.shared
    let suite = "ConjureEmojiCommand.\(UUID().uuidString)"
    let defaults = UserDefaults(suiteName: suite)!
    defer { defaults.removePersistentDomain(forName: suite) }
    let history = LaunchHistory(defaults: defaults, now: { Date(timeIntervalSinceReferenceDate: 12_000) })
-    let launcher = LauncherWindowController(history: history)
+    let launcher = LauncherWindowController(history: history, defaults: defaults)
    let content = try #require(launcher.window?.contentView)
    func descendants(_ view: NSView) -> [NSView] { [view] + view.subviews.flatMap(descendants) }
    let search = try #require(descendants(content).compactMap { $0 as? NSSearchField }.first)
@@ -103,6 +173,15 @@ import Testing
    launcher.controlTextDidChange(Notification(name: NSControl.textDidChangeNotification, object: search))
    #expect(grid.numberOfItems(inSection: 0) == 1)
    #expect((grid.dataSource?.collectionView(grid, itemForRepresentedObjectAt: IndexPath(item: 0, section: 0)).view as? NSButton)?.title == "👩‍💻")
+    let actionsButton = try #require(descendants(content).compactMap { $0 as? NSButton }.first {
+        $0.title == "Actions" && $0.target is EmojiPickerController
+    })
+    (actionsButton.target as? EmojiPickerController)?.showActions()
+    _ = launcher.control(search, textView: NSTextView(), doCommandBy: #selector(NSResponder.cancelOperation(_:)))
+    #expect(descendants(content).contains { $0 === grid })
+    #expect(search.stringValue == ":woman_technologist:")
+    let copyButton = try #require(descendants(content).compactMap { $0 as? NSButton }.first { $0.title == "Copy and Paste" })
+    #expect(copyButton.keyEquivalent == "\r")
    _ = launcher.control(search, textView: NSTextView(), doCommandBy: #selector(NSResponder.cancelOperation(_:)))
    #expect(!descendants(content).contains { $0 === grid })
    #expect(search.stringValue == "emoji")