Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
["--illegal-access=deny"]))

(def i18n-version "1.0.3")
(def jackson-version "2.20.1")
(def jackson-version "2.21.0")
(def slf4j-version "2.0.17")
(defproject org.openvoxproject/puppetdb pdb-version
:description "OpenVox-integrated catalog and fact storage"
Expand Down
11 changes: 7 additions & 4 deletions test/puppetlabs/puppetdb/http/index_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,14 @@

;; Ensure we don't allow garbage after query
(let [{:keys [status body headers]} (query-response method endpoint "[\"from\",\"foobar\"] random-stuff")]
(is (= (str "Json parse error at line 1, column 25:\n\n"
"[\"from\",\"foobar\"] random-stuff\n"
" ^\n\n"
(is (re-matches
(re-pattern
(str "(?s)^Json parse error at line 1, column \\d+:\\n\\n"
"\\[\"from\",\"foobar\"\\] random-stuff\\n"
"\\s+\\^\\n\\n"
"Unrecognized token 'random': was expecting "
"(JSON String, Number, Array, Object or token 'null', 'true' or 'false')") body))
"\\(JSON String, Number, Array, Object or token 'null', 'true' or 'false'\\)$"))
body))
(are-error-response-headers headers)
(is (= HttpURLConnection/HTTP_BAD_REQUEST status)))

Expand Down
Loading