luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2025-12-18 17:01:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't merge records

Browse source
This commit is contained in:
Tommi Reiman 2024-06-29 16:21:28 +03:00
parent d136975154
commit 2da94f733d
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/reitit-core/src/reitit/impl.cljc
View file

@ -29,7 +29,7 @@
f (-match p' path-map)] f (-match p' path-map)]
(cond (cond
f (conj l [p' (f v)]) f (conj l [p' (f v)])
(and (map? v) (seq v)) (-path-vals l p' v) (and (map? v) (not (record? v)) (seq v)) (-path-vals l p' v)
:else (conj l [p' v])))) :else (conj l [p' v]))))
l m))] l m))]
(-path-vals [] [] m))) (-path-vals [] [] m)))

14
test/cljc/reitit/ring_test.cljc
View file

@ -760,3 +760,17 @@
(is (= (r "2") (app {:uri "/", :request-method :get}))) (is (= (r "2") (app {:uri "/", :request-method :get})))
(def routes ["/" (constantly (r "3"))]) ;; redefine again (def routes ["/" (constantly (r "3"))]) ;; redefine again
(is (= (r "3") (app {:uri "/", :request-method :get})))))))) (is (= (r "3") (app {:uri "/", :request-method :get}))))))))
(defrecord FooTest [a b])
(deftest path-update-fix-686
(testing "records are retained"
(is (= true (-> ["/api/foo" {:get {:handler (constantly {:status 200})
:test (FooTest. 1 2)}}]
(ring/router)
(r/compiled-routes)
(first)
(second)
:get
:test
(record?))))))