From 69795f5fe7391eef9ff788fdd34a84f909bdc03c Mon Sep 17 00:00:00 2001 From: Daw-Ran Liou Date: Wed, 9 Oct 2019 08:05:55 -0700 Subject: [PATCH] Tighten middleware spec from collection to vector This avoids messing up the order of middleware chain accidentally. --- modules/reitit-ring/src/reitit/ring/spec.cljc | 2 +- test/cljc/reitit/ring_spec_test.cljc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/reitit-ring/src/reitit/ring/spec.cljc b/modules/reitit-ring/src/reitit/ring/spec.cljc index 6cfaa299..ec047d5a 100644 --- a/modules/reitit-ring/src/reitit/ring/spec.cljc +++ b/modules/reitit-ring/src/reitit/ring/spec.cljc @@ -8,7 +8,7 @@ ;; Specs ;; -(s/def ::middleware (s/coll-of #(satisfies? middleware/IntoMiddleware %))) +(s/def ::middleware (s/coll-of #(satisfies? middleware/IntoMiddleware %) :kind vector?)) (s/def ::get map?) (s/def ::head map?) (s/def ::post map?) diff --git a/test/cljc/reitit/ring_spec_test.cljc b/test/cljc/reitit/ring_spec_test.cljc index 4e1eb69c..9a615efd 100644 --- a/test/cljc/reitit/ring_spec_test.cljc +++ b/test/cljc/reitit/ring_spec_test.cljc @@ -81,7 +81,7 @@ (testing "middleware cannot be a list" (is (thrown-with-msg? ExceptionInfo - #":reitit.ring.spec/invalid-specs" + #"Invalid route data" (ring/router ["/api" {:handler identity :middleware '()}]