Skip to content

Fix issue #257 #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2016
Merged

Fix issue #257 #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix issue #257 
This commit checks if the body is empty during clojure coercion.
If it's empty, the body is set to nil. Previously, the test assumed
the body would return as an empty string but the expected behavior
per the convo in the issue is that nil should be returned.
  • Loading branch information
@palquel
palquel committed Apr 16, 2016
commit f28fa884f397216fab0f4a204d1b737e74c0c9fd
11 changes: 6 additions & 5 deletions src/clj_http/client.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,11 +346,12 @@
(defn coerce-clojure-body
[request {:keys [body] :as resp}]
(let [^String charset (or (-> resp :content-type-params :charset) "UTF-8")
body (util/force-byte-array body)]
(if edn-enabled?
(assoc resp :body (parse-edn (String. ^"[B" body charset)))
(binding [*read-eval* false]
(assoc resp :body (read-string (String. ^"[B" body charset)))))))
body (util/force-byte-array body)]
(assoc resp :body (cond
(empty? body) nil
edn-enabled? (parse-edn (String. ^"[B" body charset))
:else (binding [*read-eval* false]
(read-string (String. ^"[B" body charset)))))))

(defn coerce-transit-body
[{:keys [transit-opts] :as request} {:keys [body] :as resp} type]
Expand Down
9 changes: 4 additions & 5 deletions test/clj_http/test/core_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,8 +565,7 @@
(run-server)
(client/request {:method :get :url (localhost "/get") :headers {"foo" 2}}))

;; Currently failing, see: https://github.com/dakrone/clj-http/issues/257
;; (deftest ^:integration t-empty-response-coercion
;; (run-server)
;; (let [resp (client/get (localhost "/empty") {:as :clojure})]
;; (is (= (:body resp) ""))))
(deftest ^:integration t-empty-response-coercion
(run-server)
(let [resp (client/get (localhost "/empty") {:as :clojure})]
(is (= (:body resp) nil))))