|
140 | 140 | (describe "when there is a single dependency"
|
141 | 141 | (before-each
|
142 | 142 | (setq-local cider-injected-nrepl-version "0.9.0")
|
143 |
| - (setq-local cider-injected-middleware-version "0.28.4") |
| 143 | + (setq-local cider-injected-middleware-version "0.28.5") |
144 | 144 | (setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
|
145 | 145 | (setq-local cider-jack-in-dependencies-exclusions '())
|
146 | 146 | (setq-local cider-enrich-classpath t))
|
|
150 | 150 | :to-equal (concat "update-in :dependencies conj "
|
151 | 151 | (shell-quote-argument "[nrepl/nrepl \"0.9.0\"]")
|
152 | 152 | " -- update-in :plugins conj "
|
153 |
| - (shell-quote-argument "[cider/cider-nrepl \"0.28.4\"]") |
| 153 | + (shell-quote-argument "[cider/cider-nrepl \"0.28.5\"]") |
154 | 154 | " -- update-in :plugins conj "
|
155 | 155 | (shell-quote-argument "[mx.cider/enrich-classpath \"1.9.0\"]")
|
156 | 156 | " -- update-in :middleware conj cider.enrich-classpath/middleware"
|
|
163 | 163 | "update-in :dependencies conj "
|
164 | 164 | (shell-quote-argument "[nrepl/nrepl \"0.9.0\" :exclusions [org.clojure/clojure]]")
|
165 | 165 | " -- update-in :plugins conj "
|
166 |
| - (shell-quote-argument "[cider/cider-nrepl \"0.28.4\"]") |
| 166 | + (shell-quote-argument "[cider/cider-nrepl \"0.28.5\"]") |
167 | 167 | " -- update-in :plugins conj "
|
168 | 168 | (shell-quote-argument "[mx.cider/enrich-classpath \"1.9.0\"]")
|
169 | 169 | " -- update-in :middleware conj cider.enrich-classpath/middleware"
|
|
175 | 175 | :to-equal (concat "update-in :dependencies conj "
|
176 | 176 | (shell-quote-argument "[nrepl/nrepl \"0.9.0\" :exclusions [org.clojure/clojure foo.bar/baz]]")
|
177 | 177 | " -- update-in :plugins conj "
|
178 |
| - (shell-quote-argument "[cider/cider-nrepl \"0.28.4\"]") |
| 178 | + (shell-quote-argument "[cider/cider-nrepl \"0.28.5\"]") |
179 | 179 | " -- update-in :plugins conj "
|
180 | 180 | (shell-quote-argument "[mx.cider/enrich-classpath \"1.9.0\"]")
|
181 | 181 | " -- update-in :middleware conj cider.enrich-classpath/middleware"
|
|
188 | 188 | " -d "
|
189 | 189 | (shell-quote-argument "nrepl/nrepl:0.9.0")
|
190 | 190 | " -d "
|
191 |
| - (shell-quote-argument "cider/cider-nrepl:0.28.4") |
| 191 | + (shell-quote-argument "cider/cider-nrepl:0.28.5") |
192 | 192 | " cider.tasks/add-middleware"
|
193 | 193 | " -m "
|
194 | 194 | (shell-quote-argument "cider.nrepl/cider-middleware")
|
|
197 | 197 | (it "can inject dependencies in a gradle project"
|
198 | 198 | (expect (cider-inject-jack-in-dependencies "--no-daemon" ":clojureRepl" 'gradle)
|
199 | 199 | :to-equal (concat "--no-daemon "
|
200 |
| - (shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.28.4") |
| 200 | + (shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.28.5") |
201 | 201 | " :clojureRepl "
|
202 | 202 | (shell-quote-argument "--middleware=cider.nrepl/cider-middleware")))))
|
203 | 203 |
|
|
214 | 214 | " -- update-in :plugins conj "
|
215 | 215 | (shell-quote-argument "[refactor-nrepl \"2.0.0\"]")
|
216 | 216 | " -- update-in :plugins conj "
|
217 |
| - (shell-quote-argument "[cider/cider-nrepl \"0.28.4\"]") |
| 217 | + (shell-quote-argument "[cider/cider-nrepl \"0.28.5\"]") |
218 | 218 | " -- update-in :plugins conj "
|
219 | 219 | (shell-quote-argument "[mx.cider/enrich-classpath \"1.9.0\"]")
|
220 | 220 | " -- update-in :middleware conj cider.enrich-classpath/middleware"
|
|
227 | 227 | " -d "
|
228 | 228 | (shell-quote-argument "nrepl/nrepl:0.9.0")
|
229 | 229 | " -d "
|
230 |
| - (shell-quote-argument "cider/cider-nrepl:0.28.4") |
| 230 | + (shell-quote-argument "cider/cider-nrepl:0.28.5") |
231 | 231 | " -d "
|
232 | 232 | (shell-quote-argument "refactor-nrepl:2.0.0")
|
233 | 233 | " cider.tasks/add-middleware"
|
|
249 | 249 | :to-equal (concat "-o -U update-in :dependencies conj "
|
250 | 250 | (shell-quote-argument "[nrepl/nrepl \"0.9.0\"]")
|
251 | 251 | " -- update-in :plugins conj "
|
252 |
| - (shell-quote-argument "[cider/cider-nrepl \"0.28.4\"]") |
| 252 | + (shell-quote-argument "[cider/cider-nrepl \"0.28.5\"]") |
253 | 253 | " -- update-in :plugins conj "
|
254 | 254 | (shell-quote-argument "[mx.cider/enrich-classpath \"1.9.0\"]")
|
255 | 255 | " -- update-in :middleware conj cider.enrich-classpath/middleware"
|
|
260 | 260 | " -d "
|
261 | 261 | (shell-quote-argument "nrepl/nrepl:0.9.0")
|
262 | 262 | " -d "
|
263 |
| - (shell-quote-argument "cider/cider-nrepl:0.28.4") |
| 263 | + (shell-quote-argument "cider/cider-nrepl:0.28.5") |
264 | 264 | " cider.tasks/add-middleware"
|
265 | 265 | " -m "
|
266 | 266 | (shell-quote-argument "cider.nrepl/cider-middleware")
|
267 | 267 | " repl -s wait")))
|
268 | 268 | (it "can concat in a gradle project"
|
269 | 269 | (expect (cider-inject-jack-in-dependencies "--no-daemon" ":clojureRepl" 'gradle)
|
270 | 270 | :to-equal (concat "--no-daemon "
|
271 |
| - (shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.28.4") |
| 271 | + (shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.28.5") |
272 | 272 | " :clojureRepl "
|
273 | 273 | (shell-quote-argument "--middleware=cider.nrepl/cider-middleware")))))
|
274 | 274 |
|
|
283 | 283 | (setq-local cider-jack-in-nrepl-middlewares '(("refactor-nrepl.middleware/wrap-refactor" :predicate middlewares-predicate) "cider.nrepl/cider-middleware" ("another/middleware"))))
|
284 | 284 | (it "includes plugins whose predicates return true"
|
285 | 285 | (expect (cider-jack-in-normalized-lein-plugins)
|
286 |
| - :to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.28.4")))) |
| 286 | + :to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.28.5")))) |
287 | 287 | (it "includes middlewares whose predicates return true"
|
288 | 288 | (expect (cider-jack-in-normalized-nrepl-middlewares)
|
289 | 289 | :to-equal '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware" "another/middleware")))
|
290 | 290 | (it "ignores plugins whose predicates return false"
|
291 | 291 | (spy-on 'plugins-predicate :and-return-value nil)
|
292 | 292 | (expect (cider-jack-in-normalized-lein-plugins)
|
293 |
| - :to-equal '(("cider/cider-nrepl" "0.28.4"))) |
| 293 | + :to-equal '(("cider/cider-nrepl" "0.28.5"))) |
294 | 294 | (spy-on 'middlewares-predicate :and-return-value nil)
|
295 | 295 | (expect (cider-jack-in-normalized-nrepl-middlewares)
|
296 | 296 | :to-equal '("cider.nrepl/cider-middleware" "another/middleware")))
|
|
319 | 319 | :and-return-value '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware"))
|
320 | 320 | (spy-on 'cider-jack-in-normalized-lein-plugins
|
321 | 321 | :and-return-value '(("refactor-nrepl" "2.0.0")
|
322 |
| - ("cider/cider-nrepl" "0.28.4") |
| 322 | + ("cider/cider-nrepl" "0.28.5") |
323 | 323 | ("mx.cider/enrich-classpath" "1.9.0")))
|
324 | 324 | (setq-local cider-jack-in-dependencies-exclusions '())
|
325 | 325 | (setq-local cider-enrich-classpath t))
|
|
330 | 330 | " -- update-in :plugins conj "
|
331 | 331 | (shell-quote-argument "[refactor-nrepl \"2.0.0\"]")
|
332 | 332 | " -- update-in :plugins conj "
|
333 |
| - (shell-quote-argument "[cider/cider-nrepl \"0.28.4\"]") |
| 333 | + (shell-quote-argument "[cider/cider-nrepl \"0.28.5\"]") |
334 | 334 | " -- update-in :plugins conj "
|
335 | 335 | (shell-quote-argument "[mx.cider/enrich-classpath \"1.9.0\"]")
|
336 | 336 | " -- update-in :middleware conj cider.enrich-classpath/middleware"
|
|
348 | 348 | " -d "
|
349 | 349 | (shell-quote-argument "nrepl/nrepl:0.9.0")
|
350 | 350 | " -d "
|
351 |
| - (shell-quote-argument "cider/cider-nrepl:0.28.4") |
| 351 | + (shell-quote-argument "cider/cider-nrepl:0.28.5") |
352 | 352 | " -d "
|
353 | 353 | (shell-quote-argument "refactor-nrepl:2.0.0")
|
354 | 354 | " cider.tasks/add-middleware"
|
|
435 | 435 | (setq-local cider-jack-in-dependencies nil)
|
436 | 436 | (setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
|
437 | 437 | (let ((expected (string-join '("clojure -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} "
|
438 |
| - "cider/cider-nrepl {:mvn/version \"0.28.4\"}} " |
| 438 | + "cider/cider-nrepl {:mvn/version \"0.28.5\"}} " |
439 | 439 | ":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
|
440 | 440 | " \"[cider.nrepl/cider-middleware]\"]}}}' -M:cider/nrepl")
|
441 | 441 | "")))
|
|
447 | 447 | (spy-on 'cider-jack-in-resolve-command :and-return-value "clojure")
|
448 | 448 | (expect (plist-get (cider--update-jack-in-cmd nil) :jack-in-cmd)
|
449 | 449 | :to-equal expected)))
|
450 |
| - |
| 450 | + |
451 | 451 | (it "allows specifying custom aliases with `cider-clojure-cli-aliases`"
|
452 | 452 | (let ((expected (string-join '("clojure -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} "
|
453 |
| - "cider/cider-nrepl {:mvn/version \"0.28.4\"}} " |
| 453 | + "cider/cider-nrepl {:mvn/version \"0.28.5\"}} " |
454 | 454 | ":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
|
455 | 455 | " \"[cider.nrepl/cider-middleware]\"]}}}' -M:dev:test:cider/nrepl")
|
456 | 456 | "")))
|
|
464 | 464 | (expect (plist-get (cider--update-jack-in-cmd nil) :jack-in-cmd)
|
465 | 465 | :to-equal expected)))
|
466 | 466 | (it "should remove duplicates, yielding the same result"
|
467 |
| - (let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl {:mvn/version \"0.28.4\"} " |
| 467 | + (let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl {:mvn/version \"0.28.5\"} " |
468 | 468 | "nrepl/nrepl {:mvn/version \"0.9.0\"}} "
|
469 | 469 | ":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
|
470 | 470 | " \"[cider.nrepl/cider-middleware]\"]}}}' -M:dev:test:cider/nrepl")
|
|
473 | 473 | ("nrepl/nrepl" "0.9.0")))
|
474 | 474 | :to-equal expected)))
|
475 | 475 | (it "handles aliases correctly"
|
476 |
| - (let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl {:mvn/version \"0.28.4\"} " |
| 476 | + (let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl {:mvn/version \"0.28.5\"} " |
477 | 477 | "nrepl/nrepl {:mvn/version \"0.9.0\"}} "
|
478 | 478 | ":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
|
479 | 479 | " \"[cider.nrepl/cider-middleware]\"]}}}' -M:test:cider/nrepl")
|
|
496 | 496 | (expect (cider-clojure-cli-jack-in-dependencies nil nil deps)
|
497 | 497 | :to-equal expected)))))
|
498 | 498 | (it "allows for global options"
|
499 |
| - (let ((expected (string-join '("-J-Djdk.attach.allowAttachSelf -Sdeps '{:deps {cider/cider-nrepl {:mvn/version \"0.28.4\"} " |
| 499 | + (let ((expected (string-join '("-J-Djdk.attach.allowAttachSelf -Sdeps '{:deps {cider/cider-nrepl {:mvn/version \"0.28.5\"} " |
500 | 500 | "nrepl/nrepl {:mvn/version \"0.9.0\"}} "
|
501 | 501 | ":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
|
502 | 502 | " \"[cider.nrepl/cider-middleware]\"]}}}' -M:test:cider/nrepl")
|
|
0 commit comments