Merge branch 'pr/343'

src/clj_http/client.clj

@@ -218,9 +218,10 @@
     resp
     (if (false? (opt req :throw-exceptions))
       resp
-      (if (opt req :throw-entire-message)
-        (throw+ resp "clj-http: status %d %s" (:status %) resp)
-        (throw+ resp "clj-http: status %s" (:status %))))))
+      (let [data (assoc resp :type ::unexceptional-status)]
+        (if (opt req :throw-entire-message)
+          (throw+ data "clj-http: status %d %s" (:status %) resp)
+          (throw+ data "clj-http: status %s" (:status %)))))))
 
 (defn wrap-exceptions
   "Middleware that throws a slingshot exception if the response is not a

test/clj_http/test/client_test.clj

@@ -9,7 +9,8 @@
             [clojure.test :refer :all]
             [cognitect.transit :as transit]
             [ring.util.codec :refer [form-decode-str]]
-            [ring.middleware.nested-params :refer [parse-nested-keys]])
+            [ring.middleware.nested-params :refer [parse-nested-keys]]
+            [slingshot.slingshot :refer [try+]])
   (:import (java.net UnknownHostException)
            (java.io ByteArrayInputStream)
            (org.apache.http HttpEntity)))
@@ -496,6 +497,16 @@
     (is (thrown-with-msg? Exception #":body"
                           (e-client {:throw-entire-message? true})))))
 
+(deftest throw-type-field
+  (let [client (fn [req] {:status 500})
+        e-client (client/wrap-exceptions client)]
+    (try+
+     (e-client {})
+     (catch [:type :clj-http.client/unexceptional-status] _
+       (is true))
+     (catch Object _
+       (is false ":type selector was not caught.")))))
+
 (deftest throw-on-exceptional-async
   (let [client (fn [req respond raise]
                  (try