Merge remote-tracking branch 'origin/main' into bugfix/300/explode-th…

…e-header-2
mattpolzin · Aug 26, 2023 · a04ef3f · a04ef3f
2 parents 97618fa + 0f712cc
commit a04ef3f
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 0 deletions.
diff --git a/Sources/OpenAPIKit/Header/Header.swift b/Sources/OpenAPIKit/Header/Header.swift
@@ -186,6 +186,7 @@ extension OpenAPI.Header {
 
         // the following are parsed as part of Schema
         case style
+        case explode
         case allowReserved
         case example
         case examples
@@ -200,6 +201,7 @@ extension OpenAPI.Header {
                 .content,
                 .schema,
                 .style,
+                .explode,
                 .allowReserved,
                 .example,
                 .examples
@@ -224,6 +226,8 @@ extension OpenAPI.Header {
                 self = .schema
             case "style":
                 self = .style
+            case "explode":
+                self = .explode
             case "allowReserved":
                 self = .allowReserved
             case "example":
@@ -249,6 +253,8 @@ extension OpenAPI.Header {
                 return "schema"
             case .style:
                 return "style"
+            case .explode:
+                return "explode"
             case .allowReserved:
                 return "allowReserved"
             case .example:

diff --git a/Tests/OpenAPIKitTests/Header/HeaderTests.swift b/Tests/OpenAPIKitTests/Header/HeaderTests.swift
@@ -547,6 +547,67 @@ extension HeaderTests {
         )
     }
 
+    func test_header_withStyleAndExplode_encode() throws {
+        let header = OpenAPI.Header(
+            schema: .init(
+                .array(items: .string),
+                style: .form,
+                explode: false
+            ),
+            required: true
+        )
+
+        let encodedHeader = try orderUnstableTestStringFromEncoding(of: header)
+
+        assertJSONEquivalent(
+            encodedHeader,
+            """
+            {
+              "explode" : false,
+              "required" : true,
+              "schema" : {
+                "items" : {
+                  "type" : "string"
+                },
+                "type" : "array"
+              },
+              "style" : "form"
+            }
+            """
+        )
+    }
+
+    func test_header_withStyleAndExplode_decode() throws {
+        let headerData =
+        """
+        {
+          "explode" : false,
+          "required" : true,
+          "schema" : {
+            "items" : {
+              "type" : "string"
+            },
+            "type" : "array"
+          },
+          "style" : "form"
+        }
+        """.data(using: .utf8)!
+
+        let header = try orderUnstableDecode(OpenAPI.Header.self, from: headerData)
+
+        XCTAssertEqual(
+            header,
+            OpenAPI.Header(
+                schema: .init(
+                    .array(items: .string),
+                    style: .form,
+                    explode: false
+                ),
+                required: true
+            )
+        )
+    }
+
     func test_header_errorForBothContentAndSchema_decode() {
         let headerData =
         """