Merge pull request #133 from mattpolzin/bugfix/server-variable-enum

fix incorrectly required enum property on server variables.
mattpolzin · Aug 15, 2020 · 9c08102 · 9c08102
2 parents 4b5f646 + 26a5a2e
commit 9c08102
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 4 deletions.
diff --git a/Sources/OpenAPIKit/Server.swift b/Sources/OpenAPIKit/Server.swift
@@ -150,7 +150,9 @@ extension OpenAPI.Server.Variable: Encodable {
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
 
-        try container.encode(`enum`, forKey: .enum)
+        if !`enum`.isEmpty {
+            try container.encode(`enum`, forKey: .enum)
+        }
 
         try container.encode(`default`, forKey: .default)
 
@@ -164,7 +166,7 @@ extension OpenAPI.Server.Variable: Decodable {
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
 
-        `enum` = try container.decode([String].self, forKey: .enum)
+        `enum` = try container.decodeIfPresent([String].self, forKey: .enum) ?? []
 
         `default` = try container.decode(String.self, forKey: .default)
 

diff --git a/Tests/OpenAPIKitCompatibilitySuite/GoogleBooksAPITests.swift b/Tests/OpenAPIKitCompatibilitySuite/GoogleBooksAPITests.swift
@@ -118,8 +118,7 @@ final class GoogleBooksAPICampatibilityTests: XCTestCase {
 
         XCTAssertNotNil(addBooksParameters)
         XCTAssertEqual(addBooksParameters?.count, 11)
-        XCTAssertEqual(addBooksParameters?.first?.description, "JSONP")
-        XCTAssertEqual(addBooksParameters?.first?.context, .query)
+        XCTAssert(addBooksParameters?.contains { $0.description == "JSONP" && $0.context == .query } ?? false)
     }
 
     func test_dereferencedComponents() throws {

diff --git a/Tests/OpenAPIKitTests/ServerTests.swift b/Tests/OpenAPIKitTests/ServerTests.swift
@@ -75,6 +75,59 @@ extension ServerTests {
                        )
     }
 
+    func test_minimalServerVariable_decode() {
+        let serverData =
+"""
+{
+    "url": "https://hello.com",
+    "variables": {
+        "world": {
+            "default": "cool"
+        }
+    }
+}
+""".data(using: .utf8)!
+
+        let serverDecoded = try! orderUnstableDecode(Server.self, from: serverData)
+
+        XCTAssertEqual(
+            serverDecoded,
+            Server(
+                url: URL(string: "https://hello.com")!,
+                variables: [
+                    "world": .init(
+                        default: "cool"
+                    )
+                ]
+            )
+        )
+    }
+
+    func test_minimalServerVariable_encode() {
+        let server = Server(
+            url: URL(string: "https://hello.com")!,
+            variables: [
+                "world": .init(
+                    default: "cool"
+                )
+            ]
+        )
+        let encodedServer = try! orderUnstableTestStringFromEncoding(of: server)
+
+        assertJSONEquivalent(encodedServer,
+"""
+{
+  "url" : "https:\\/\\/hello.com",
+  "variables" : {
+    "world" : {
+      "default" : "cool"
+    }
+  }
+}
+"""
+        )
+    }
+
     func test_maximalServer_decode() {
         let serverData =
 """