Skip to content

Commit f1c15be

Browse files
dankinsoiddankinsoid
committed
update dependencies
1 parent 1e61645 commit f1c15be

File tree

8 files changed

+48
-57
lines changed

8 files changed

+48
-57
lines changed

‎Package.swift‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ let package = Package(
1616
],
1717
dependencies: [
1818
.package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
19-
.package(url: "https://github.com/dankinsoid/SwiftOpenAPI.git", from: "2.20.0"),
20-
.package(url: "https://github.com/pointfreeco/swift-custom-dump.git", from: "0.10.3"),
19+
.package(url: "https://github.com/dankinsoid/SwiftOpenAPI.git", from: "2.22.0")
2120
],
2221
targets: [
2322
.target(
@@ -30,8 +29,7 @@ let package = Package(
3029
.testTarget(
3130
name: "VaporToOpenAPITests",
3231
dependencies: [
33-
"VaporToOpenAPI",
34-
.product(name: "CustomDump", package: "swift-custom-dump"),
32+
"VaporToOpenAPI"
3533
]
3634
),
3735
]

‎[email protected]‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ let package = Package(
1616
],
1717
dependencies: [
1818
.package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
19-
.package(url: "https://github.com/dankinsoid/SwiftOpenAPI.git", from: "2.19.5"),
20-
.package(url: "https://github.com/pointfreeco/swift-custom-dump.git", from: "0.10.3"),
19+
.package(url: "https://github.com/dankinsoid/SwiftOpenAPI.git", from: "2.22.0")
2120
],
2221
targets: [
2322
.target(
@@ -30,8 +29,7 @@ let package = Package(
3029
.testTarget(
3130
name: "VaporToOpenAPITests",
3231
dependencies: [
33-
"VaporToOpenAPI",
34-
.product(name: "CustomDump", package: "swift-custom-dump"),
32+
"VaporToOpenAPI"
3533
]
3634
),
3735
]

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ import PackageDescription
222222
let package = Package(
223223
name: "SomeProject",
224224
dependencies: [
225-
.package(url: "https://github.com/dankinsoid/VaporToOpenAPI.git", from: "4.7.1")
225+
.package(url: "https://github.com/dankinsoid/VaporToOpenAPI.git", from: "4.8.0")
226226
],
227227
targets: [
228228
.target(name: "SomeProject", dependencies: ["VaporToOpenAPI"])

‎Tests/VaporToOpenAPITests/AnyValueExtensionsTests.swift‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import CustomDump
21
import SwiftOpenAPI
32
import Vapor
43
@testable import VaporToOpenAPI
@@ -16,8 +15,8 @@ final class AnyValueTests: XCTestCase {
1615
let a = AnyValue.object(["a": 1, "b": "hello", "c": true])
1716
let b = AnyValue.object(["d": 2, "e": "world", "f": false])
1817
let c = AnyValue.object(["g": 1, "h": b, "j": a])
19-
XCTAssertNoDifference(c.path(upTo: "a"), ["j", "a"])
20-
XCTAssertNoDifference(c.path(upTo: "f"), ["h", "f"])
21-
XCTAssertNoDifference(c.path(upTo: "c"), ["j", "c"])
18+
XCTAssertEqual(c.path(upTo: "a"), ["j", "a"])
19+
XCTAssertEqual(c.path(upTo: "f"), ["h", "f"])
20+
XCTAssertEqual(c.path(upTo: "c"), ["j", "c"])
2221
}
2322
}

‎Tests/VaporToOpenAPITests/CollectionExtensionsTests.swift‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import CustomDump
21
import SwiftOpenAPI
32
import Vapor
43
@testable import VaporToOpenAPI
@@ -21,12 +20,12 @@ final class CollectionTests: XCTestCase {
2120
let array1 = [1, 2, 3, 2, 4, 5, 4, 6]
2221
let array2 = ["a", "A", "A", "a", "b", "C", "c", "C"]
2322
XCTAssertEqual(array1.removeEquals, [1, 2, 3, 4, 5, 6])
24-
XCTAssertNoDifference(array2.removeEquals { $0.lowercased() }, ["a", "b", "C"])
23+
XCTAssertEqual(array2.removeEquals { $0.lowercased() }, ["a", "b", "C"])
2524
}
2625

2726
func testMapKeys() {
2827
let dict = ["a": 1, "b": 2, "c": 3]
29-
XCTAssertNoDifference(dict.mapKeys { $0.uppercased() }, ["A": 1, "B": 2, "C": 3])
30-
XCTAssertNoDifference(dict.mapKeys({ $0.uppercased() }, values: { $0 * 2 }), ["A": 2, "B": 4, "C": 6])
28+
XCTAssertEqual(dict.mapKeys { $0.uppercased() }, ["A": 1, "B": 2, "C": 3])
29+
XCTAssertEqual(dict.mapKeys({ $0.uppercased() }, values: { $0 * 2 }), ["A": 2, "B": 4, "C": 6])
3130
}
3231
}

‎Tests/VaporToOpenAPITests/RouteTests.swift‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import CustomDump
21
import SwiftOpenAPI
32
import Vapor
43
@testable import VaporToOpenAPI
@@ -65,39 +64,39 @@ final class RouteTests: XCTestCase {
6564
route {
6665
$0.openAPI(query: .type(TestType.self))
6766
} testOperation: {
68-
XCTAssertNoDifference($0.parameters, TestType.parameters(in: .query))
67+
XCTAssertEqual($0.parameters, TestType.parameters(in: .query))
6968
}
7069
}
7170

7271
func testOpenAPIHeader() {
7372
route {
7473
$0.openAPI(headers: .type(TestType.self))
7574
} testOperation: {
76-
XCTAssertNoDifference($0.parameters, TestType.parameters(in: .header))
75+
XCTAssertEqual($0.parameters, TestType.parameters(in: .header))
7776
}
7877
}
7978

8079
func testOpenAPIPath() {
8180
route {
8281
$0.openAPI(path: .type(TestType.self))
8382
} testOperation: {
84-
XCTAssertNoDifference($0.parameters, TestType.parameters(in: .path))
83+
XCTAssertEqual($0.parameters, TestType.parameters(in: .path))
8584
}
8685
}
8786

8887
func testOpenAPICookies() {
8988
route {
9089
$0.openAPI(cookies: .type(TestType.self))
9190
} testOperation: {
92-
XCTAssertNoDifference($0.parameters, TestType.parameters(in: .cookie))
91+
XCTAssertEqual($0.parameters, TestType.parameters(in: .cookie))
9392
}
9493
}
9594

9695
func testOpenAPIBody() {
9796
route {
9897
$0.openAPI(body: .type(TestType.self))
9998
} testOperation: {
100-
XCTAssertNoDifference(
99+
XCTAssertEqual(
101100
$0.requestBody?.object?.content,
102101
[
103102
.application(.json): MediaTypeObject(
@@ -124,7 +123,7 @@ final class RouteTests: XCTestCase {
124123
route {
125124
$0.openAPI(body: .schema(.string), contentType: .text(.html))
126125
} testOperation: {
127-
XCTAssertNoDifference(
126+
XCTAssertEqual(
128127
$0.requestBody?.object?.content.value.first?.key,
129128
.text(.html)
130129
)
@@ -150,7 +149,7 @@ final class RouteTests: XCTestCase {
150149
route {
151150
$0.openAPI(response: .type(GetStudentDTO.self))
152151
} testOperation: {
153-
XCTAssertNoDifference(
152+
XCTAssertEqual(
154153
$0.responses?[.ok]?.object?.content,
155154
[
156155
.application(.json): MediaTypeObject(
@@ -159,7 +158,7 @@ final class RouteTests: XCTestCase {
159158
]
160159
)
161160
} testDocument: { openAPIObject in
162-
XCTAssertNoDifference(
161+
XCTAssertEqual(
163162
openAPIObject.components?.schemas,
164163
["GetStudentDTO": GetStudentDTO.schema]
165164
)
@@ -174,7 +173,7 @@ final class RouteTests: XCTestCase {
174173
route {
175174
$0.openAPI(response: .schema(.string), responseContentType: .text(.html))
176175
} testOperation: {
177-
XCTAssertNoDifference(
176+
XCTAssertEqual(
178177
$0.responses?[.ok]?.object?.content?.value.keys.map { $0 },
179178
[.text(.html)]
180179
)
@@ -200,7 +199,7 @@ final class RouteTests: XCTestCase {
200199
route {
201200
$0.openAPI(response: .schema(.string), responseHeaders: .type(TestType.self))
202201
} testOperation: {
203-
XCTAssertNoDifference(
202+
XCTAssertEqual(
204203
$0.responses?[.ok]?.object?.headers,
205204
TestType.headers
206205
)
@@ -250,7 +249,7 @@ final class RouteTests: XCTestCase {
250249
]
251250
)
252251
} testDocument: {
253-
XCTAssertNoDifference(
252+
XCTAssertEqual(
254253
$0.components?.links,
255254
[
256255
"ResponseBodyIdGetCustomRequestBodyIds": .value(
@@ -277,9 +276,9 @@ final class RouteTests: XCTestCase {
277276
route {
278277
$0.openAPI(auth: .basic(id: name))
279278
} testOperation: {
280-
XCTAssertNoDifference($0.security, [SecurityRequirementObject(name)])
279+
XCTAssertEqual($0.security, [SecurityRequirementObject(name)])
281280
} testDocument: { doc in
282-
XCTAssertNoDifference(doc.components?.securitySchemes, [name: .basic])
281+
XCTAssertEqual(doc.components?.securitySchemes, [name: .basic])
283282
}
284283
}
285284

@@ -288,7 +287,7 @@ final class RouteTests: XCTestCase {
288287
route {
289288
$0.openAPI(servers: [ServerObject(url: name)])
290289
} testOperation: {
291-
XCTAssertNoDifference($0.servers, [ServerObject(url: name)])
290+
XCTAssertEqual($0.servers, [ServerObject(url: name)])
292291
}
293292
}
294293

@@ -297,12 +296,12 @@ final class RouteTests: XCTestCase {
297296
route {
298297
$0.openAPI(extensions: extensions)
299298
} testOperation: {
300-
XCTAssertNoDifference($0.specificationExtensions, extensions)
299+
XCTAssertEqual($0.specificationExtensions, extensions)
301300
}
302301
route {
303302
$0.openAPI(extensions: [:])
304303
} testOperation: {
305-
XCTAssertNoDifference($0.specificationExtensions, nil)
304+
XCTAssertEqual($0.specificationExtensions, nil)
306305
}
307306
}
308307

@@ -315,20 +314,20 @@ final class RouteTests: XCTestCase {
315314
route {
316315
$0.openAPI(callbacks: value)
317316
} testOperation: {
318-
XCTAssertNoDifference($0.callbacks, value)
317+
XCTAssertEqual($0.callbacks, value)
319318
}
320319
}
321320

322321
func testDefaultContentType() {
323322
route {
324323
$0.openAPI(response: .type(String.self))
325324
} testOperation: {
326-
XCTAssertNoDifference($0.responses?[.ok]?.object?.content?.value.keys.map { $0 }, [.text(.plain)])
325+
XCTAssertEqual($0.responses?[.ok]?.object?.content?.value.keys.map { $0 }, [.text(.plain)])
327326
}
328327
route {
329328
$0.openAPI(response: .type(Data.self))
330329
} testOperation: {
331-
XCTAssertNoDifference($0.responses?[.ok]?.object?.content?.value.keys.map { $0 }, [.text("binary")])
330+
XCTAssertEqual($0.responses?[.ok]?.object?.content?.value.keys.map { $0 }, [.text("binary")])
332331
}
333332
}
334333

‎Tests/VaporToOpenAPITests/SecuritySchemeObjectTests.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import CustomDump
21
import SwiftOpenAPI
32
import Vapor
43
@testable import VaporToOpenAPI

‎Tests/VaporToOpenAPITests/VaporToOpenAPITests.swift‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import CustomDump
21
import SwiftOpenAPI
32
import Vapor
43
@testable import VaporToOpenAPI
@@ -30,7 +29,7 @@ final class VDTests: XCTestCase {
3029
)
3130
)
3231

33-
XCTAssertNoDifference(
32+
XCTAssertEqual(
3433
api,
3534
OpenAPIObject(
3635
info: InfoObject(
@@ -197,23 +196,23 @@ final class VDTests: XCTestCase {
197196

198197
// Test schema
199198
_ = try body.value.schema(schemas: &schemas)
200-
XCTAssertNoDifference(schemas, ["PetNoExample": Pet.schema])
199+
XCTAssertEqual(schemas, ["PetNoExample": Pet.schema])
201200
schemas = [:]
202201

203202
// Test parameters
204203
let params = try body.value.parameters(in: .query, schemas: &schemas)
205-
XCTAssertNoDifference(params, Pet.parameters)
204+
XCTAssertEqual(params, Pet.parameters)
206205
schemas = [:]
207206

208207
// Test headers
209208
let headers = try body.value.headers(schemas: &schemas)
210-
XCTAssertNoDifference(headers, Pet.headers)
209+
XCTAssertEqual(headers, Pet.headers)
211210
schemas = [:]
212211

213212
// Test media object
214213
let media = try body.value.mediaTypeObject(schemas: &schemas, examples: &examples)
215-
XCTAssertNoDifference(media, MediaTypeObject(schema: .ref(components: \.schemas, "PetNoExample")))
216-
XCTAssertNoDifference(examples, [:])
214+
XCTAssertEqual(media, MediaTypeObject(schema: .ref(components: \.schemas, "PetNoExample")))
215+
XCTAssertEqual(examples, [:])
217216
schemas = [:]
218217
examples = [:]
219218
}
@@ -227,7 +226,7 @@ final class VDTests: XCTestCase {
227226
switch body.value {
228227
case let .example(example):
229228
if let pet = example as? Pet {
230-
XCTAssertNoDifference(pet, Pet.example)
229+
XCTAssertEqual(pet, Pet.example)
231230
} else {
232231
XCTFail("Expected Pet.example")
233232
}
@@ -237,7 +236,7 @@ final class VDTests: XCTestCase {
237236

238237
// Test schema
239238
_ = try body.value.schema(schemas: &schemas)
240-
XCTAssertNoDifference(
239+
XCTAssertEqual(
241240
schemas,
242241
[
243242
"Pet": .object(
@@ -254,7 +253,7 @@ final class VDTests: XCTestCase {
254253

255254
// Test parameters
256255
let params = try body.value.parameters(in: .query, schemas: &schemas)
257-
XCTAssertNoDifference(
256+
XCTAssertEqual(
258257
params,
259258
[
260259
.value(ParameterObject(name: "id", in: .query, required: true, schema: .string(format: .uuid), example: .string(Pet.example.id.uuidString))),
@@ -266,7 +265,7 @@ final class VDTests: XCTestCase {
266265

267266
// Test headers
268267
let headers = try body.value.headers(schemas: &schemas)
269-
XCTAssertNoDifference(
268+
XCTAssertEqual(
270269
headers,
271270
[
272271
"id": .value(HeaderObject(required: true, schema: .string(format: .uuid), example: .string(Pet.example.id.uuidString))),
@@ -278,8 +277,8 @@ final class VDTests: XCTestCase {
278277

279278
// Test media object
280279
let media = try body.value.mediaTypeObject(schemas: &schemas, examples: &examples)
281-
XCTAssertNoDifference(media, MediaTypeObject(schema: .ref(components: \.schemas, "Pet"), examples: ["Pet": .ref(components: \.examples, "Pet")]))
282-
XCTAssertNoDifference(examples, ["Pet": Pet.exampleObject])
280+
XCTAssertEqual(media, MediaTypeObject(schema: .ref(components: \.schemas, "Pet"), examples: ["Pet": .ref(components: \.examples, "Pet")]))
281+
XCTAssertEqual(examples, ["Pet": Pet.exampleObject])
283282
schemas = [:]
284283
examples = [:]
285284
}
@@ -290,13 +289,13 @@ final class VDTests: XCTestCase {
290289

291290
// Test schema
292291
let schema = try body.value.schema(schemas: &schemas)
293-
XCTAssertNoDifference(
292+
XCTAssertEqual(
294293
schema,
295294
.one(of:
296295
.ref(components: \.schemas, Pet.self),
297296
.ref(components: \.schemas, GroupDTO.self))
298297
)
299-
XCTAssertNoDifference(
298+
XCTAssertEqual(
300299
schemas,
301300
[
302301
"Pet": Pet.schema,
@@ -316,7 +315,7 @@ final class VDTests: XCTestCase {
316315
var schemas: ComponentsMap<SchemaObject> = [:]
317316
let parameters: OpenAPIParameters = .all(of: .type(Pet.self), .type(ErrorResponse.self))
318317
let params = try parameters.value.parameters(in: .query, schemas: &schemas)
319-
XCTAssertNoDifference(
318+
XCTAssertEqual(
320319
params,
321320
[
322321
.value(ParameterObject(name: "id", in: .query, required: true, schema: .string(format: .uuid), example: .string(Pet.example.id.uuidString))),
@@ -336,8 +335,8 @@ final class VDTests: XCTestCase {
336335
builder.post("test") { _ in "test" }
337336

338337
let openAPI = routes.openAPI(info: InfoObject(title: "Test", version: "1.0.0"))
339-
XCTAssertNoDifference(openAPI.tags, [tag])
340-
XCTAssertNoDifference(
338+
XCTAssertEqual(openAPI.tags, [tag])
339+
XCTAssertEqual(
341340
openAPI.paths?.value.values.flatMap { $0.object?.operations.values.flatMap { $0.tags ?? [] } ?? [] },
342341
[tag.name, tag.name]
343342
)
@@ -359,7 +358,7 @@ final class VDTests: XCTestCase {
359358
}
360359
} ?? []
361360

362-
XCTAssertNoDifference(
361+
XCTAssertEqual(
363362
responses,
364363
[[ResponsesObject.Key.notFound: ResponseObject(description: "Not found")]]
365364
)

0 commit comments

Comments
 (0)