fix some tests around schema vendor extensions. also fix an actual bu…

…g around example component name extension
mattpolzin · Sep 6, 2023 · acc060f · acc060f
1 parent 8e2dad5
commit acc060f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/Sources/OpenAPIKit/Parameter/DereferencedSchemaContext.swift b/Sources/OpenAPIKit/Parameter/DereferencedSchemaContext.swift
@@ -43,7 +43,8 @@ public struct DereferencedSchemaContext: Equatable {
         following references: Set<AnyHashable>
     ) throws {
         self.schema = try schemaContext.schema._dereferenced(in: components, following: references, dereferencedFromComponentNamed: nil)
-        let examples = try schemaContext.examples?.mapValues { try components.lookup($0) }
+        let examples = try schemaContext.examples?
+            .mapValues { try $0._dereferenced(in: components, following: references, dereferencedFromComponentNamed: nil) }
         self.examples = examples
 
         self.example = examples.flatMap(OpenAPI.Content.firstExample(from:))

diff --git a/Tests/OpenAPIKitTests/Content/DereferencedContentTests.swift b/Tests/OpenAPIKitTests/Content/DereferencedContentTests.swift
@@ -78,7 +78,10 @@ final class DereferencedContentTests: XCTestCase {
         let t1 = try OpenAPI.Content(
             schemaReference: .component(named: "test")
         ).dereferenced(in: components)
-        XCTAssertEqual(t1.schema, .string(.init(), .init()))
+        XCTAssertEqual(
+            t1.schema,
+            .string(.init().with(vendorExtensions: ["x-component-name": "test"]), .init())
+        )
     }
 
     func test_referencedSchemaNoOverrides() throws {
@@ -90,7 +93,10 @@ final class DereferencedContentTests: XCTestCase {
         let t1 = try OpenAPI.Content(
             schemaReference: .component(named: "test")
         ).dereferenced(in: components)
-        XCTAssertEqual(t1.schema, .string(.init(description: "a test string"), .init()))
+        XCTAssertEqual(
+            t1.schema, 
+            .string(.init(description: "a test string").with(vendorExtensions: ["x-component-name": "test"]), .init())
+        )
     }
 
     func test_referencedSchemaOverrideDescription() throws {
@@ -103,7 +109,10 @@ final class DereferencedContentTests: XCTestCase {
             schemaReference: .component(named: "test", description: "overridden description")
         ).dereferenced(in: components)
         XCTAssertEqual(t1.schema?.description, "overridden description")
-        XCTAssertEqual(t1.schema, .string(.init(description: "overridden description"), .init()))
+        XCTAssertEqual(
+            t1.schema, 
+            .string(.init(description: "overridden description").with(vendorExtensions: ["x-component-name": "test"]), .init())
+        )
     }
 
     func test_missingSchema() {

diff --git a/Tests/OpenAPIKitTests/Parameter/DereferencedSchemaContextTests.swift b/Tests/OpenAPIKitTests/Parameter/DereferencedSchemaContextTests.swift
@@ -31,7 +31,10 @@ final class DereferencedSchemaContextTests: XCTestCase {
             examples: ["test": .reference(.component(named: "test"))]
         ).dereferenced(in: components)
         XCTAssertEqual(t1.example, "hello world")
-        XCTAssertEqual(t1.examples, ["test": .init(value: .init("hello world"))])
+        XCTAssertEqual(
+            t1.examples, 
+            ["test": .init(value: .init("hello world"), vendorExtensions: ["x-component-name": "test"])]
+        )
     }
 
     func test_multipleExamplesReferenced() throws {
@@ -53,8 +56,8 @@ final class DereferencedSchemaContextTests: XCTestCase {
         XCTAssertEqual(
             t1.examples,
             [
-                "test1": .init(value: .init("hello world")),
-                "test2": .init(value: .init(URL(string: "http://website.com")!))
+                "test1": .init(value: .init("hello world"), vendorExtensions: ["x-component-name": "test1"]),
+                "test2": .init(value: .init(URL(string: "http://website.com")!), vendorExtensions: ["x-component-name": "test2"])
             ]
         )
     }
@@ -80,7 +83,10 @@ final class DereferencedSchemaContextTests: XCTestCase {
             schemaReference: .component(named: "test"),
             style: .default(for: .header)
         ).dereferenced(in: components)
-        XCTAssertEqual(t1.schema, .string(.init(), .init()))
+        XCTAssertEqual(
+            t1.schema, 
+            .string(.init(), .init()).with(vendorExtensions: ["x-component-name": "test"])
+        )
     }
 
     func test_missingSchema() {