swiftstencil/swiftpm-stencil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure the "for" iteration over a dictionary is consistent

Browse Source
This commit is contained in:
David Jennes
2018-09-20 02:59:00 +02:00
parent 275e583e4a
commit fce4e85a63
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/ForTag.swift
View File

@@ -93,7 +93,7 @@ class ForNode : NodeType {
var values: [Any] var values: [Any]
if let dictionary = resolved as? [String: Any], !dictionary.isEmpty { if let dictionary = resolved as? [String: Any], !dictionary.isEmpty {
values = dictionary.map { ($0.key, $0.value) } values = dictionary.sorted { $0.key < $1.key }
} else if let array = resolved as? [Any] { } else if let array = resolved as? [Any] {
values = array values = array
} else if let range = resolved as? CountableClosedRange<Int> { } else if let range = resolved as? CountableClosedRange<Int> {

16
Tests/StencilTests/ForNodeSpec.swift
View File

@@ -209,8 +209,9 @@ func testForNode() {
let template = Template(templateString: templateString) let template = Template(templateString: templateString)
let result = try template.render(context) let result = try template.render(context)
let sortedResult = result.split(separator: ",").map(String.init).sorted(by: <) try expect(result) == """
try expect(sortedResult) == ["one: I", "two: II"] one: I,two: II,
"""
} }
$0.it("renders supports iterating over dictionary") { $0.it("renders supports iterating over dictionary") {
@@ -222,8 +223,9 @@ func testForNode() {
let node = ForNode(resolvable: Variable("dict"), loopVariables: ["key"], nodes: nodes, emptyNodes: emptyNodes, where: nil) let node = ForNode(resolvable: Variable("dict"), loopVariables: ["key"], nodes: nodes, emptyNodes: emptyNodes, where: nil)
let result = try node.render(context) let result = try node.render(context)
let sortedResult = result.split(separator: ",").map(String.init).sorted(by: <) try expect(result) == """
try expect(sortedResult) == ["one", "two"] one,two,
"""
} }
$0.it("renders supports iterating over dictionary") { $0.it("renders supports iterating over dictionary") {
@@ -235,11 +237,11 @@ func testForNode() {
] ]
let emptyNodes: [NodeType] = [TextNode(text: "empty")] let emptyNodes: [NodeType] = [TextNode(text: "empty")]
let node = ForNode(resolvable: Variable("dict"), loopVariables: ["key", "value"], nodes: nodes, emptyNodes: emptyNodes, where: nil) let node = ForNode(resolvable: Variable("dict"), loopVariables: ["key", "value"], nodes: nodes, emptyNodes: emptyNodes, where: nil)
let result = try node.render(context) let result = try node.render(context)
let sortedResult = result.split(separator: ",").map(String.init).sorted(by: <) try expect(result) == """
try expect(sortedResult) == ["one=I", "two=II"] one=I,two=II,
"""
} }
$0.it("handles invalid input") { $0.it("handles invalid input") {