refactoring signup

src/guestbook/signup/core.clj

@@ -37,22 +37,20 @@
   (= 1 (count (db/check-user-exists params))))
 
 (defn validate-signup [params]
-  {:has-captcha-error (not (recaptcha-valid? (:g-recaptcha-response params)))
-   :has-field-errors (validate-user params)
-   :duplicated-name (duplicated-name? params)})
+  (let [errors {:has-captcha-error (not (recaptcha-valid? (:g-recaptcha-response params)))
+                :has-field-errors (validate-user params)
+                :duplicated-name (duplicated-name? params)}]
+    (if (or (:has-captcha-error errors)
+            (:has-field-errors errors)
+            (:duplicated-name errors))
+      errors)))
 
 (defn save-user! [params]
   (do (db/save-user! (assoc params :facebookid "" :timestamp (Date.)))
       (redirect "/login")))
 
 (defn signup!
   ([{:keys [params]}]
-   (signup! (validate-signup params)
-            params))
-
-  ([errors  params]
-   (if (or (:has-captcha-error errors)
-           (:has-field-errors errors)
-           (:duplicated-name errors))
+   (if-let [errors (validate-signup params)]
      (redirect-errors errors params)
      (save-user! params))))

test/guestbook/test/signup/core.clj

@@ -49,7 +49,12 @@
     #(is (= {:has-captcha-error false
              :has-field-errors {}
              :duplicated-name true}
-            (validate-signup :any)))))
+            (validate-signup :any))))
+  (with-redefs-fn
+    {#'guestbook.signup.core/recaptcha-valid? (fn [_] true)
+     #'guestbook.signup.core/validate-user (fn [_] nil)
+     #'guestbook.signup.core/duplicated-name? (fn [_] false)}
+    #(is (nil? (validate-signup :any)))))