Add tests to :content-type, release 1.1.6

* fixes also #236

Author: ikitommi

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.1.6 (1.8.2016)
+
+* `:content-type` of user-defined formats are pushed into Swagger `:produces` and `:consumes`, thanks to [Waldemar](https://github.com/Velrok).
+
+```clj
+(def custom-json-format
+  (ring.middleware.format-response/make-encoder cheshire.core/generate-string "application/vnd.vendor.v1+json"))
+
+(api
+  {:format {:formats [custom-json-format :json :edn]}}
+  ...)
+```
+
 ## 1.1.5 (27.7.2016)
 
 * New api-options `[:api :disable-api-middleware?]` to disable the api-middleware completely. With this set, `api` only produces the (reverse) route-tree + set's swagger stuff and sets schema coercions for the api.

project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/compojure-api "1.1.5"
+(defproject metosin/compojure-api "1.1.6"
   :description "Compojure Api"
   :url "https://github.com/metosin/compojure-api"
   :license {:name "Eclipse Public License"

test/compojure/api/integration_test.clj

@@ -11,7 +11,9 @@
             [compojure.api.middleware :as mw]
             [ring.swagger.middleware :as rsm]
             [compojure.api.validator :as validator]
-            [compojure.api.routes :as routes]))
+            [compojure.api.routes :as routes]
+
+            [ring.middleware.format-response :as format-response]))
 
 ;;
 ;; Data
@@ -1440,3 +1442,27 @@
 
     (fact "exceptions are not caught"
       (raw-get* app "/throw") => throws)))
+
+(facts "custom formats contribute to Swagger :consumes & :produces"
+  (let [custom-json (format-response/make-encoder json "application/vnd.vendor.v1+json")
+        app (api
+              {:swagger {:spec "/swagger.json"}
+               :format {:formats [custom-json :json]}}
+              (POST "/echo" []
+                :body [data {:kikka s/Str}]
+                (ok data)))]
+
+    (fact "it works"
+      (let [response (app {:uri "/echo"
+                           :request-method :post
+                           :body (json-stream {:kikka "kukka"})
+                           :headers {"content-type" "application/vnd.vendor.v1+json"
+                                     "accept" "application/vnd.vendor.v1+json"}})]
+
+        (-> response :body slurp) => (json {:kikka "kukka"})
+        (-> response :headers) => (contains {"Content-Type" "application/vnd.vendor.v1+json; charset=utf-8"})))
+
+    (fact "spec is correct"
+      (get-spec app) => (contains
+                          {:produces ["application/vnd.vendor.v1+json" "application/json"]
+                           :consumes ["application/vnd.vendor.v1+json" "application/json"]}))))

test/compojure/api/test_utils.clj

@@ -2,6 +2,7 @@
   (:require [cheshire.core :as cheshire]
             [clojure.string :as str]
             [peridot.core :as p]
+            [clojure.java.io :as io]
             [compojure.api.routes :as routes])
   (:import [java.io InputStream]))
 
@@ -34,6 +35,8 @@
 
 (defn json [x] (cheshire/generate-string x))
 
+(defn json-stream [x] (io/input-stream (.getBytes (json x))))
+
 (defn follow-redirect [state]
   (if (some-> state :response :headers (get "Location"))
     (p/follow-redirect state)