Merge commit '39a9d2279ea422e203b5359c11b050098e8ca90a' into aykuznet…

…sova/use-custom-handle-error
ngrunwald · Mar 27, 2015 · 51ab1a4 · 51ab1a4
2 parents db33a63 + 39a9d22
commit 51ab1a4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/ring/middleware/format_params.clj b/src/ring/middleware/format_params.clj
@@ -128,7 +128,7 @@
                       :predicate predicate
                       :decoder decoder
                       :charset charset
-                      :handle-error default-handle-error))
+                      :handle-error handle-error))
 
 (defn wrap-json-kw-params
   "Handles body params in JSON format. Parses map keys as keywords.
@@ -142,7 +142,7 @@
                       :predicate predicate
                       :decoder (fn [struct] (decoder struct true))
                       :charset charset
-                      :handle-error default-handle-error))
+                      :handle-error handle-error))
 
 (def ^:no-doc yaml-request?
   (make-type-request-pred #"^(application|text)/(vnd.+)?(x-)?yaml"))

diff --git a/test/ring/middleware/format_params_test.clj b/test/ring/middleware/format_params_test.clj
@@ -165,3 +165,15 @@
     (fn [request]
       (is (nil? (:body request)))))
    {:body nil}))
+
+(deftest test-custom-handle-error
+  (are [format content-type body]
+    (let [req {:body body
+               :content-type content-type}
+          resp ((wrap-restful-params identity
+                                     :formats [format]
+                                     :handle-error (constantly {:status 999}))
+                req)]
+      (= 999 (:status resp)))
+    :json "application/json" "{:a 1}"
+    :edn "application/edn" "{\"a\": 1}"))