From b1c8dbdaa4a306409f0234547e88887461783db1 Mon Sep 17 00:00:00 2001 From: Tommi Reiman Date: Sat, 16 May 2020 17:34:55 +0300 Subject: [PATCH] Update sieppari, fix tests --- project.clj | 2 +- test/clj/reitit/http_test.clj | 14 +++++++------- test/cljc/reitit/swagger_test.clj | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/project.clj b/project.clj index 2ab60aa2..85325b45 100644 --- a/project.clj +++ b/project.clj @@ -32,7 +32,7 @@ [metosin/schema-tools "0.12.2"] [metosin/muuntaja "0.6.7"] [metosin/jsonista "0.2.6"] - [metosin/sieppari "0.0.0-alpha9"] + [metosin/sieppari "0.0.0-alpha10"] [metosin/malli "0.0.1-20200404.091302-14"] ;; https://clojureverse.org/t/depending-on-the-right-versions-of-jackson-libraries/5111 diff --git a/test/clj/reitit/http_test.clj b/test/clj/reitit/http_test.clj index cf6a807e..766d8dc7 100644 --- a/test/clj/reitit/http_test.clj +++ b/test/clj/reitit/http_test.clj @@ -294,24 +294,24 @@ {:executor sieppari/executor})] (let [respond (promise)] (app {:request-method :get, :uri "/ping"} respond ::irrelevant) - (is (= response @respond)))))) + (is (= response (deref respond 100 ::timeout))))))) (defrecord MyAsyncContext []) (deftest unknown-async-test (testing "works if registered" - (require '[sieppari.async.core-async]) (let [response {:status 200, :body "ok"} app (http/ring-handler (http/router ["/ping" {:get {:interceptors [{:enter map->MyAsyncContext}] :handler (fn [_] response)}}]) (ring/create-default-handler) - {:executor sieppari/executor})] - (let [raise (promise)] - (app {:request-method :get, :uri "/ping"} ::irrelevant raise) - (let [response' @raise] - (is (instance? ExceptionInfo response'))))))) + {:executor sieppari/executor}) + respond (promise) + raise (promise)] + (app {:request-method :get, :uri "/ping"} respond raise) + (let [raised (deref raise 100 ::timeout)] + (is (instance? ExceptionInfo raised)))))) (deftest interceptor-transform-test (let [interceptor (fn [name] {:name name diff --git a/test/cljc/reitit/swagger_test.clj b/test/cljc/reitit/swagger_test.clj index ba3c4566..5ef99a63 100644 --- a/test/cljc/reitit/swagger_test.clj +++ b/test/cljc/reitit/swagger_test.clj @@ -148,7 +148,7 @@ 500 {:description "fail"}} :summary "plus"} :post {:parameters [{:in "body", - :name "", + :name "body", :description "", :required false, :schema {:type "array",