Merge pull request #149 from Chewie69006/patch-1

Sort HTTP methods to remove randomness from keys
WeTransfer · Sep 11, 2023 · d56222c · d56222c
2 parents e5b1e27 + e08d07a
commit d56222c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Sources/Mocker/Mock.swift b/Sources/Mocker/Mock.swift
@@ -320,8 +320,8 @@ public struct Mock: Equatable {
     }
 
     public static func == (lhs: Mock, rhs: Mock) -> Bool {
-        let lhsHTTPMethods: [String] = lhs.data.keys.compactMap { $0.rawValue }
-        let rhsHTTPMethods: [String] = rhs.data.keys.compactMap { $0.rawValue }
+        let lhsHTTPMethods: [String] = lhs.data.keys.compactMap { $0.rawValue }.sorted()
+        let rhsHTTPMethods: [String] = rhs.data.keys.compactMap { $0.rawValue }.sorted()
 
         if let lhsFileExtensions = lhs.fileExtensions, let rhsFileExtensions = rhs.fileExtensions, (!lhsFileExtensions.isEmpty || !rhsFileExtensions.isEmpty) {
             /// The mocks are targeting file extensions specifically, check on those.

diff --git a/Tests/MockerTests/MockTests.swift b/Tests/MockerTests/MockTests.swift
@@ -32,4 +32,13 @@ final class MockTests: XCTestCase {
         XCTAssertEqual(mock200, mock400)
         XCTAssertNotEqual(mock200, mockJPEG)
     }
+
+    func testMethodsComparing() {
+        let url = URL(string: "https://mocked.wetransfer.com")!
+
+        let methods = [Mock.HTTPMethod.options, .get, .head, .post, .put, .patch, .delete, .trace, .connect]
+        let first = Mock(url: url, statusCode: 200, data: Dictionary(uniqueKeysWithValues: methods.shuffled().map { ($0, Data()) }))
+        let second = Mock(url: url, statusCode: 200, data: Dictionary(uniqueKeysWithValues: methods.shuffled().map { ($0, Data()) }))
+        XCTAssertEqual(first, second)
+    }
 }