diff --git a/modules/reitit-openapi/src/reitit/openapi.cljc b/modules/reitit-openapi/src/reitit/openapi.cljc index 6b1a465e..0328ce43 100644 --- a/modules/reitit-openapi/src/reitit/openapi.cljc +++ b/modules/reitit-openapi/src/reitit/openapi.cljc @@ -9,7 +9,7 @@ (s/def ::id (s/or :keyword keyword? :set (s/coll-of keyword? :into #{}))) (s/def ::no-doc boolean?) -(s/def ::tags (s/coll-of (s/or :keyword keyword? :string string?) :kind #{})) +(s/def ::tags (s/coll-of (s/or :keyword keyword? :string string?))) (s/def ::summary string?) (s/def ::description string?) diff --git a/test/cljc/reitit/openapi_test.clj b/test/cljc/reitit/openapi_test.clj index 8f950c89..a1c944d2 100644 --- a/test/cljc/reitit/openapi_test.clj +++ b/test/cljc/reitit/openapi_test.clj @@ -10,6 +10,7 @@ [reitit.coercion.spec :as spec] [reitit.openapi :as openapi] [reitit.ring :as ring] + [reitit.ring.spec] [reitit.ring.coercion :as rrc] [reitit.swagger-ui :as swagger-ui] [schema.core :as s] @@ -117,7 +118,8 @@ xs :body} :parameters}] {:status 200, :body {:total (+ (reduce + xs) z)}})}}]]] - {:data {:middleware [openapi/openapi-feature + {:validate reitit.ring.spec/validate + :data {:middleware [openapi/openapi-feature rrc/coerce-exceptions-middleware rrc/coerce-request-middleware rrc/coerce-response-middleware]}}))) @@ -379,7 +381,8 @@ ["/openapi.json" {:get {:handler (openapi/create-openapi-handler) :openapi {:info {:title "" :version "0.0.1"}} - :no-doc true}}]])) + :no-doc true}}]] + {:data {:middleware [openapi/openapi-feature]}})) spec (-> {:request-method :get :uri "/openapi.json"} app @@ -446,7 +449,9 @@ {:get {:handler (openapi/create-openapi-handler) :openapi {:info {:title "" :version "0.0.1"}} :no-doc true}}]] - {:data {:middleware [rrc/coerce-request-middleware + {:validate reitit.ring.spec/validate + :data {:middleware [openapi/openapi-feature + rrc/coerce-request-middleware rrc/coerce-response-middleware]}})) spec (-> {:request-method :get :uri "/openapi.json"} @@ -531,7 +536,9 @@ {:get {:handler (openapi/create-openapi-handler) :openapi {:info {:title "" :version "0.0.1"}} :no-doc true}}]] - {:data {:middleware [rrc/coerce-request-middleware + {:validate reitit.ring.spec/validate + :data {:middleware [openapi/openapi-feature + rrc/coerce-request-middleware rrc/coerce-response-middleware]}})) spec (-> {:request-method :get :uri "/openapi.json"}