Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid overwriting request's params with silk params #26

Closed
wants to merge 2 commits into from
+7 −4
Closed

Avoid overwriting request's params with silk params #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58b175f
Fix `ring-handler` overwriting request's params
volrath Jun 23, 2016
fff3d3d
Change `merge-with` for `update` in `ring-handler`
volrath Jul 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions spec/domkm/silk/serve_spec.cljx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,14 @@
(-> @req
(@ring-handler)
:params
(select-keys [:username :project])))
(spec/should= @req
(select-keys [:username :project]))))
(spec/it
"won't override existing params in request"
(spec/should= "param"
(-> @req
(assoc :params {:extra "param"})
(@ring-handler)
(dissoc :params)))))
(get-in [:params :extra])))))
(spec/context
"match and no `get-handler` provided"
(spec/it
Expand Down
2 changes: 1 addition & 1 deletion src/domkm/silk/serve.cljx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
(fn [req]
(if-let [params (silk/match rtes (request-map->URL req))]
((-> params :domkm.silk/name get-handler)
(assoc req :params params))
(update req :params merge params))
((get-handler nil) req))))))


Expand Down