Skip to content

POS: Remove timeouts from PointOfSaleAggregateModelTests #16212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 6, 2025
Merged

POS: Remove timeouts from PointOfSaleAggregateModelTests #16212

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9099640
Remove timeouts from PointOfSaleAggregateModelTests by awaiting for c…
staskus Oct 3, 2025
64677fe
Merge branch 'trunk' into task/remove-timeouts-from-pos-tests
staskus Oct 6, 2025
9ee2c4d
Update given-when-then structure
staskus Oct 6, 2025
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
40 changes: 19 additions & 21 deletions Modules/Tests/PointOfSaleTests/Models/PointOfSaleAggregateModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,21 +605,20 @@ struct PointOfSaleAggregateModelTests {
cardPresentPaymentService.connectedReader = nil

orderController.orderStateToReturn = makeLoadedOrderState(orderTotal: "$1.00", orderTotalDecimal: 1)
await sut.checkOut()
cardPresentPaymentService.collectPaymentWasCalled = false

// When
// `await confirmation` callback only waits until this completes, not until some timeout.
// Since this is synchonous but triggers async combine behaviour, we can't use that approach.
cardPresentPaymentService.connectedReader = .init(name: "Test reader", batteryLevel: 0.7)
await sut.checkOut()
#expect(cardPresentPaymentService.collectPaymentWasCalled == false)

// Then
let timeout = ContinuousClock.now + .seconds(2)
await withCheckedContinuation { continuation in
cardPresentPaymentService.onCollectPaymentCalled = {
continuation.resume()
}

while cardPresentPaymentService.collectPaymentWasCalled != true {
try await Task.sleep(for: .milliseconds(1))
try #require(.now < timeout)
// Collect payment should only be called once the card reader is connect
cardPresentPaymentService.connectedReader = .init(name: "Test reader", batteryLevel: 0.7)
}

#expect(cardPresentPaymentService.collectPaymentWasCalled == true)
}

@Test func checkOut_when_reader_is_already_connected_and_order_more_than_zero_collectPayment_called() async throws {
Expand Down Expand Up @@ -667,21 +666,20 @@ struct PointOfSaleAggregateModelTests {

orderController.orderStateToReturn = makeLoadedOrderState(orderTotal: "$1.00", orderTotalDecimal: 1)
await sut.checkOut()
#expect(cardPresentPaymentService.collectPaymentWasCalled == true)
await cardPresentPaymentService.disconnectReader()
cardPresentPaymentService.collectPaymentWasCalled = false

// When
// `await confirmation` callback only waits until this completes, not until some timeout.
// Since this is synchonous but triggers async combine behaviour, we can't use that approach.
cardPresentPaymentService.connectedReader = .init(name: "Test reader", batteryLevel: 0.7)

// Then
let timeout = ContinuousClock.now + .seconds(1)
await withCheckedContinuation { continuation in
cardPresentPaymentService.onCollectPaymentCalled = {
continuation.resume()
}

while cardPresentPaymentService.collectPaymentWasCalled != true {
try await Task.sleep(for: .milliseconds(1))
try #require(.now < timeout)
// Collect payment should be called once the card reader is reconnected
cardPresentPaymentService.connectedReader = .init(name: "Test reader", batteryLevel: 0.7)
}

#expect(cardPresentPaymentService.collectPaymentWasCalled == true)
}

@Test(.disabled()) func cancelThenCollectPayment_still_collects_payment_when_cancellation_fails() async throws {
Expand Down