Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ let package = Package(
),
.testTarget(
name: "ClaudeUsageTests",
dependencies: ["ClaudeUsageCore"],
dependencies: ["ClaudeUsageCore", "ClaudeUsageApp"],
path: "Tests/ClaudeUsageTests"
),
]
Expand Down
7 changes: 7 additions & 0 deletions Sources/ClaudeUsageApp/StatusBarController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ final class StatusBarController: NSObject {

NotificationCenter.default
.publisher(for: UserDefaults.didChangeNotification)
.receiveOnMainQueue()
.sink { [weak self] _ in
DispatchQueue.main.async { [weak self] in
self?.updateStatusItemLength()
Expand Down Expand Up @@ -102,3 +103,9 @@ final class StatusBarController: NSObject {
popover.contentViewController?.view.window?.makeFirstResponder(nil)
}
}

extension Publisher {
func receiveOnMainQueue() -> Publishers.ReceiveOn<Self, DispatchQueue> {
receive(on: DispatchQueue.main)
}
}
63 changes: 63 additions & 0 deletions Tests/ClaudeUsageTests/MainQueuePublisherTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import Combine
import Foundation
import Testing
@testable import ClaudeUsageApp

@Suite("Main queue publishers")
struct MainQueuePublisherTests {
@Test("receiveOnMainQueue delivers background notifications on main thread")
func receiveOnMainQueueDeliversOnMainThread() async throws {
let deliveredOnMainThread = ThreadFlag()
var cancellables = Set<AnyCancellable>()

NotificationCenter.default
.publisher(for: UserDefaults.didChangeNotification)
.receiveOnMainQueue()
.sink { _ in
deliveredOnMainThread.set(Thread.isMainThread)
}
.store(in: &cancellables)

await Task.detached {
NotificationCenter.default.post(name: UserDefaults.didChangeNotification, object: nil)
}.value

try await waitUntil(deliveredOnMainThread.hasValue)
#expect(deliveredOnMainThread.value == true)
}
}

private final class ThreadFlag: @unchecked Sendable {
private let lock = NSLock()
private var storedValue: Bool?

var value: Bool? {
lock.lock()
defer { lock.unlock() }
return storedValue
}

func set(_ value: Bool) {
lock.lock()
defer { lock.unlock() }
storedValue = value
}

func hasValue() -> Bool {
value != nil
}
}

private func waitUntil(
_ condition: @escaping @Sendable () -> Bool,
timeout: Duration = .seconds(1)
) async throws {
let deadline = ContinuousClock.now + timeout
while !condition() {
if ContinuousClock.now >= deadline {
Issue.record("Timed out waiting for condition")
return
}
try await Task.sleep(for: .milliseconds(10))
}
}
Loading