From 9efa5bf2df044561c328e5ead8f2d2a8e3f0bcd4 Mon Sep 17 00:00:00 2001
From: Josha von Gizycki <josha.von.gizycki@triology.de>
Date: Mon, 24 Sep 2018 16:53:21 +0200
Subject: [PATCH] add tests for valid?

---
 src/wanijo/framework/form.clj       | 10 ++++---
 test/wanijo/framework/form_test.clj | 42 ++++++++++++++++++++++++-----
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/wanijo/framework/form.clj b/src/wanijo/framework/form.clj
index e990af4..885cc38 100644
--- a/src/wanijo/framework/form.clj
+++ b/src/wanijo/framework/form.clj
@@ -69,13 +69,15 @@
                           field-value)))
 
 (defn valid? [form-def req]
-  {:pre [(spec/valid? ::form form-def)]}
+  {:pre [(spec/assert ::form form-def)]}
   (reduce-kv
    (fn [result field value]
      (if-let [field-spec (get-in form-def [:fields field :spec])]
-       (if (spec/valid? field-spec value)
-         true
-         (reduced false))
+       (let [from-req (get-in form-def [:fields field :from-req])
+             check-value (if from-req (from-req value) value)]
+         (if (spec/valid? field-spec check-value)
+           true
+           (reduced false)))
        result))
    true
    (:params req)))
diff --git a/test/wanijo/framework/form_test.clj b/test/wanijo/framework/form_test.clj
index cd9e043..8b17e9e 100644
--- a/test/wanijo/framework/form_test.clj
+++ b/test/wanijo/framework/form_test.clj
@@ -1,6 +1,7 @@
 (ns wanijo.framework.form-test
   (:require [clojure.test :refer :all]
-            [wanijo.framework.form :refer [form-data]]))
+            [wanijo.framework.form :refer [form-data valid?]]
+            [clojure.spec.alpha :as spec]))
 
 (deftest test-form-data
   (testing "no from-req is given"
@@ -20,10 +21,39 @@
              (form-data def {:params {}})))
       (is (= {:name "fooa"}
              (form-data def {:params {:name "a"}})))))
+  (testing "from-req is given in one field, not in another"
+    (let [def {:fields {:foo {:label ""
+                              :spec number?
+                              :from-req bigint}
+                        :bar {:label ""
+                              :spec string?}}}]
+      (is (= {:foo 5
+              :bar "a"}
+             (form-data def {:params {:foo "5"
+                                      :bar "a"}})))))
   (testing "type conversion"
+    (let [def {:fields {:foo {:label ""
+                              :required false
+                              :spec :a
+                              :from-req bigint}}}]
+      (is (= {:foo 5}
+             (form-data def {:params {:foo 5}}))))))
+
+(deftest test-valid?
+  (testing "required-key does not change validity of the form"
     (let [def {:fields {:name {:label ""
-                               :required false
-                               :spec :a
-                               :from-req bigint}}}]
-      (is (= {:name 5}
-             (form-data def {:params {:name 5}}))))))
+                               :spec nil?
+                               :required true}}}]
+      (is (= true (valid? def {:params {:name nil}}))))
+    (let [def {:fields {:name {:label ""
+                               :spec nil?
+                               :required false}}}]
+      (is (= true (valid? def {:params {:name nil}})))))
+  (testing "converted values are passed to spec"
+    (let [def {:fields {:foo {:label ""
+                              :spec number?
+                              :from-req bigint}
+                        :bar {:label ""
+                              :spec string?}}}]
+      (is (= true (valid? def {:params {:foo "5"
+                                        :bar "a"}}))))))