Third time's the charm for fixing flash middleware

mmcgrana · 0e01b2000283997b9e0e5e5637af9c386a1cbfb4 · weavejester committed Jul 6, 2010 · Jul 6, 2010 · 0e01b20
1 parent 4e0ecb7
commit 0e01b2000283997b9e0e5e5637af9c386a1cbfb4
Unified Split

Showing with 8 additions and 4 deletions.

+6 −2 ring-core/src/ring/middleware/flash.clj

+2 −2 ring-core/test/ring/middleware/flash_test.clj
@@ -14,8 +14,12 @@
                      :session session
                      :flash flash)
           response (handler request)
+          session  (if (contains? response :session)
+                     (response :session)
+                     session)
           session  (if-let [flash (response :flash)]
-                     (assoc (response :session session) :_flash flash))]
-      (if (or session (contains? response :session))
+                     (assoc (response :session session) :_flash flash)
+                     session)]
+      (if (or flash (response :flash) (contains? response :session))
         (assoc response :session session)
         response))))
@@ -18,10 +18,10 @@
 
 (deftest flash-is-removed-after-read
   (let [message  {:error "Could not save"}
-        handler  (wrap-flash (constantly {}))
+        handler  (wrap-flash (constantly {:session {:foo "bar"}}))
         response (handler {:session {:_flash message}})]
     (is (nil? (:flash response)))
-    (is (nil? (-> response :session :_flash)))))
+    (is (= (:session response) {:foo "bar"}))))
 
 (deftest flash-doesnt-wipe-session
   (let [message  {:error "Could not save"}