Merge pull request #4 from listora/test-validation-coercion

Fix error production during coercion
listora · Apr 15, 2014 · 7bc0e98 · 7bc0e98
2 parents 9369301 + dda2e4a
commit 7bc0e98
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/constraint/validations/url.clj b/src/constraint/validations/url.clj
@@ -36,7 +36,7 @@
 (defn- string->url [schemes value]
   (if (valid? schemes value)
     {:value (URL. value)}
-    {:errors (set (invalid-url schemes value))}))
+    {:errors #{(invalid-url schemes value)}}))
 
 (defn url-coercions
   "Defines coercion from a java.lang.String to a java.net.URL given the allowed

diff --git a/test/constraint/validations/url_test.clj b/test/constraint/validations/url_test.clj
@@ -43,7 +43,14 @@
              :found domain-only}]))))
 
 (deftest test-coercions
-  (let [url (URL. "http://example.com")
-        coercions (url-coercions ["http"])]
-    (is (valid? URL (str url) coercions))
-    (is (= (coerce URL (str url) coercions) url))))
+  (let [schemes ["http" "https"]
+        validator (url schemes)
+        example-url (URL. "http://example.com")
+        coercions (url-coercions schemes)]
+    (is (valid? URL (str example-url) coercions))
+    (is (= (coerce URL (str example-url) coercions) example-url))
+
+    (is (= (validate (url schemes) domain-only)
+           [{:error :invalid-url
+             :message "Expected URL with scheme \"http\", or \"https\""
+             :found domain-only}]))))