Merge pull request #29 from WeTransfer/feature/onrequest

Add an onRequest completion callback

Author: AvdLee

Changelog.md

@@ -1,7 +1,8 @@
 ## Changelog
 
 ### Next
-- A new completion callback can be set on `Mock` to use for expectation fulfilling once a `Mock` is used.
+- A new completion callback can be set on `Mock` to use for expectation fulfilling once a `Mock` is completed.
+- A new onRequest callback can be set on `Mock` to use for expectation fulfilling once a `Mock` is requested.
 - Updated to Swift 5.0
 - Only dispatch to the background queue if needed
 - Correctly handle cancellation of delayed responses

Sources/Mock.swift

@@ -79,8 +79,11 @@ public struct Mock: Equatable {
     /// Add a delay to a certain mock, which makes the response returned later.
     public var delay: DispatchTimeInterval?
 
-    /// The callback which will be executed everytime this `Mock` was used. Can be used within unit tests for validating that a request has been executed.
+    /// The callback which will be executed everytime this `Mock` was completed. Can be used within unit tests for validating that a request has been executed.
     public var completion: (() -> Void)?
+
+    /// The callback which will be executed everytime this `Mock` was started. Can be used within unit tests for validating that a request has been started.
+    public var onRequest: (() -> Void)?
 
     private init(url: URL? = nil, ignoreQuery: Bool = false, dataType: DataType, statusCode: Int, data: [HTTPMethod: Data], additionalHeaders: [String: String] = [:], fileExtensions: [String]? = nil) {
         self.url = url ?? URL(string: "https://mocked.wetransfer.com/\(dataType.rawValue)/\(statusCode)/")!

Sources/MockingURLProtocol.swift

@@ -30,6 +30,8 @@ public final class MockingURLProtocol: URLProtocol {
             return
         }
 
+        mock.onRequest?()
+
         guard let delay = mock.delay else {
             finishRequest(for: mock, data: data, response: response)
             return