Merge pull request #111 from slava92/body-before-headers

Body before headers
drewr · Jan 27, 2021 · 7606a66 · 7606a66
2 parents d2ad4de + e162005
commit 7606a66
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/project.clj b/project.clj
@@ -13,5 +13,5 @@
              :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}
              :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
-             :1.10 {:dependencies [[org.clojure/clojure "1.10.2-rc1"]]}}
+             :1.10 {:dependencies [[org.clojure/clojure "1.10.2"]]}}
   :aliases {"test-all" ["with-profile" "dev,1.7:dev,1.8:dev,1.9:dev,1.10" "test"]})
diff --git a/src/postal/message.clj b/src/postal/message.clj
@@ -195,8 +195,8 @@
        (.setSubject (:subject msg) ^String charset)
        (.setSentDate (or (:date msg) (make-date)))
        (.addHeader "User-Agent" (:user-agent msg (user-agent)))
-       (add-extra! (apply dissoc msg standard))
        (add-body! (:body msg) charset)
+       (add-extra! (apply dissoc msg standard))
        (.saveChanges)))))
 
 (defn make-fixture [from to & {:keys [tag]}]

diff --git a/test/postal/test/message.clj b/test/postal/test/message.clj
@@ -199,8 +199,10 @@
            :to "[email protected]"
            :subject "Test"
            :User-Agent "Lorem Ipsum"
-           :body "Foo!"}]
-    (is (.contains (message->str m) "User-Agent: Lorem Ipsum"))))
+           :Content-Type "text/html"
+           :body "<html><body>Foo!</body></html>"}]
+    (is (.contains (message->str m) "User-Agent: Lorem Ipsum"))
+    (is (= (.getContentType (make-jmessage m)) "text/html"))))
 
 (deftest test-bad-addrs
   (let [m (message->str