|
144 | 144 | (describe "when there is a single dependency"
|
145 | 145 | (before-each
|
146 | 146 | (setq-local cider-injected-nrepl-version "0.9.0")
|
147 |
| - (setq-local cider-injected-middleware-version "0.39.1") |
| 147 | + (setq-local cider-injected-middleware-version "0.40.0") |
148 | 148 | (setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
|
149 | 149 | (setq-local cider-jack-in-dependencies-exclusions '())
|
150 | 150 | (setq-local cider-enrich-classpath t))
|
|
154 | 154 | :to-equal (concat "update-in :dependencies conj "
|
155 | 155 | (shell-quote-argument "[nrepl/nrepl \"0.9.0\"]")
|
156 | 156 | " -- update-in :plugins conj "
|
157 |
| - (shell-quote-argument "[cider/cider-nrepl \"0.39.1\"]") |
| 157 | + (shell-quote-argument "[cider/cider-nrepl \"0.40.0\"]") |
158 | 158 | " -- update-in :plugins conj "
|
159 | 159 | (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.2\"]")
|
160 | 160 | " -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
|
|
167 | 167 | "update-in :dependencies conj "
|
168 | 168 | (shell-quote-argument "[nrepl/nrepl \"0.9.0\" :exclusions [org.clojure/clojure]]")
|
169 | 169 | " -- update-in :plugins conj "
|
170 |
| - (shell-quote-argument "[cider/cider-nrepl \"0.39.1\"]") |
| 170 | + (shell-quote-argument "[cider/cider-nrepl \"0.40.0\"]") |
171 | 171 | " -- update-in :plugins conj "
|
172 | 172 | (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.2\"]")
|
173 | 173 | " -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
|
|
179 | 179 | :to-equal (concat "update-in :dependencies conj "
|
180 | 180 | (shell-quote-argument "[nrepl/nrepl \"0.9.0\" :exclusions [org.clojure/clojure foo.bar/baz]]")
|
181 | 181 | " -- update-in :plugins conj "
|
182 |
| - (shell-quote-argument "[cider/cider-nrepl \"0.39.1\"]") |
| 182 | + (shell-quote-argument "[cider/cider-nrepl \"0.40.0\"]") |
183 | 183 | " -- update-in :plugins conj "
|
184 | 184 | (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.2\"]")
|
185 | 185 | " -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
|
|
192 | 192 | " -d "
|
193 | 193 | (shell-quote-argument "nrepl/nrepl:0.9.0")
|
194 | 194 | " -d "
|
195 |
| - (shell-quote-argument "cider/cider-nrepl:0.39.1") |
| 195 | + (shell-quote-argument "cider/cider-nrepl:0.40.0") |
196 | 196 | " cider.tasks/add-middleware"
|
197 | 197 | " -m "
|
198 | 198 | (shell-quote-argument "cider.nrepl/cider-middleware")
|
|
201 | 201 | (it "can inject dependencies in a gradle project"
|
202 | 202 | (expect (cider-inject-jack-in-dependencies "--no-daemon" ":clojureRepl" 'gradle)
|
203 | 203 | :to-equal (concat "--no-daemon "
|
204 |
| - (shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.39.1") |
| 204 | + (shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.40.0") |
205 | 205 | " :clojureRepl "
|
206 | 206 | (shell-quote-argument "--middleware=cider.nrepl/cider-middleware")))))
|
207 | 207 |
|
|
218 | 218 | " -- update-in :plugins conj "
|
219 | 219 | (shell-quote-argument "[refactor-nrepl \"2.0.0\"]")
|
220 | 220 | " -- update-in :plugins conj "
|
221 |
| - (shell-quote-argument "[cider/cider-nrepl \"0.39.1\"]") |
| 221 | + (shell-quote-argument "[cider/cider-nrepl \"0.40.0\"]") |
222 | 222 | " -- update-in :plugins conj "
|
223 | 223 | (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.2\"]")
|
224 | 224 | " -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
|
|
231 | 231 | " -d "
|
232 | 232 | (shell-quote-argument "nrepl/nrepl:0.9.0")
|
233 | 233 | " -d "
|
234 |
| - (shell-quote-argument "cider/cider-nrepl:0.39.1") |
| 234 | + (shell-quote-argument "cider/cider-nrepl:0.40.0") |
235 | 235 | " -d "
|
236 | 236 | (shell-quote-argument "refactor-nrepl:2.0.0")
|
237 | 237 | " cider.tasks/add-middleware"
|
|
253 | 253 | :to-equal (concat "-o -U update-in :dependencies conj "
|
254 | 254 | (shell-quote-argument "[nrepl/nrepl \"0.9.0\"]")
|
255 | 255 | " -- update-in :plugins conj "
|
256 |
| - (shell-quote-argument "[cider/cider-nrepl \"0.39.1\"]") |
| 256 | + (shell-quote-argument "[cider/cider-nrepl \"0.40.0\"]") |
257 | 257 | " -- update-in :plugins conj "
|
258 | 258 | (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.2\"]")
|
259 | 259 | " -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
|
|
264 | 264 | " -d "
|
265 | 265 | (shell-quote-argument "nrepl/nrepl:0.9.0")
|
266 | 266 | " -d "
|
267 |
| - (shell-quote-argument "cider/cider-nrepl:0.39.1") |
| 267 | + (shell-quote-argument "cider/cider-nrepl:0.40.0") |
268 | 268 | " cider.tasks/add-middleware"
|
269 | 269 | " -m "
|
270 | 270 | (shell-quote-argument "cider.nrepl/cider-middleware")
|
271 | 271 | " repl -s wait")))
|
272 | 272 | (it "can concat in a gradle project"
|
273 | 273 | (expect (cider-inject-jack-in-dependencies "--no-daemon" ":clojureRepl" 'gradle)
|
274 | 274 | :to-equal (concat "--no-daemon "
|
275 |
| - (shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.39.1") |
| 275 | + (shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.40.0") |
276 | 276 | " :clojureRepl "
|
277 | 277 | (shell-quote-argument "--middleware=cider.nrepl/cider-middleware")))))
|
278 | 278 |
|
|
287 | 287 | (setq-local cider-jack-in-nrepl-middlewares '(("refactor-nrepl.middleware/wrap-refactor" :predicate middlewares-predicate) "cider.nrepl/cider-middleware" ("another/middleware"))))
|
288 | 288 | (it "includes plugins whose predicates return true"
|
289 | 289 | (expect (cider-jack-in-normalized-lein-plugins)
|
290 |
| - :to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.39.1")))) |
| 290 | + :to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.40.0")))) |
291 | 291 | (it "includes middlewares whose predicates return true"
|
292 | 292 | (expect (cider-jack-in-normalized-nrepl-middlewares)
|
293 | 293 | :to-equal '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware" "another/middleware")))
|
294 | 294 | (it "ignores plugins whose predicates return false"
|
295 | 295 | (spy-on 'plugins-predicate :and-return-value nil)
|
296 | 296 | (expect (cider-jack-in-normalized-lein-plugins)
|
297 |
| - :to-equal '(("cider/cider-nrepl" "0.39.1"))) |
| 297 | + :to-equal '(("cider/cider-nrepl" "0.40.0"))) |
298 | 298 | (spy-on 'middlewares-predicate :and-return-value nil)
|
299 | 299 | (expect (cider-jack-in-normalized-nrepl-middlewares)
|
300 | 300 | :to-equal '("cider.nrepl/cider-middleware" "another/middleware")))
|
|
323 | 323 | :and-return-value '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware"))
|
324 | 324 | (spy-on 'cider-jack-in-normalized-lein-plugins
|
325 | 325 | :and-return-value '(("refactor-nrepl" "2.0.0")
|
326 |
| - ("cider/cider-nrepl" "0.39.1") |
| 326 | + ("cider/cider-nrepl" "0.40.0") |
327 | 327 | ("mx.cider/lein-enrich-classpath" "1.18.2")))
|
328 | 328 | (setq-local cider-jack-in-dependencies-exclusions '())
|
329 | 329 | (setq-local cider-enrich-classpath t))
|
|
334 | 334 | " -- update-in :plugins conj "
|
335 | 335 | (shell-quote-argument "[refactor-nrepl \"2.0.0\"]")
|
336 | 336 | " -- update-in :plugins conj "
|
337 |
| - (shell-quote-argument "[cider/cider-nrepl \"0.39.1\"]") |
| 337 | + (shell-quote-argument "[cider/cider-nrepl \"0.40.0\"]") |
338 | 338 | " -- update-in :plugins conj "
|
339 | 339 | (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.2\"]")
|
340 | 340 | " -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
|
|
352 | 352 | " -d "
|
353 | 353 | (shell-quote-argument "nrepl/nrepl:0.9.0")
|
354 | 354 | " -d "
|
355 |
| - (shell-quote-argument "cider/cider-nrepl:0.39.1") |
| 355 | + (shell-quote-argument "cider/cider-nrepl:0.40.0") |
356 | 356 | " -d "
|
357 | 357 | (shell-quote-argument "refactor-nrepl:2.0.0")
|
358 | 358 | " cider.tasks/add-middleware"
|
|
447 | 447 | (setq-local cider-jack-in-dependencies nil)
|
448 | 448 | (setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
|
449 | 449 | (let ((expected (string-join `("clojure -Sdeps "
|
450 |
| - ,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.39.1\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
| 450 | + ,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.40.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
451 | 451 | " -M:cider/nrepl")
|
452 | 452 | "")))
|
453 | 453 | (setq-local cider-allow-jack-in-without-project t)
|
|
461 | 461 |
|
462 | 462 | (it "allows specifying custom aliases with `cider-clojure-cli-aliases`"
|
463 | 463 | (let ((expected (string-join `("clojure -Sdeps "
|
464 |
| - ,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.39.1\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
| 464 | + ,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.40.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
465 | 465 | " -M:dev:test:cider/nrepl")
|
466 | 466 | "")))
|
467 | 467 | (setq-local cider-jack-in-dependencies nil)
|
|
478 | 478 | (it (format "should remove duplicates, yielding the same result (for %S command invocation)" command)
|
479 | 479 | ;; repeat the same test for PowerShell too
|
480 | 480 | (let ((expected (string-join `("-Sdeps "
|
481 |
| - ,(cider--shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.39.1\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}" |
| 481 | + ,(cider--shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.40.0\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}" |
482 | 482 | command)
|
483 | 483 | " -M:dev:test:cider/nrepl")
|
484 | 484 | "")))
|
|
488 | 488 | :to-equal expected))))
|
489 | 489 | (it "handles aliases correctly"
|
490 | 490 | (let ((expected (string-join `("-Sdeps "
|
491 |
| - ,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.39.1\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
| 491 | + ,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.40.0\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
492 | 492 | " -M:test:cider/nrepl")
|
493 | 493 | ""))
|
494 | 494 | (deps '(("nrepl/nrepl" "0.9.0"))))
|
|
516 | 516 | :to-equal expected)))))
|
517 | 517 | (it "allows for global options"
|
518 | 518 | (let ((expected (string-join `("-J-Djdk.attach.allowAttachSelf -Sdeps "
|
519 |
| - ,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.39.1\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
| 519 | + ,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.40.0\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
520 | 520 | " -M:test:cider/nrepl")
|
521 | 521 | ""))
|
522 | 522 | (deps '(("nrepl/nrepl" "0.9.0"))))
|
|
527 | 527 | (setq-local cider-jack-in-dependencies '(("org.clojure/tools.deps" (("git/sha" . "6ae2b6f71773de7549d7f22759e8b09fec27f0d9")
|
528 | 528 | ("git/url" . "https://github.com/clojure/tools.deps/")))))
|
529 | 529 | (let ((expected (string-join `("clojure -Sdeps "
|
530 |
| - ,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.39.1\"} org.clojure/tools.deps { :git/sha \"6ae2b6f71773de7549d7f22759e8b09fec27f0d9\" :git/url \"https://github.com/clojure/tools.deps/\" }} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
| 530 | + ,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.40.0\"} org.clojure/tools.deps { :git/sha \"6ae2b6f71773de7549d7f22759e8b09fec27f0d9\" :git/url \"https://github.com/clojure/tools.deps/\" }} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
531 | 531 | " -M:cider/nrepl")
|
532 | 532 | "")))
|
533 | 533 | (setq-local cider-allow-jack-in-without-project t)
|
|
0 commit comments