Html formatter do output

Author: Aitem

.gitignore

@@ -1,5 +1,6 @@
 target
 .cpcache
+output/*
 core
 classes
 pom.xml

src/stresty/core.clj

@@ -37,7 +37,7 @@
       (prn "---------------------------------------------")
       (-main "--path=/Users/aitem/Work/HS/ssty/t" "--format=stdout" "--ns=rmis" "tests")
       (prn "---------------------------------------------")
-      (def p (-main "--path=/Users/aitem/Work/HS/ssty/t" "--format=report" "--ns=rmis" "tests"))
+      (def p (-main "--path=/Users/aitem/Work/HS/ssty/t" "--format=report" "--output=output" "--ns=rmis" "tests"))
       ))
 
   (def ctx (-main "server" "--port=8888"))

src/stresty/format/core.clj

@@ -22,7 +22,7 @@
                     (merge-with concat acc)))
              {} (:result @ztx))]
 
-    (println "\nSummary:"
+    (str "\nSummary:"
              (count cases) "cases,"
              steps "steps,"
              (count (:error res)) "error,"
@@ -109,7 +109,7 @@
 
 
       (= tp 'sty/tests-summary)
-      (summary ztx)
+      (println (summary ztx))
 
 
       (= tp 'sty.http/request)

src/stresty/format/report.clj

@@ -1,54 +1,78 @@
 (ns stresty.format.report
   (:require [stresty.format.core :as fmt]
+            [hiccup.core :as hiccup]
             [clojure.string :as str]))
 
+(defn report-layout [body]
+  [:html
+   [:head
+    [:meta {:charset "utf-8"}]
+    [:meta {:content "width=device-width, initial-scale=1, shrink-to-fit=no" :name "viewport"}]
+    [:meta {:content "Stresty test report", :name "description"}]
+    [:meta {:content "HealthSamurai", :name "author"}]
+    [:title "Stresty test report"]
+    [:link  {:href "https://unpkg.com/tailwindcss@^2/dist/tailwind.min.css" :rel "stylesheet"}]]
+   [:body body]])
+
 (defmethod fmt/do-format
   'sty/report-fmt
   [ztx _ state {tp :type ts :ts :as event}]
-  (cond
-    (= tp 'sty/on-tests-start)
-    (swap! state assoc :start ts)
+  (let [b #(swap! state update :body conj  %)]
+    (when-not (:body @state)
+      (swap! state assoc :body [:div.content]))
+    (cond
+      (= tp 'sty/on-tests-start)
+      (do (swap! state assoc :start ts)
+          (b  [:div [:b "Start"]]))
+
+      (= tp 'sty/on-zen-errors)
+      (do
+        (println "Syntax errors:")
+        (println (str/join "\n"
+                           (->>
+                            (:errors event)
+                            (mapv (fn [{msg :message res :resource pth :path}]
+                                    (str ">> " msg " in " res " at " pth)))))))
+
+      (= tp 'sty/on-env-start)
+      (print (get-in event [:env :zen/name]) "{")
+
+      (= tp 'sty/on-case-start)
+      (b [:div [:h2 (or (get-in event [:case :title])
+                        (get-in event [:case :zen/name]))]] )
+
 
-    (= tp 'sty/on-zen-errors)
-    (do
-      (println "Syntax errors:")
-      (println (str/join "\n"
-                         (->>
-                          (:errors event)
-                          (mapv (fn [{msg :message res :resource pth :path}]
-                                  (str ">> " msg " in " res " at " pth)))))))
 
-    (= tp 'sty/on-env-start)
-    (print (get-in event [:env :zen/name]) "{")
+      (= tp 'sty.http/request)
+      (b [:div [:b (str tp (:method event) (:url event) (dissoc event :method :url :type :ts))]])
 
-    (= tp 'sty/on-case-start)
-    (print "(")
 
-    (= tp 'sty/on-step-start)
-    :nop
+      (= tp 'sty/on-step-start)
+      :nop
 
-    (tp (set ['sty/on-step-success 'sty/on-match-ok]))
-    (print ".")
+      (tp (set ['sty/on-step-success 'sty/on-match-ok]))
+      (print ".")
 
-    (tp (set ['sty/on-step-fail 'sty/on-match-fail]))
-    (print "x")
+      (tp (set ['sty/on-step-fail 'sty/on-match-fail]))
+      (print "x")
 
-    ;;(= tp 'sty/tests-summary)
-    ;;(summary ztx)
+      (= tp 'sty/tests-summary)
+      [:div  (fmt/summary ztx)]
 
-    (= tp 'sty/on-step-exception)
-    (print "!")
+      (= tp 'sty/on-step-exception)
+      (print "!")
 
-    (= tp 'sty/on-case-end)
-    (print ")")
+      (= tp 'sty/on-case-end)
+      (print ")")
 
-    (= tp 'sty/on-env-end)
-    (print "}\n")
+      (= tp 'sty/on-env-end)
+      (print "}\n")
 
 
-    (= tp 'sty/tests-done)
-    (print "done \n")
+      (= tp 'sty/tests-done)
+      (do (b  [:div [:b "End"]])
+          (spit "output/index.html" (hiccup/html  (report-layout (:body @state)))))
 
-    )
+      ))
 
   )

src/stresty/operations/core.clj

@@ -102,7 +102,8 @@
   (fmt/emit ztx {:type 'sty/on-env-end :env env}))
 
 (defmethod call-op 'sty/run-tests
-  [ztx op {params :params}]
+  [ztx op {params :params :as p}]
+  (fmt/emit ztx {:type 'sty/on-tests-start})
   (doseq [env-ref (zen/get-tag ztx 'sty/env)]
     (let [env (zen/get-symbol ztx env-ref)]
       (run-env ztx env)))