Fixed tests

weavejester · Sep 12, 2010 · 583236e · 583236e
1 parent cd6876b
commit 583236e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/compojure/core.clj b/src/compojure/core.clj
@@ -61,7 +61,7 @@
          (if-let [route-params# (route-matches route# request#)]
            (let [request# (#'assoc-route-params request# route-params#)]
              (bind-request request# ~bindings
-               (render request# (do ~@body)))))))))
+               (render (do ~@body) request#))))))))
 
 (defn routes
   "Create a Ring handler by combining several handlers into one."

diff --git a/test/compojure/test/response.clj b/test/compojure/test/response.clj
@@ -3,21 +3,21 @@
   (:require [compojure.response :as response]))
 
 (deftest response-with-nil
-  (is (nil? (response/render {} nil))))
+  (is (nil? (response/render nil {}))))
 
 (def test-response
   {:status  200
    :headers {"Content-Type" "text/html"}
    :body    "<h1>Foo</h1>"})
 
 (deftest response-with-string
-  (is (= (response/render {} "<h1>Foo</h1>")
+  (is (= (response/render "<h1>Foo</h1>" {})
          test-response)))
 
 (deftest response-with-fn
-  (is (= (response/render {} (constantly test-response))
+  (is (= (response/render (constantly test-response) {})
          test-response)))
 
 (deftest response-with-deref
-  (is (= (response/render {} (future test-response))
+  (is (= (response/render (future test-response) {})
          test-response)))