Ensuring completion handler is called when uploadables is either nil or empty and MultipartUpload is cancelled.

Author: Ruben Nine

FilestackSDK/Internal/Uploaders/MultipartUpload.swift

@@ -68,7 +68,12 @@ class MultipartUpload: Uploader, DeferredAdd {
 
         uploadQueue.sync {
             state = .cancelled
-            operationQueue.cancelAllOperations()
+
+            if uploadables == nil || uploadables?.count == 0 {
+                finish(with: [])
+            } else {
+                operationQueue.cancelAllOperations()
+            }
         }
 
         return true

FilestackSDKTests/UploadTests.swift

@@ -131,6 +131,46 @@ class UploadTests: XCTestCase {
         XCTAssertNotNil(error)
     }
 
+    func testCancellingStartedUploadWithoutUploadablesShouldCallCompletionHandler() {
+        let expectation = self.expectation(description: "request should succeed")
+        var response: [JSONResponse] = []
+
+        let uploadOptions = UploadOptions(preferIntelligentIngestion: true, startImmediately: true)
+
+        let uploader = client.upload(options: uploadOptions) { resp in
+            response = resp
+            expectation.fulfill()
+        }
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
+            uploader.cancel()
+        }
+
+        waitForExpectations(timeout: 15, handler: nil)
+
+        XCTAssertEqual(response, [])
+    }
+
+    func testCancellingNotStartedUploadWithoutUploadablesShouldCallCompletionHandler() {
+        let expectation = self.expectation(description: "request should succeed")
+        var response: [JSONResponse] = []
+
+        let uploadOptions = UploadOptions(preferIntelligentIngestion: true, startImmediately: false)
+
+        let uploader = client.upload(options: uploadOptions) { resp in
+            response = resp
+            expectation.fulfill()
+        }
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
+            uploader.cancel()
+        }
+
+        waitForExpectations(timeout: 15, handler: nil)
+
+        XCTAssertEqual(response, [])
+    }
+
     func testResumableMultiPartUploadWithDownNetworkOnStart() {
         let uploadMultipartStartStubConditions =
             isScheme(Constants.uploadURL.scheme!) &&