WIP on supporting client/*

Author: KingMob

test/aleph/http/clj_http/client_test.clj

@@ -26,7 +26,7 @@
    :server-name "localhost"
    :server-port 18080})
 
-(def request (make-request #'client/request {:using-middleware? true}))
+(def request (make-request client/request {:using-middleware? true}))
 
 (defn parse-form-params [s]
   (->> (str/split (form-decode-str s) #"&")

test/aleph/http/clj_http/core_test.clj

@@ -156,7 +156,13 @@
    :server-name "localhost"
    :server-port 18080})
 
-(def request (make-request #'core/request {:using-middleware? false}))
+
+(def request (make-request core/request {:using-middleware? false}))
+
+(use-fixtures :once
+              (fn [f]
+                (binding [client/request (make-request client/request {:using-middleware? true})]
+                  (f))))
 
 (defn slurp-body [req]
   (slurp (:body req)))

test/aleph/http/clj_http/util.clj

@@ -28,9 +28,10 @@
 (defn header-keys
   "Returns a set of headers of interest"
   [m]
-  (-> (apply dissoc m ignored-headers)
-      (keys)
-      (set)))
+  (->> (apply dissoc m ignored-headers)
+       (keys)
+       (map str/lower-case)
+       (set)))
 
 (defn is-headers=
   "Are the two header maps equal?
@@ -71,9 +72,15 @@
                 (.close clj-http-body)
                 (proxy-super close))))))
 
-      (do
-        (is (bs/bytes= clj-http-body aleph-body))
-        clj-http-body))
+      (try
+        (do
+          (is (bs/bytes= clj-http-body aleph-body))
+          clj-http-body)
+        (catch Exception e
+          (println "clj-http body class: " (class clj-http-body))
+          (prn clj-http-body)
+          (flush)
+          (throw e))))
     (do
       (is (= clj-http-body aleph-body))
       clj-http-body)))
@@ -170,6 +177,7 @@
              aleph-resp @(http/request aleph-ring-map)]
          (is (= (:status clj-http-resp) (:status aleph-resp)))
 
+         (prn aleph-resp)
 
          #_(when (not= (:status clj-http-resp) (:status aleph-resp))
            (println "clj-http req:")