Update tests

Author: kean

Package.swift

@@ -11,8 +11,8 @@ let package = Package(
     targets: [
         .binaryTarget(
             name: "WordPressKit",
-            url: "https://github.com/user-attachments/files/19949703/WordPressKit.zip",
-            checksum: "68359fda96ca0c7f9d98130c19b6246c2aa2dfdd3ede736be5330270f5e7abdd"
+            url: "https://github.com/user-attachments/files/19949939/WordPressKit.zip",
+            checksum: "ba06ff0716595023dd6c98b6a5bc74d4abb35bfb668e24026ffd041460f59137"
         ),
     ]
 )

Sources/WordPressKit/Services/PeopleServiceRemote.swift

@@ -220,16 +220,7 @@ public class PeopleServiceRemote: ServiceRemoteWordPressComREST {
         public var total: Int
         public var pages: Int
         public var page: Int
-        public var perPage: Int
         public var subscribers: [RemoteSubscriber]
-
-        private enum CodingKeys: String, CodingKey {
-            case total = "total"
-            case pages = "pages"
-            case page = "page"
-            case perPage = "per_page"
-            case subscribers = "subscribers"
-        }
     }
 
     public func getSubscribers(
@@ -255,10 +246,14 @@ public class PeopleServiceRemote: ServiceRemoteWordPressComREST {
         if !parameters.filters.isEmpty {
             query["filters"] = parameters.filters.map { $0.description }
         }
+
+        let decoder = JSONDecoder()
+        decoder.dateDecodingStrategy = JSONDecoder.DateDecodingStrategy.supportMultipleDateFormats
+
         return try await wordPressComRestApi.perform(
             .get,
             URLString: url,
-            jsonDecoder: JSONDecoder.apiDecoder,
+            jsonDecoder: decoder,
             type: SubscribersResponse.self
         ).get().body
     }

Tests/WordPressKitTests/Mock Data/site-subscribers-response.json

@@ -0,0 +1,20 @@
+{
+  "total": 1,
+  "pages": 1,
+  "page": 1,
+  "per_page": 100,
+  "subscribers": [
+    {
+      "user_id": 1,
+      "subscription_id": 2,
+      "email_address": "[email protected]",
+      "date_subscribed": "2025-02-28T19:36:36+00:00",
+      "is_email_subscriber": false,
+      "subscription_status": "Not subscribed",
+      "avatar": "https://0.gravatar.com/avatar/example.jpg",
+      "display_name": "Test",
+      "url": "http://example.wordpress.com"
+    }
+  ],
+  "is_owner_subscribed": true
+}

Tests/WordPressKitTests/Tests/JSONLoader.swift

@@ -12,7 +12,7 @@ import Foundation
     */
     @objc open func loadFile(_ name: String, type: String) -> JSONDictionary? {
 
-        let path = Bundle(for: Swift.type(of: self)).path(forResource: name, ofType: type)
+        let path = JSONLoader.bundle.path(forResource: name, ofType: type)
 
         if let unwrappedPath = path {
             return loadFile(unwrappedPath)
@@ -47,4 +47,15 @@ import Foundation
             return nil
         }
     }
+
+    public static func data(named name: String, ext: String = "json") throws -> Data {
+        guard let url = Bundle(for: JSONLoader.self).url(forResource: name, withExtension: ext) else {
+            throw URLError(.badURL)
+        }
+        return try Data(contentsOf: url)
+    }
+
+    private static var bundle: Bundle {
+        Bundle(for: JSONLoader.self)
+    }
 }

Tests/WordPressKitTests/Tests/MockWordPressComRestApi.swift

@@ -49,7 +49,7 @@ class MockWordPressComRestApi: WordPressComRestApi {
     override func perform<T: Decodable>(
         _ method: HTTPRequestBuilder.Method,
         URLString: String,
-        parameters: [String: AnyObject]? = nil,
+        parameters: [String: Any]? = nil,
         fulfilling progress: Progress? = nil,
         jsonDecoder: JSONDecoder? = nil,
         type: T.Type = T.self

Tests/WordPressKitTests/Tests/PeopleServiceRemoteTests.swift

@@ -795,4 +795,17 @@ class PeopleServiceRemoteTests: RemoteTestCase, RESTTestable {
         waitForExpectations(timeout: timeout, handler: nil)
     }
 
+    func testDecodeSubscribersResponse() throws {
+        let data = try JSONLoader.data(named: "site-subscribers-response")
+
+        let decoder = JSONDecoder()
+        decoder.dateDecodingStrategy = JSONDecoder.DateDecodingStrategy.supportMultipleDateFormats
+
+        let response = try decoder.decode(PeopleServiceRemote.SubscribersResponse.self, from: data)
+
+        XCTAssertEqual(response.total, 1)
+
+        let subscriber = try XCTUnwrap(response.subscribers.first)
+        XCTAssertEqual(subscriber.userID, 1)
+    }
 }

WordPressKit.xcodeproj/project.pbxproj

@@ -24,6 +24,7 @@
 		0C363D452C41B468004E241D /* OHHTTPStubs in Frameworks */ = {isa = PBXBuildFile; productRef = 0C363D442C41B468004E241D /* OHHTTPStubs */; };
 		0C363D472C41B468004E241D /* OHHTTPStubsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 0C363D462C41B468004E241D /* OHHTTPStubsSwift */; };
 		0C674E302BF3A91300F3B3D4 /* JetpackAIServiceRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C674E2F2BF3A91300F3B3D4 /* JetpackAIServiceRemote.swift */; };
+		0C8069A72DC03E85008DFC2F /* site-subscribers-response.json in Resources */ = {isa = PBXBuildFile; fileRef = 0C8069A62DC03E85008DFC2F /* site-subscribers-response.json */; };
 		0C938A062C416789009BA7B2 /* Secret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C938A052C416789009BA7B2 /* Secret.swift */; };
 		0C938A092C4167BC009BA7B2 /* NSString+XMLExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C938A072C4167BB009BA7B2 /* NSString+XMLExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0C938A0A2C4167BC009BA7B2 /* NSString+XMLExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C938A082C4167BB009BA7B2 /* NSString+XMLExtensions.m */; };
@@ -801,6 +802,7 @@
 		0C3A2A412A2E7BA500FD91D6 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
 		0C6183C62C420A3700289E73 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
 		0C674E2F2BF3A91300F3B3D4 /* JetpackAIServiceRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JetpackAIServiceRemote.swift; sourceTree = "<group>"; };
+		0C8069A62DC03E85008DFC2F /* site-subscribers-response.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "site-subscribers-response.json"; sourceTree = "<group>"; };
 		0C938A052C416789009BA7B2 /* Secret.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Secret.swift; sourceTree = "<group>"; };
 		0C938A072C4167BB009BA7B2 /* NSString+XMLExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+XMLExtensions.h"; sourceTree = "<group>"; };
 		0C938A082C4167BB009BA7B2 /* NSString+XMLExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+XMLExtensions.m"; sourceTree = "<group>"; };
@@ -2544,6 +2546,7 @@
 				9AEAA772215E71C000876E62 /* site-quick-start-success.json */,
 				74D67F0C1F15C2D70010C5ED /* site-roles-auth-failure.json */,
 				74D67F0D1F15C2D70010C5ED /* site-roles-bad-json-failure.json */,
+				0C8069A62DC03E85008DFC2F /* site-subscribers-response.json */,
 				74D67F0E1F15C2D70010C5ED /* site-roles-success.json */,
 				D8DB404121EF22B500B8238E /* site-segments-multiple.json */,
 				D813437721F6D7DC0060D99A /* site-segments-single.json */,
@@ -3033,6 +3036,7 @@
 				C738CAF528622953001BE107 /* qrlogin-validate-expired-401.json in Resources */,
 				937250EC267A15060086075F /* stats-referrer-mark-as-spam.json in Resources */,
 				F3FF8A23279C954100E5C90F /* site-email-followers-get-success.json in Resources */,
+				0C8069A72DC03E85008DFC2F /* site-subscribers-response.json in Resources */,
 				465F889A263B09BF00F4C950 /* wp-block-editor-v1-settings-success-ThemeJSON.json in Resources */,
 				BA9A7F7F24C6895600925E81 /* plugin-directory-jetpack-beta.json in Resources */,
 				E6B0461425E5B6F500DF6F4F /* sites-invites-links-generate.json in Resources */,