1 files changed, 38 insertions, 16 deletions
diff --git a/tests/typ/control/for.typ b/tests/typ/control/for.typ
index 294345b5..36bce447 100644
--- a/tests/typ/control/for.typ
+++ b/tests/typ/control/for.typ
@@ -1,11 +1,10 @@
 // Test for loops.
-// Ref: false
 
 ---
-// Array.
-
-#for x in () {}
+// Empty array.
+#for x in () [Nope]
 
+// Array.
 #let sum = 0
 #for x in (1, 2, 3, 4, 5) {
     sum += x
@@ -13,14 +12,12 @@
 
 #test(sum, 15)
 
----
-// Dictionary.
-// Ref: true
-(\ #for k, v in (name: "Typst", age: 2) [
-    #h(0.5cm) {k}: {v}, \
-])
+// Dictionary is not traversed in insertion order.
+// Should output `age: 1, name: Typst,`.
+#for k, v in (name: "Typst", age: 2) [
+    {k}: {v}, \
+]
 
----
 // String.
 {
     let out = ""
@@ -36,6 +33,33 @@
 }
 
 ---
+// Block body.
+// Should output `[1st, 2nd, 3rd, 4th, 5th, 6th]`.
+{
+    "[" + for v in (1, 2, 3, 4, 5, 6) {
+        (if v > 1 [, ]
+            + [{v}]
+            + if v == 1 [st]
+            + if v == 2 [nd]
+            + if v == 3 [rd]
+            + if v >= 4 [th])
+     } + "]"
+}
+
+// Template body.
+// Should output `234`.
+#for v in (1, 2, 3, 4, 5, 6, 7) [#if v >= 2 and v <= 5 { repr(v) }]
+
+---
+// Value of for loops.
+// Ref: false
+#test(type(for v in () {}), "template")
+#test(type(for v in () []), "template")
+
+---
+// Error: 14-19 unknown variable
+#let error = error
+
 // Uniterable expression.
 // Error: 11-15 cannot loop over boolean
 #for v in true {}
@@ -44,9 +68,7 @@
 // Error: 11-18 cannot add integer and string
 #for v in 1 + "2" {}
 
-// Error: 14-17 cannot apply '-' to string
-#let error = -""
-#let result = for v in (1, 2, 3) {
+// A single error stops iteration.
+#test(error, for v in (1, 2, 3) {
     if v < 2 [Ok] else {error}
-}
-#test(result, error)
+})