Merge pull request kean#377 from ken-broadsheet/master

Fix a bug where ImagePipeline.loadImage could retain its completion block indefinitely

Sources/ImagePipeline.swift

@@ -887,3 +887,10 @@ public extension ImagePipeline {
  }
  }
 }
+
+// MARK: - Testing
+internal extension ImagePipeline {
+ var taskCount: Int {
+ return tasks.count
+ }
+}

Sources/Task.swift

@@ -86,6 +86,9 @@ final class Task<Value, Error>: TaskSubscriptionDelegate {
  starter?(self)
  starter = nil
 
+ // The task may have been completed synchronously by `starter`.
+ guard !isDisposed else { return nil }
+
  return subscription
  }
 

Tests/ImagePipelineTests/ImagePipelineTests.swift

@@ -471,6 +471,20 @@ class ImagePipelineMemoryCacheTests: XCTestCase {
  XCTAssertEqual(dataLoader.createdTaskCount, 1)
  XCTAssertNotNil(cache[Test.request])
  }
+
+ func testTaskCountAfterCachedLoad() {
+ // Given
+ cache[Test.request] = ImageContainer(image: Test.image)
+
+ // When
+ expect(pipeline).toLoadImage(with: Test.request)
+ wait()
+
+ // Then
+ XCTAssertEqual(dataLoader.createdTaskCount, 0)
+ XCTAssertNotNil(cache[Test.request])
+ XCTAssertEqual(pipeline.taskCount, 0)
+ }
 }
 
 class ImagePipelineErrorHandlingTests: XCTestCase {

Tests/TaskTests.swift

@@ -155,6 +155,23 @@ class TaskTests: XCTestCase {
  XCTAssertNil(task.subscribe { _ in })
  }
 
+ func testSubscribeToTaskWithSynchronousCompletionReturnsNil() {
+ // Given
+ let task = Task<Int, MyError> { (task) in
+ task.send(value: 0, isCompleted: true)
+ }
+
+ // When
+ let expectation = self.expectation(description: "Observer called")
+ let subscription = task.subscribe { _ in
+ expectation.fulfill()
+ }
+
+ // Then
+ XCTAssertNil(subscription)
+ wait()
+ }
+
  // MARK: - Ubsubscribe
 
  func testWhenSubscriptionIsRemovedNoEventsAreSent() {