|
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.55.4") |
| 147 | + (setq-local cider-injected-middleware-version "0.55.5") |
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) |
|
155 | 155 | :to-equal (concat "update-in :dependencies conj " |
156 | 156 | (shell-quote-argument "[nrepl/nrepl \"0.9.0\"]") |
157 | 157 | " -- update-in :plugins conj " |
158 | | - (shell-quote-argument "[cider/cider-nrepl \"0.55.4\"]") |
| 158 | + (shell-quote-argument "[cider/cider-nrepl \"0.55.5\"]") |
159 | 159 | " -- update-in :plugins conj " |
160 | 160 | (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]") |
161 | 161 | " -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'" |
|
169 | 169 | "update-in :dependencies conj " |
170 | 170 | (shell-quote-argument "[nrepl/nrepl \"0.9.0\" :exclusions [org.clojure/clojure]]") |
171 | 171 | " -- update-in :plugins conj " |
172 | | - (shell-quote-argument "[cider/cider-nrepl \"0.55.4\"]") |
| 172 | + (shell-quote-argument "[cider/cider-nrepl \"0.55.5\"]") |
173 | 173 | " -- update-in :plugins conj " |
174 | 174 | (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]") |
175 | 175 | " -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'" |
|
182 | 182 | :to-equal (concat "update-in :dependencies conj " |
183 | 183 | (shell-quote-argument "[nrepl/nrepl \"0.9.0\" :exclusions [org.clojure/clojure foo.bar/baz]]") |
184 | 184 | " -- update-in :plugins conj " |
185 | | - (shell-quote-argument "[cider/cider-nrepl \"0.55.4\"]") |
| 185 | + (shell-quote-argument "[cider/cider-nrepl \"0.55.5\"]") |
186 | 186 | " -- update-in :plugins conj " |
187 | 187 | (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]") |
188 | 188 | " -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'" |
|
193 | 193 | (expect (cider-inject-jack-in-dependencies "--no-daemon" ":clojureRepl" 'gradle) |
194 | 194 | :to-equal (concat "--no-daemon " |
195 | 195 | "-Pjdk.attach.allowAttachSelf " |
196 | | - (shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.55.4") |
| 196 | + (shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.55.5") |
197 | 197 | " :clojureRepl " |
198 | 198 | (shell-quote-argument "--middleware=cider.nrepl/cider-middleware"))))) |
199 | 199 |
|
|
210 | 210 | " -- update-in :plugins conj " |
211 | 211 | (shell-quote-argument "[refactor-nrepl \"2.0.0\"]") |
212 | 212 | " -- update-in :plugins conj " |
213 | | - (shell-quote-argument "[cider/cider-nrepl \"0.55.4\"]") |
| 213 | + (shell-quote-argument "[cider/cider-nrepl \"0.55.5\"]") |
214 | 214 | " -- update-in :plugins conj " |
215 | 215 | (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]") |
216 | 216 | " -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'" |
|
229 | 229 | :to-equal (concat "-o -U update-in :dependencies conj " |
230 | 230 | (shell-quote-argument "[nrepl/nrepl \"0.9.0\"]") |
231 | 231 | " -- update-in :plugins conj " |
232 | | - (shell-quote-argument "[cider/cider-nrepl \"0.55.4\"]") |
| 232 | + (shell-quote-argument "[cider/cider-nrepl \"0.55.5\"]") |
233 | 233 | " -- update-in :plugins conj " |
234 | 234 | (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]") |
235 | 235 | " -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'" |
|
239 | 239 | (expect (cider-inject-jack-in-dependencies "--no-daemon" ":clojureRepl" 'gradle) |
240 | 240 | :to-equal (concat "--no-daemon " |
241 | 241 | "-Pjdk.attach.allowAttachSelf " |
242 | | - (shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.55.4") |
| 242 | + (shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.55.5") |
243 | 243 | " :clojureRepl " |
244 | 244 | (shell-quote-argument "--middleware=cider.nrepl/cider-middleware"))))) |
245 | 245 |
|
|
254 | 254 | (setq-local cider-jack-in-nrepl-middlewares '(("refactor-nrepl.middleware/wrap-refactor" :predicate middlewares-predicate) "cider.nrepl/cider-middleware" ("another/middleware")))) |
255 | 255 | (it "includes plugins whose predicates return true" |
256 | 256 | (expect (cider-jack-in-normalized-lein-plugins) |
257 | | - :to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.55.4")))) |
| 257 | + :to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.55.5")))) |
258 | 258 | (it "includes middlewares whose predicates return true" |
259 | 259 | (expect (cider-jack-in-normalized-nrepl-middlewares) |
260 | 260 | :to-equal '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware" "another/middleware"))) |
261 | 261 | (it "ignores plugins whose predicates return false" |
262 | 262 | (spy-on 'plugins-predicate :and-return-value nil) |
263 | 263 | (expect (cider-jack-in-normalized-lein-plugins) |
264 | | - :to-equal '(("cider/cider-nrepl" "0.55.4"))) |
| 264 | + :to-equal '(("cider/cider-nrepl" "0.55.5"))) |
265 | 265 | (spy-on 'middlewares-predicate :and-return-value nil) |
266 | 266 | (expect (cider-jack-in-normalized-nrepl-middlewares) |
267 | 267 | :to-equal '("cider.nrepl/cider-middleware" "another/middleware"))) |
|
290 | 290 | :and-return-value '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware")) |
291 | 291 | (spy-on 'cider-jack-in-normalized-lein-plugins |
292 | 292 | :and-return-value '(("refactor-nrepl" "2.0.0") |
293 | | - ("cider/cider-nrepl" "0.55.4") |
| 293 | + ("cider/cider-nrepl" "0.55.5") |
294 | 294 | ("mx.cider/lein-enrich-classpath" "1.19.3"))) |
295 | 295 | (setq-local cider-jack-in-dependencies-exclusions '()) |
296 | 296 | (setq-local cider-enrich-classpath t)) |
|
301 | 301 | " -- update-in :plugins conj " |
302 | 302 | (shell-quote-argument "[refactor-nrepl \"2.0.0\"]") |
303 | 303 | " -- update-in :plugins conj " |
304 | | - (shell-quote-argument "[cider/cider-nrepl \"0.55.4\"]") |
| 304 | + (shell-quote-argument "[cider/cider-nrepl \"0.55.5\"]") |
305 | 305 | " -- update-in :plugins conj " |
306 | 306 | (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]") |
307 | 307 | " -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'" |
|
393 | 393 | (setq-local cider-jack-in-dependencies nil) |
394 | 394 | (setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware")) |
395 | 395 | (let ((expected (string-join `("clojure -Sdeps " |
396 | | - ,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.55.4\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
| 396 | + ,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.55.5\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
397 | 397 | " -M:cider/nrepl") |
398 | 398 | ""))) |
399 | 399 | (setq-local cider-allow-jack-in-without-project t) |
|
408 | 408 |
|
409 | 409 | (it "allows specifying custom aliases with `cider-clojure-cli-aliases`" |
410 | 410 | (let ((expected (string-join `("clojure -Sdeps " |
411 | | - ,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.55.4\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
| 411 | + ,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.55.5\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
412 | 412 | " -M:dev:test:cider/nrepl") |
413 | 413 | ""))) |
414 | 414 | (setq-local cider-jack-in-dependencies nil) |
|
426 | 426 | (it (format "should remove duplicates, yielding the same result (for %S command invocation)" command) |
427 | 427 | ;; repeat the same test for PowerShell too |
428 | 428 | (let ((expected (string-join `("-Sdeps " |
429 | | - ,(cider--shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.55.4\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}" |
| 429 | + ,(cider--shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.55.5\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}" |
430 | 430 | command) |
431 | 431 | " -M:dev:test:cider/nrepl") |
432 | 432 | ""))) |
|
436 | 436 | :to-equal expected)))) |
437 | 437 | (it "handles aliases correctly" |
438 | 438 | (let ((expected (string-join `("-Sdeps " |
439 | | - ,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.55.4\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
| 439 | + ,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.55.5\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
440 | 440 | " -M:test:cider/nrepl") |
441 | 441 | "")) |
442 | 442 | (deps '(("nrepl/nrepl" "0.9.0")))) |
|
464 | 464 | :to-equal expected))))) |
465 | 465 | (it "allows for global options" |
466 | 466 | (let ((expected (string-join `("-J-Xverify:none -Sdeps " |
467 | | - ,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.55.4\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
| 467 | + ,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.55.5\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
468 | 468 | " -M:test:cider/nrepl") |
469 | 469 | "")) |
470 | 470 | (deps '(("nrepl/nrepl" "0.9.0")))) |
|
475 | 475 | (setq-local cider-jack-in-dependencies '(("org.clojure/tools.deps" (("git/sha" . "6ae2b6f71773de7549d7f22759e8b09fec27f0d9") |
476 | 476 | ("git/url" . "https://github.com/clojure/tools.deps/"))))) |
477 | 477 | (let ((expected (string-join `("clojure -Sdeps " |
478 | | - ,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.55.4\"} org.clojure/tools.deps { :git/sha \"6ae2b6f71773de7549d7f22759e8b09fec27f0d9\" :git/url \"https://github.com/clojure/tools.deps/\" }} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
| 478 | + ,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.55.5\"} org.clojure/tools.deps { :git/sha \"6ae2b6f71773de7549d7f22759e8b09fec27f0d9\" :git/url \"https://github.com/clojure/tools.deps/\" }} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}") |
479 | 479 | " -M:cider/nrepl") |
480 | 480 | ""))) |
481 | 481 | (setq-local cider-allow-jack-in-without-project t) |
|
0 commit comments