Skip to content

Commit de96c22

Browse files
committed
Sort JSON keys so test passes on both macOS and Linux
1 parent 3294c84 commit de96c22

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Sources/App/Views/ReadyForSwift6/ReadyForSwift6Show+Model.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ private extension ReadyForSwift6Show.Model.ChartKind {
7777
private extension Data {
7878
func compactJson() -> String? {
7979
guard let json = try? JSONSerialization.jsonObject(with: self),
80-
let compactedJsonData = try? JSONSerialization.data(withJSONObject: json),
80+
let compactedJsonData = try? JSONSerialization.data(withJSONObject: json, options: [.sortedKeys]),
8181
let compactJson = String(data: compactedJsonData, encoding: .utf8)
8282
else { return nil }
8383
return compactJson

Tests/AppTests/__Snapshots__/WebpageSnapshotTests/test_ReadyForSwift6Show.1.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ <h2>Ready for Swift 6</h2>
9191
<h3 id="total-zero-errors">Total packages with Swift 6 zero data race safety errors</h3>
9292
<p>This chart shows packages with zero data race safety compiler diagnostics during a successful build on at least one tested platform.</p>
9393
<div data-controller="vega-chart" data-vega-chart-class-value="CompatiblePackagesChart" data-include-totals="true">
94-
<script data-vega-chart-target="plotData" type="application/json">[{"id":"all","name":"All packages","total":3395,"values":[{"toolchainLabel":"Swift 6.0 Development Snapshot 2024-04-22 (a)","value":1295,"toolchainId":"org.swift.600202404221a","date":"2024-05-04"}]}]</script>
94+
<script data-vega-chart-target="plotData" type="application/json">[{"id":"all","name":"All packages","total":3395,"values":[{"date":"2024-05-04","toolchainId":"org.swift.600202404221a","toolchainLabel":"Swift 6.0 Development Snapshot 2024-04-22 (a)","value":1295}]}]</script>
9595
<script data-vega-chart-target="eventData" type="application/json">[{"date":"2024-06-10","value":"Xcode 16 beta 1 released at WWDC '24"}]</script>
9696
</div>
9797
<h3 id="total-errors">Total Swift 6 data race safety errors</h3>
9898
<p>This chart shows the total number of all data race safety diagnostics across
9999
<em>all</em> packages.
100100
</p>
101101
<div data-controller="vega-chart" data-vega-chart-class-value="TotalErrorsChart" data-include-totals="false">
102-
<script data-vega-chart-target="plotData" type="application/json">[{"id":"all","name":"All packages","total":3395,"values":[{"toolchainLabel":"Swift 6.0 Development Snapshot 2024-04-22 (a)","value":56911,"toolchainId":"org.swift.600202404221a","date":"2024-05-04"}]}]</script>
102+
<script data-vega-chart-target="plotData" type="application/json">[{"id":"all","name":"All packages","total":3395,"values":[{"date":"2024-05-04","toolchainId":"org.swift.600202404221a","toolchainLabel":"Swift 6.0 Development Snapshot 2024-04-22 (a)","value":56911}]}]</script>
103103
<script data-vega-chart-target="eventData" type="application/json">[{"date":"2024-06-10","value":"Xcode 16 beta 1 released at WWDC '24"}]</script>
104104
</div>
105105
<h3 id="faq">Frequently asked questions</h3>

0 commit comments

Comments
 (0)