Fixed bug in assoc-session when used by ->

stuartsierra · Jun 22, 2009 · 4a2079d · 4a2079d
1 parent 542c423
commit 4a2079d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/compojure/http/session.clj b/src/compojure/http/session.clj
@@ -159,7 +159,7 @@
 
 (defn assoc-session
   "Associate the session with the request."
-  [repository request]
+  [request repository]
   (if-let [session (get-session repository request)]
     (if (session-expired? session)
       (do

diff --git a/test/compojure/http/session.clj b/test/compojure/http/session.clj
@@ -57,19 +57,19 @@
   {:id :current})
 
 (deftest assoc-nil-session
-  (let [request (assoc-session {:type ::mock} {})]
+  (let [request (assoc-session {} {:type ::mock})]
     (is (:new-session? request))
     (is (= (:session request) {:id :new}))))
 
 (deftest assoc-expired-session
   (let [session {:expires-at (timestamp-after 0)}
-        request (assoc-session {:type ::mock} {:session session})]
+        request (assoc-session {:session session} {:type ::mock})]
     (is (:new-session? request))
     (is (= (:session request) {:id :new}))))
 
 (deftest assoc-existing-session
   (let [cookies {:compojure-session "current"}
-        request (assoc-session {:type ::mock} {:cookies cookies})]
+        request (assoc-session {:cookies cookies} {:type ::mock})]
     (is (not (:new-session? request)))
     (is (= (:session request) {:id :current}))))