Merge pull request #32 from allaboutapps/bug/stub-encoding

Remove dependency from shared APIClient in StubResponse.
allaboutapps · Feb 28, 2023 · dd60740 · dd60740
2 parents 02299c6 + b906e48
commit dd60740
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Sources/Fetch/Stub/Stub.swift b/Sources/Fetch/Stub/Stub.swift
@@ -71,7 +71,7 @@ public struct StubResponse: Stub {
     ///   - encodable: The object which will be encoded
     ///   - encoder: The `JSONEncoder` used to encode the `Encodable`
     ///   - delay: Simulated network delay
-    public init(statusCode: StatusCode, encodable: Encodable, encoder: ResourceEncoderProtocol = APIClient.shared.config.encoder, headers: HTTPHeaders = HTTPHeaders(), delay: TimeInterval) {
+    public init(statusCode: StatusCode, encodable: Encodable, encoder: ResourceEncoderProtocol = JSONEncoder(), headers: HTTPHeaders = HTTPHeaders(), delay: TimeInterval) {
         self.init(statusCode: statusCode, data: try! encoder.encode(AnyEncodable(encodable)), headers: headers, delay: delay)
     }
 

diff --git a/Tests/FetchTests/StubProviderTests.swift b/Tests/FetchTests/StubProviderTests.swift
@@ -39,7 +39,7 @@ class StubProviderTests: XCTestCase {
         }
 
         // update stub
-        waitForExpectations(timeout: 5, handler: nil)
+        wait(for: [expectationA], timeout: 5)
         let expectationB = self.expectation(description: "Fetch model b")
         let stubB = StubResponse(statusCode: 200, encodable: ModelA(a: "b"), delay: 0.1)
         APIClient.shared.stubProvider.register(stub: stubB, for: resource)
@@ -54,13 +54,13 @@ class StubProviderTests: XCTestCase {
             }
         }
 
-        waitForExpectations(timeout: 5, handler: nil)
+        wait(for: [expectationB], timeout: 5)
     }
 
     func testRemoveStub() {
         let expectation = self.expectation(description: "Fetch model")
 
-        let resource = Resource<ModelA>(method: .get, path: "/test")
+        let resource = Resource<ModelA>(method: .get, path: "/testRemove")
 
         let stub = StubResponse(statusCode: 200, encodable: ModelA(a: "a"), delay: 0.1)
         APIClient.shared.stubProvider.register(stub: stub, for: resource)