Skip to content

Commit 6b1c075

Browse files
committed
Fix (find-deps-edn nil) regression
1 parent 1b3bcba commit 6b1c075

2 files changed

Lines changed: 23 additions & 1 deletion

File tree

src/main/clojure/clojure/tools/deps.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
(find-edn-maps nil))
5454
([project-edn-file]
5555
(let [key-adapter {:root :root-edn, :user :user-edn, :project :project-edn}]
56-
(-> (depsedn/create-edn-maps {:project project-edn-file})
56+
(-> (depsedn/create-edn-maps (when project-edn-file {:project project-edn-file}))
5757
(update-keys key-adapter)))))
5858

5959
(defn create-edn-maps

src/test/clojure/clojure/tools/deps/test_deps.clj

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[clojure.java.io :as jio]
44
[clojure.test :refer [deftest is are testing]]
55
[clojure.tools.deps :as deps]
6+
[clojure.tools.deps.edn :as depsedn]
67
[clojure.tools.deps.util :as util]
78
[clojure.tools.deps.extensions :as ext]
89
[clojure.tools.deps.extensions.faken :as fkn]
@@ -11,6 +12,27 @@
1112
(:import
1213
[java.io File]))
1314

15+
(deftest test-find-edn-maps
16+
(let [edn-maps (deps/find-edn-maps)]
17+
(is (util/submap?
18+
{:root-edn (depsedn/root-deps)
19+
:user-edn (depsedn/user-deps)
20+
:project-edn {:paths ["src/main/clojure" "src/main/resources"]
21+
:deps {}}}
22+
edn-maps)))
23+
24+
(let [deps-file (File/createTempFile "tmp" ".edn")
25+
tmp-dir (.getParentFile deps-file)
26+
deps {:paths ["x"]}]
27+
(spit deps-file deps)
28+
(dir/with-dir tmp-dir
29+
(let [edn-maps (deps/find-edn-maps (.getCanonicalPath deps-file))]
30+
(is (util/submap?
31+
{:root-edn (depsedn/root-deps)
32+
:user-edn (depsedn/user-deps)
33+
:project-edn {:paths ["x"]}}
34+
edn-maps))))))
35+
1436
(def repo
1537
;; "real"
1638
{'org.clojure/clojure {{:fkn/version "1.9.0"}

0 commit comments

Comments
 (0)