Fix metosin#56 use :key-fn in wrap-json-kw-params

lotuc · Mar 12, 2016 · 8976b28 · 8976b28
1 parent 6f7098c
commit 8976b28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/ring/middleware/format_params.clj b/src/ring/middleware/format_params.clj
@@ -144,7 +144,7 @@
   (let [{:keys [predicate decoder options] :as opts} (impl/extract-options args)]
     (wrap-format-params handler (assoc opts
                                        :predicate (or predicate json-request?)
-                                       :decoder (or decoder (make-json-decoder (assoc options :key-fn true)))))))
+                                       :decoder (or decoder (make-json-decoder (merge {:key-fn true} options)))))))
 
 (def ^:no-doc msgpack-request?
   (make-type-request-pred #"^application/(vnd.+)?(x-)?msgpack"))

diff --git a/test/ring/middleware/format_params_test.clj b/test/ring/middleware/format_params_test.clj
@@ -51,6 +51,10 @@
          (:body-params ((wrap-json-params identity {:options {:key-fn key-fn}})
                         {:content-type "application/json"
                          :body (stream "{\"foo_bar\":\"bar\"}")}))))
+  (is (= {:foo-bar "bar"}
+         (:body-params ((wrap-json-kw-params identity {:options {:key-fn key-fn}})
+                        {:content-type "application/json"
+                         :body (stream "{\"foo_bar\":\"bar\"}")}))))
   (is (= {:foo-bar "bar"}
          (:body-params ((wrap-restful-params identity {:format-options {:json {:key-fn key-fn}}})
                         {:content-type "application/json"