Previously peridot would delete all cookies whenever the "Set-Cookie"

header received by get in merge-cookies was an empty list, which would
normally be the case for code like this:

    (-> (session app)
      (request "/foo")
      (request "/bar"))

Before these changes, cookies established by /foo would be missing for
/bar.

Update the tests to expire cookies instead of just dropping them on
"/delete".

Via Rob Browning <rlb@defaultvalue.org>

src/peridot/cookie_jar.clj

@@ -58,12 +58,10 @@
 
 (defn merge-cookies [headers cookie-jar uri host]
   (let [cookie-string (get headers "Set-Cookie")]
-    (if cookie-string
-      (if (empty? cookie-string)
-        (dissoc cookie-jar host)
-        (update-in cookie-jar [host] merge
-                   (into {} (map #(build-cookie % uri host) cookie-string))))
-      cookie-jar)))
+    (if (empty? cookie-string)
+      cookie-jar
+      (update-in cookie-jar [host] merge
+                 (into {} (map #(build-cookie % uri host) cookie-string))))))
 
 (defn cookies-for [cookie-jar scheme uri host]
   (let [cookie-string
@@ -86,4 +84,4 @@
              (interpose ";")
              (apply str))]
     (when (not (empty? cookie-string))
-      {"Cookie" cookie-string})))
+      {"Cookie" cookie-string})))

test/peridot/test/cookie_jar.clj

@@ -17,6 +17,12 @@
                 {k (merge {:value v} (f k v))})
               (seq m))))
 
+(def expired-date
+  (.format (first cj/cookie-date-formats) (java.util.Date. 0)))
+
+(defn expire-cookie [m]
+  (assoc m :expires expired-date :value ""))
+
 (def app
   (params/wrap-params
    (cookies/wrap-cookies
@@ -42,7 +48,8 @@
      ["delete"]
      {:get (fn [req]
              (assoc (response/response "ok")
-               :cookies {}))}
+               :cookies (into {} (for [[k v] (:cookies req)]
+                                   [k (expire-cookie v)]))))}
      ["set-secure"]
      {:get (fn [req]
              (assoc (response/response "ok")
@@ -230,4 +237,4 @@
       (doto
           (#(is (= (get (:headers (:request %)) "cookie")
                    "value=1")
-                "http-only cookies are sent")))))
+                "http-only cookies are sent")))))