Fix s3p repo URL to replace to s3 #12

liquidz · Jul 20, 2020 · a212c51 · a212c51
1 parent 66c63b3
commit a212c51
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/antq/ver/java.clj b/src/antq/ver/java.clj
@@ -58,5 +58,7 @@
   [dep]
   (get-sorted-versions-by-name
    (:name dep)
-   {:repositories (merge default-repos (:repositories dep))
+   {:repositories (-> default-repos
+                      (merge (:repositories dep))
+                      (normalize-repos))
     :snapshots? (ver/snapshot? (:version dep))}))
diff --git a/test/antq/ver/java_test.clj b/test/antq/ver/java_test.clj
@@ -4,6 +4,7 @@
    [antq.ver :as ver]
    [antq.ver.java :as sut]
    [clojure.edn :as edn]
+   [clojure.set :as set]
    [clojure.test :as t]))
 
 (def ^:private current-clojure-version
@@ -47,4 +48,12 @@
     (t/is (= ["2" "1.6-SNAPSHOT" "1"]
              (get-sorted-versions {:version "1.0.0-SNAPSHOT"})))
     (t/is (= ["2" "1.6-SNAPSHOT" "1"]
-             (get-sorted-versions {:version "1.0.0-snapshot"})))))
+             (get-sorted-versions {:version "1.0.0-snapshot"}))))
+
+  (t/testing "normalizing repository URL"
+    (with-redefs [sut/get-sorted-versions-by-name (fn [_ opts] opts)]
+      (let [res (get-sorted-versions {:repositories {"foo" {:url "s3p://bar"}}})
+            diff (set/difference (set (:repositories res))
+                                 (set sut/default-repos))]
+        (t/is (= #{["foo" {:url "s3://bar"}]}
+                 diff))))))