test, verifier, utils: fix failed tests

- some namespaces tests require did not get renamed
- url/extract might throw AssertionError if input contains non-HTTP(S)
urls. it should not check schemes.
- verifier doesn't need to filter non-HTTP(S) urls since they will
return false anyway, and plus it makes localhost urls in tests fail

4 files changed, 4 insertions, 5 deletions

diff --git a/src/weepinbell/processor/verifier.clj b/src/weepinbell/processor/verifier.clj
index 90f0786..37b91be 100644
--- a/src/weepinbell/processor/verifier.clj
+++ b/src/weepinbell/processor/verifier.clj
@@ -21,8 +21,7 @@
 (defn- includes-url?

   "Return true if text includes a certain URL. URLs are normalized before comparison."

   [text url]

-  (some #(url/url= % url)

-        (filter url/valid-http-url? (url/extract text))))

+  (some #(url/url= % url) (url/extract text)))

 

 (defn- verify-mention

   "Get source and follow redirects to check if target link is present."

diff --git a/src/weepinbell/utils/url.clj b/src/weepinbell/utils/url.clj
index b8d53e8..03e7da8 100644
--- a/src/weepinbell/utils/url.clj
+++ b/src/weepinbell/utils/url.clj
@@ -60,7 +60,7 @@
   "Given plain text. Returns a vector of URLs that appears in it."

   [^String text]

   {:pre [(string? text)]

-   :post [#(every? valid-http-url? %)]}

+   :post [(partial every? string?)]}

   (let [extractor (-> (LinkExtractor/builder)

                       (.linkTypes (EnumSet/of LinkType/URL))

                       .build)

diff --git a/test/weepinbell/feed_test.clj b/test/weepinbell/feed_test.clj
index 0a3a1bf..341f363 100644
--- a/test/weepinbell/feed_test.clj
+++ b/test/weepinbell/feed_test.clj
@@ -2,7 +2,7 @@
   (:require [clojure.test :refer [testing is deftest]]

             [clojure.xml :as xml]

             [clojure.java.io :as io]

-            [weepinbell.feed :as feed]

+            [weepinbell.webserver.feed :as feed]

             [weepinbell.utils.digest :refer [digest]]))

 

 (def domain "test.example.com")

diff --git a/test/weepinbell/receiver_test.clj b/test/weepinbell/receiver_test.clj
index 827c078..9a75462 100644
--- a/test/weepinbell/receiver_test.clj
+++ b/test/weepinbell/receiver_test.clj
@@ -14,7 +14,7 @@
 (ns weepinbell.receiver-test
   (:require [clojure.test :refer [deftest testing is]]
             [clojure.core.async :refer [chan poll!]]
-            [weepinbell.receiver :refer [receive]]))
+            [weepinbell.webserver.receiver :refer [receive]]))
 
 ;; utilities
 (defn- wrap-400-msg [typ]