summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBozhidar Batsov <bozhidar@batsov.com>2018-08-22 15:25:10 +0200
committerBozhidar Batsov <bozhidar@batsov.com>2018-08-22 15:25:10 +0200
commitcc458a4b2c1ab3ebd4ff6e955021eb3b12c4be34 (patch)
tree5546f3d863175a1c33aa1613aa07c6ea7b721590
parent4ddac0e9715c6252b75bb8ec940ad0f4d2b219b5 (diff)
Fix the build tool detection
-rw-r--r--cider.el10
-rw-r--r--test/cider-tests.el16
2 files changed, 13 insertions, 13 deletions
diff --git a/cider.el b/cider.el
index 0f09b268..b8647c00 100644
--- a/cider.el
+++ b/cider.el
@@ -1345,11 +1345,11 @@ Use `cider-ps-running-nrepls-command' and `cider-ps-running-nrepl-path-regexp-li
"Identify build systems present by their build files in PROJECT-DIR.
PROJECT-DIR defaults to current project."
(let* ((default-directory (or project-dir (clojure-project-dir (cider-current-dir))))
- (build-files '(("lein" . "project.clj")
- ("boot" . "build.boot")
- ("clojure-cli" . "deps.edn")
- ("shadow-cljs" . "shadow-cljs.edn")
- ("gradle" . "build.gradle"))))
+ (build-files '((lein . "project.clj")
+ (boot . "build.boot")
+ (clojure-cli . "deps.edn")
+ (shadow-cljs . "shadow-cljs.edn")
+ (gradle . "build.gradle"))))
(delq nil
(mapcar (lambda (candidate)
(when (file-exists-p (cdr candidate))
diff --git a/test/cider-tests.el b/test/cider-tests.el
index 93e85b41..c13c3f0e 100644
--- a/test/cider-tests.el
+++ b/test/cider-tests.el
@@ -48,17 +48,17 @@
(setq-local cider-jack-in-dependencies-exclusions '()))
(it "can inject dependencies in a lein project"
- (expect (cider-inject-jack-in-dependencies "" "repl :headless" "lein")
+ (expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
:to-equal "update-in :dependencies conj \\[org.clojure/tools.nrepl\\ \\\"0.2.12\\\"\\] -- update-in :plugins conj \\[cider/cider-nrepl\\ \\\"0.10.0-SNAPSHOT\\\"\\] -- repl :headless"))
(it "can inject dependencies in a lein project with an exclusion"
(setq-local cider-jack-in-dependencies-exclusions '(("org.clojure/tools.nrepl" ("org.clojure/clojure"))))
- (expect (cider-inject-jack-in-dependencies "" "repl :headless" "lein")
+ (expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
:to-equal "update-in :dependencies conj \\[org.clojure/tools.nrepl\\ \\\"0.2.12\\\"\\ \\:exclusions\\ \\[org.clojure/clojure\\]\\] -- update-in :plugins conj \\[cider/cider-nrepl\\ \\\"0.10.0-SNAPSHOT\\\"\\] -- repl :headless"))
(it "can inject dependencies in a lein project with multiple exclusions"
(setq-local cider-jack-in-dependencies-exclusions '(("org.clojure/tools.nrepl" ("org.clojure/clojure" "foo.bar/baz"))))
- (expect (cider-inject-jack-in-dependencies "" "repl :headless" "lein")
+ (expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
:to-equal "update-in :dependencies conj \\[org.clojure/tools.nrepl\\ \\\"0.2.12\\\"\\ \\:exclusions\\ \\[org.clojure/clojure\\ foo.bar/baz\\]\\] -- update-in :plugins conj \\[cider/cider-nrepl\\ \\\"0.10.0-SNAPSHOT\\\"\\] -- repl :headless"))
(it "can inject dependencies in a boot project"
@@ -75,7 +75,7 @@
(setq-local cider-jack-in-nrepl-middlewares '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware"))
(setq-local cider-jack-in-dependencies-exclusions '()))
(it "can inject dependencies in a lein project"
- (expect (cider-inject-jack-in-dependencies "" "repl :headless" "lein")
+ (expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
:to-equal "update-in :dependencies conj \\[org.clojure/tools.nrepl\\ \\\"0.2.12\\\"\\] -- update-in :plugins conj \\[refactor-nrepl\\ \\\"2.0.0\\\"\\] -- update-in :plugins conj \\[cider/cider-nrepl\\ \\\"0.11.0\\\"\\] -- repl :headless"))
(it "can inject dependencies in a boot project"
@@ -89,7 +89,7 @@
(setq-local cider-jack-in-lein-plugins '(("cider/cider-nrepl" "0.11.0")))
(setq-local cider-jack-in-dependencies-exclusions '()))
(it "can concat in a lein project"
- (expect (cider-inject-jack-in-dependencies "-o -U" "repl :headless" "lein")
+ (expect (cider-inject-jack-in-dependencies "-o -U" "repl :headless" 'lein)
:to-equal "-o -U update-in :dependencies conj \\[org.clojure/tools.nrepl\\ \\\"0.2.12\\\"\\] -- update-in :plugins conj \\[cider/cider-nrepl\\ \\\"0.11.0\\\"\\] -- repl :headless"))
(it "can concat in a boot project"
(expect (cider-inject-jack-in-dependencies "-C -o" "repl -s wait" "boot")
@@ -147,7 +147,7 @@
:and-return-value '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.11.0")))
(setq-local cider-jack-in-dependencies-exclusions '()))
(it "uses them in a lein project"
- (expect (cider-inject-jack-in-dependencies "" "repl :headless" "lein")
+ (expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
:to-equal "update-in :dependencies conj \\[org.clojure/tools.nrepl\\ \\\"0.2.12\\\"\\] -- update-in :plugins conj \\[refactor-nrepl\\ \\\"2.0.0\\\"\\] -- update-in :plugins conj \\[cider/cider-nrepl\\ \\\"0.11.0\\\"\\] -- repl :headless"))
(it "uses them in a boot project"
(expect (cider-inject-jack-in-dependencies "" "repl -s wait" "boot")
@@ -178,8 +178,8 @@
(describe "when there is a single project"
(it "returns that type"
(spy-on 'cider--identify-buildtools-present
- :and-return-value '("lein"))
- (expect (cider-project-type) :to-equal "lein")))
+ :and-return-value '(lein))
+ (expect (cider-project-type) :to-equal 'lein)))
(describe "when there are multiple possible project types"
(before-all