Change order of operations (#823)

Author: ErikSchierboom

exercises/practice/atbash-cipher/.meta/generator.clj

@@ -1,5 +1,4 @@
 (ns atbash-cipher-generator)
 
 (defn update-test-case [test-case]
-  (-> test-case
-      (update :path #(take-last 1 %))))
+  (assoc test-case :context (:description test-case)))

exercises/practice/difference-of-squares/.meta/generator.clj

@@ -1,4 +1,4 @@
 (ns difference-of-squares-generator)
 
 (defn update-test-case [test-case]
-  (update test-case :path #(take-last 1 %)))
+  (assoc test-case :context (:description test-case)))

exercises/practice/dnd-character/.meta/generator.clj

@@ -1,19 +1,20 @@
 (ns dnd-character-generator
-  (:require [hbs.helper :refer [safe-str]]))
+  (:require [hbs.helper :refer [safe-str]]
+            [clojure.string :as str]))
 
 (def random-abilities [:strength :dexterity :charisma :wisdom :intelligence :constitution])
 
 (defn- expand-character-test-case [test-case]
   (map
    (fn [ability]
      (-> test-case
-         (update :path #(conj % (name ability)))
+         (assoc :context (str/join " ▶ " (conj (:path test-case) (name ability))))
          (assoc :ability (safe-str (str ability))))) random-abilities))
 
 (defn- expand-test-case [test-case]
   (case (:property test-case)
     "character" (expand-character-test-case test-case)
-    "modifier" [(update test-case :path #(take-last 1 %))]
+    "modifier" [(assoc test-case :context (:description test-case))]
     [test-case]))
 
 (defn add-remove-test-cases [test-cases]

exercises/practice/grains/.meta/generator.clj

@@ -8,4 +8,4 @@
 (defn update-test-case [test-case]
   (-> test-case
       (update :expected update-expected)
-      (update :path #(take-last 1 %))))
+      (assoc :context (:description test-case))))

generators/src/templates.clj

@@ -36,12 +36,14 @@
        (map #(-> % (.getParentFile) (.getParentFile) (.getName)))
        (into (sorted-set))))
 
-(defn- test-case->data [idx node]
+(defn- pre-process-test-case [node]
+  (assoc node :context (str/join " ▶ " (:path node))))
+
+(defn- post-process-test-case [idx node]
   (-> node
       (assoc :idx (inc idx)
-             :context (str/join " ▶ " (:path node))
              :error (get-in node [:expected :error]))
-      (dissoc :reimplements :comments :scenarios)))
+      (dissoc :reimplements :comments)))
 
 (defn- add-remove-test-cases [generator-ns test-cases]
   (if-let [add-remove-test-cases-fn (ns-resolve generator-ns (symbol "add-remove-test-cases"))]
@@ -64,9 +66,10 @@
       test-cases)))
 
 (defn- test-cases->data [slug test-cases]
-  (let [transformed (transform slug test-cases)
+  (let [augmented (map pre-process-test-case test-cases)
+        transformed (transform slug augmented)
         grouped (group-by :property transformed)
-        data (update-vals grouped #(map-indexed test-case->data %))]
+        data (update-vals grouped #(map-indexed post-process-test-case %))]
     {:test_cases data}))
 
 (defn template [slug]