Skip to content

Commit b0a87b0

Browse files
author
Jesse Haigh
committed
fix unit tests
1 parent 41175d9 commit b0a87b0

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

Sources/SwiftDocC/Model/Rendering/Content/RenderBlockContent.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ extension RenderBlockContent: Codable {
725725
syntax: container.decodeIfPresent(String.self, forKey: .syntax),
726726
code: container.decode([String].self, forKey: .code),
727727
metadata: container.decodeIfPresent(RenderContentMetadata.self, forKey: .metadata),
728-
copyToClipboard: container.decode(Bool.self, forKey: .copyToClipboard)
728+
copyToClipboard: container.decodeIfPresent(Bool.self, forKey: .copyToClipboard) ?? false
729729
))
730730
case .heading:
731731
self = try .heading(.init(level: container.decode(Int.self, forKey: .level), text: container.decode(String.self, forKey: .text), anchor: container.decodeIfPresent(String.self, forKey: .anchor)))
@@ -829,6 +829,7 @@ extension RenderBlockContent: Codable {
829829
try container.encode(l.syntax, forKey: .syntax)
830830
try container.encode(l.code, forKey: .code)
831831
try container.encodeIfPresent(l.metadata, forKey: .metadata)
832+
try container.encode(l.copyToClipboard, forKey: .copyToClipboard)
832833
case .heading(let h):
833834
try container.encode(h.level, forKey: .level)
834835
try container.encode(h.text, forKey: .text)

Tests/SwiftDocCTests/Model/RenderContentMetadataTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class RenderContentMetadataTests: XCTestCase {
5454
RenderInlineContent.text("Content"),
5555
])
5656

57-
let code = RenderBlockContent.codeListing(.init(syntax: nil, code: [], metadata: metadata))
57+
let code = RenderBlockContent.codeListing(.init(syntax: nil, code: [], metadata: metadata, copyToClipboard: false))
5858
let data = try JSONEncoder().encode(code)
5959
let roundtrip = try JSONDecoder().decode(RenderBlockContent.self, from: data)
6060

Tests/SwiftDocCTests/Model/RenderNodeSerializationTests.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class RenderNodeSerializationTests: XCTestCase {
4444
.strong(inlineContent: [.text("Project > Run")]),
4545
.text(" menu item, or the following code:"),
4646
])),
47-
.codeListing(.init(syntax: "swift", code: ["xcrun xcodebuild -h", "xcrun xcodebuild build -configuration Debug"], metadata: nil)),
47+
.codeListing(.init(syntax: "swift", code: ["xcrun xcodebuild -h", "xcrun xcodebuild build -configuration Debug"], metadata: nil, copyToClipboard: false)),
4848
]))
4949
]
5050

@@ -71,16 +71,16 @@ class RenderNodeSerializationTests: XCTestCase {
7171
let assessment1 = TutorialAssessmentsRenderSection.Assessment(title: [.paragraph(.init(inlineContent: [.text("Lorem ipsum dolor sit amet?")]))],
7272
content: nil,
7373
choices: [
74-
.init(content: [.codeListing(.init(syntax: "swift", code: ["override func viewDidLoad() {", "super.viewDidLoad()", "}"], metadata: nil))], isCorrect: true, justification: [.paragraph(.init(inlineContent: [.text("It's correct because...")]))], reaction: "That's right!"),
75-
.init(content: [.codeListing(.init(syntax: "swift", code: ["sceneView.delegate = self"], metadata: nil))], isCorrect: false, justification: [.paragraph(.init(inlineContent: [.text("It's incorrect because...")]))], reaction: "Not quite."),
74+
.init(content: [.codeListing(.init(syntax: "swift", code: ["override func viewDidLoad() {", "super.viewDidLoad()", "}"], metadata: nil, copyToClipboard: false))], isCorrect: true, justification: [.paragraph(.init(inlineContent: [.text("It's correct because...")]))], reaction: "That's right!"),
75+
.init(content: [.codeListing(.init(syntax: "swift", code: ["sceneView.delegate = self"], metadata: nil, copyToClipboard: false))], isCorrect: false, justification: [.paragraph(.init(inlineContent: [.text("It's incorrect because...")]))], reaction: "Not quite."),
7676
.init(content: [.paragraph(.init(inlineContent: [.text("None of the above.")]))], isCorrect: false, justification: [.paragraph(.init(inlineContent: [.text("It's incorrect because...")]))], reaction: nil),
7777
])
7878

7979
let assessment2 = TutorialAssessmentsRenderSection.Assessment(title: [.paragraph(.init(inlineContent: [.text("Duis aute irure dolor in reprehenderit?")]))],
8080
content: [.paragraph(.init(inlineContent: [.text("What is the airspeed velocity of an unladen swallow?")]))],
8181
choices: [
82-
.init(content: [.codeListing(.init(syntax: "swift", code: ["super.viewWillAppear()"], metadata: nil))], isCorrect: true, justification: [.paragraph(.init(inlineContent: [.text("It's correct because...")]))], reaction: "Correct."),
83-
.init(content: [.codeListing(.init(syntax: "swift", code: ["sceneView.delegate = self"], metadata: nil))], isCorrect: true, justification: [.paragraph(.init(inlineContent: [.text("It's correct because...")]))], reaction: "Yep."),
82+
.init(content: [.codeListing(.init(syntax: "swift", code: ["super.viewWillAppear()"], metadata: nil, copyToClipboard: false))], isCorrect: true, justification: [.paragraph(.init(inlineContent: [.text("It's correct because...")]))], reaction: "Correct."),
83+
.init(content: [.codeListing(.init(syntax: "swift", code: ["sceneView.delegate = self"], metadata: nil, copyToClipboard: false))], isCorrect: true, justification: [.paragraph(.init(inlineContent: [.text("It's correct because...")]))], reaction: "Yep."),
8484
.init(content: [.paragraph(.init(inlineContent: [.text("None of the above.")]))], isCorrect: false, justification: [.paragraph(.init(inlineContent: [.text("It's incorrect because...")]))], reaction: "Close!"),
8585
])
8686

Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ class ListItemExtractorTests: XCTestCase {
514514
// ```
515515
// Inner code block
516516
// ```
517-
.codeListing(.init(syntax: nil, code: ["Inner code block"], metadata: nil)),
517+
.codeListing(.init(syntax: nil, code: ["Inner code block"], metadata: nil, copyToClipboard: false)),
518518

519519
// > Warning: Inner aside, with ``ThirdNotFoundSymbol`` link
520520
.aside(.init(style: .init(asideKind: .warning), content: [

0 commit comments

Comments
 (0)