Update tests for route maps using string keys instead of keywords

test/clout/core_test.clj

@@ -14,42 +14,42 @@
 
 (deftest keyword-paths
   (are [path uri params] (= (route-matches path uri) params)
-    "/:x"       "/foo"     {:x "foo"}
-    "/foo/:x"   "/foo/bar" {:x "bar"}
-    "/a/b/:c"   "/a/b/c"   {:c "c"}
-    "/:a/b/:c"  "/a/b/c"   {:a "a", :c "c"}))
+    "/:x"       "/foo"     {"x" "foo"}
+    "/foo/:x"   "/foo/bar" {"x" "bar"}
+    "/a/b/:c"   "/a/b/c"   {"c" "c"}
+    "/:a/b/:c"  "/a/b/c"   {"a" "a", "c" "c"}))
 
 (deftest keywords-match-extensions
   (are [path uri params] (= (route-matches path uri) params)
-    "/foo.:ext" "/foo.txt" {:ext "txt"}
-    "/:x.:y"    "/foo.txt" {:x "foo", :y "txt"}))
+    "/foo.:ext" "/foo.txt" {"ext" "txt"}
+    "/:x.:y"    "/foo.txt" {"x" "foo", "y" "txt"}))
 
 (deftest hyphen-keywords
   (are [path uri params] (= (route-matches path uri) params)
-    "/:foo-bar" "/baz" {:foo-bar "baz"}
-    "/:foo-"    "/baz" {:foo- "baz"}))
+    "/:foo-bar" "/baz" {"foo-bar" "baz"}
+    "/:foo-"    "/baz" {"foo-" "baz"}))
 
 (deftest urlencoded-keywords
   (are [path uri params] (= (route-matches path uri) params)
-    "/:x" "/foo%20bar" {:x "foo bar"}
-    "/:x" "/foo+bar"   {:x "foo bar"}))
+    "/:x" "/foo%20bar" {"x" "foo bar"}
+    "/:x" "/foo+bar"   {"x" "foo bar"}))
 
 (deftest same-keyword-many-times
   (are [path uri params] (= (route-matches path uri) params)
-    "/:x/:x/:x" "/a/b/c" {:x ["a" "b" "c"]}
-    "/:x/b/:x"  "/a/b/c" {:x ["a" "c"]}))
+    "/:x/:x/:x" "/a/b/c" {"x" ["a" "b" "c"]}
+    "/:x/b/:x"  "/a/b/c" {"x" ["a" "c"]}))
 
 (deftest wildcard-paths
   (are [path uri params] (= (route-matches path uri) params)
-    "/*"     "/foo"         {:* "foo"}
-    "/*"     "/foo.txt"     {:* "foo.txt"}
-    "/*"     "/foo/bar"     {:* "foo/bar"}
-    "/foo/*" "/foo/bar/baz" {:* "bar/baz"}
-    "/a/*/d" "/a/b/c/d"     {:* "b/c"}))
+    "/*"     "/foo"         {"*" "foo"}
+    "/*"     "/foo.txt"     {"*" "foo.txt"}
+    "/*"     "/foo/bar"     {"*" "foo/bar"}
+    "/foo/*" "/foo/bar/baz" {"*" "bar/baz"}
+    "/a/*/d" "/a/b/c/d"     {"*" "b/c"}))
 
 (deftest compiled-routes
   (is (= (route-matches (route-compile "/foo/:id") "/foo/bar")
-         {:id "bar"})))
+         {"id" "bar"})))
 
 (deftest url-paths
   (is (route-matches "http://localhost" "http://localhost")))