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: 2 additions & 0 deletions Sources/ComposableArchitecture/Effect.swift
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ extension Effect {
} catch is CancellationError {
return
} catch {
guard !Task.isCancelled
else { return }
guard let handler else {
reportIssue(
"""
Expand Down
22 changes: 20 additions & 2 deletions Tests/ComposableArchitectureTests/EffectCancellationTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,22 @@ final class EffectCancellationTests: BaseTCATestCase {
}
XCTAssertEqual(output, [1, 2])
}

@available(iOS 15.0, *)
func testCancellationWithoutThrowingCancellationError() async throws {
let effect = Effect<Void>.run { send in
let session = URLSession(configuration: .ephemeral)
let request = URLRequest(url: URL(string: "http://ipv4.download.thinkbroadband.com/1GB.zip")!)
let (data, response) = try await session.data(for: request, delegate: nil)
_ = (data, response)
}
.cancellable(id: 1)
Task {
for await _ in effect.actions {}
}
try await Task.sleep(nanoseconds: 10_000_000)
Task.cancel(id: 1)
}
}

#if DEBUG
Expand Down Expand Up @@ -350,15 +366,17 @@ final class EffectCancellationTests: BaseTCATestCase {
.publisher {
Just(idx)
.delay(
for: .milliseconds(Int.random(in: 1...100)), scheduler: queues.randomElement()!
for: .milliseconds(Int.random(in: 1...100)),
scheduler: queues.randomElement()!
)
}
.cancellable(id: id),

.publisher {
Empty()
.delay(
for: .milliseconds(Int.random(in: 1...100)), scheduler: queues.randomElement()!
for: .milliseconds(Int.random(in: 1...100)),
scheduler: queues.randomElement()!
)
.handleEvents(receiveCompletion: { _ in Task.cancel(id: id) })
}
Expand Down
Loading