Skip to content

Commit 5425f4e

Browse files
bbatsovbbatsov
committed
Fix a bunch of jack-in tests
1 parent 69e2f53 commit 5425f4e

File tree

1 file changed

+22
-26
lines changed

1 file changed

+22
-26
lines changed

‎test/cider-tests.el

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,17 @@
112112
(describe "when there is a single dependency"
113113
(before-each
114114
(setq-local cider-jack-in-dependencies '(("nrepl/nrepl" "0.5.3")))
115+
(setq-local cider-injected-middleware-version "0.28.1")
115116
(setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
116-
(setq-local cider-jack-in-lein-plugins '(("cider/cider-nrepl" "0.10.0-SNAPSHOT")))
117117
(setq-local cider-jack-in-dependencies-exclusions '())
118118
(setq-local cider-enrich-classpath t))
119119

120120
(it "can inject dependencies in a lein project"
121121
(expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
122122
:to-equal (concat "update-in :dependencies conj "
123-
(shell-quote-argument "[nrepl/nrepl \"0.5.3\"]")
123+
(shell-quote-argument "[nrepl/nrepl \"0.28.1\"]")
124124
" -- update-in :plugins conj "
125-
(shell-quote-argument "[cider/cider-nrepl \"0.10.0-SNAPSHOT\"]")
125+
(shell-quote-argument "[cider/cider-nrepl \"0.28.1\"]")
126126
" -- update-in :plugins conj "
127127
(shell-quote-argument "[mx.cider/enrich-classpath \"1.8.0\"]")
128128
" -- update-in :middleware conj cider.enrich-classpath/middleware"
@@ -135,7 +135,7 @@
135135
"update-in :dependencies conj "
136136
(shell-quote-argument "[nrepl/nrepl \"0.5.3\" :exclusions [org.clojure/clojure]]")
137137
" -- update-in :plugins conj "
138-
(shell-quote-argument "[cider/cider-nrepl \"0.10.0-SNAPSHOT\"]")
138+
(shell-quote-argument "[cider/cider-nrepl \"0.28.1\"]")
139139
" -- update-in :plugins conj "
140140
(shell-quote-argument "[mx.cider/enrich-classpath \"1.8.0\"]")
141141
" -- update-in :middleware conj cider.enrich-classpath/middleware"
@@ -147,7 +147,7 @@
147147
:to-equal (concat "update-in :dependencies conj "
148148
(shell-quote-argument "[nrepl/nrepl \"0.5.3\" :exclusions [org.clojure/clojure foo.bar/baz]]")
149149
" -- update-in :plugins conj "
150-
(shell-quote-argument "[cider/cider-nrepl \"0.10.0-SNAPSHOT\"]")
150+
(shell-quote-argument "[cider/cider-nrepl \"0.28.1\"]")
151151
" -- update-in :plugins conj "
152152
(shell-quote-argument "[mx.cider/enrich-classpath \"1.8.0\"]")
153153
" -- update-in :middleware conj cider.enrich-classpath/middleware"
@@ -160,7 +160,7 @@
160160
" -d "
161161
(shell-quote-argument "nrepl/nrepl:0.5.3")
162162
" -d "
163-
(shell-quote-argument "cider/cider-nrepl:0.10.0-SNAPSHOT")
163+
(shell-quote-argument "cider/cider-nrepl:0.28.1")
164164
" cider.tasks/add-middleware"
165165
" -m "
166166
(shell-quote-argument "cider.nrepl/cider-middleware")
@@ -182,7 +182,7 @@
182182
" -- update-in :plugins conj "
183183
(shell-quote-argument "[refactor-nrepl \"2.0.0\"]")
184184
" -- update-in :plugins conj "
185-
(shell-quote-argument "[cider/cider-nrepl \"0.11.0\"]")
185+
(shell-quote-argument "[cider/cider-nrepl \"0.28.1\"]")
186186
" -- update-in :plugins conj "
187187
(shell-quote-argument "[mx.cider/enrich-classpath \"1.8.0\"]")
188188
" -- update-in :middleware conj cider.enrich-classpath/middleware"
@@ -196,7 +196,7 @@
196196
" -d "
197197
(shell-quote-argument "refactor-nrepl:2.0.0")
198198
" -d "
199-
(shell-quote-argument "cider/cider-nrepl:0.11.0")
199+
(shell-quote-argument "cider/cider-nrepl:0.28.1")
200200
" cider.tasks/add-middleware"
201201
" -m "
202202
(shell-quote-argument "refactor-nrepl.middleware/wrap-refactor")
@@ -208,14 +208,13 @@
208208
(before-each
209209
(setq-local cider-jack-in-dependencies '(("nrepl/nrepl" "0.5.3")))
210210
(setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
211-
(setq-local cider-jack-in-lein-plugins '(("cider/cider-nrepl" "0.11.0")))
212211
(setq-local cider-jack-in-dependencies-exclusions '()))
213212
(it "can concat in a lein project"
214213
(expect (cider-inject-jack-in-dependencies "-o -U" "repl :headless" 'lein)
215214
:to-equal (concat "-o -U update-in :dependencies conj "
216215
(shell-quote-argument "[nrepl/nrepl \"0.5.3\"]")
217216
" -- update-in :plugins conj "
218-
(shell-quote-argument "[cider/cider-nrepl \"0.11.0\"]")
217+
(shell-quote-argument "[cider/cider-nrepl \"0.28.1\"]")
219218
" -- update-in :plugins conj "
220219
(shell-quote-argument "[mx.cider/enrich-classpath \"1.8.0\"]")
221220
" -- update-in :middleware conj cider.enrich-classpath/middleware"
@@ -226,7 +225,7 @@
226225
" -d "
227226
(shell-quote-argument "nrepl/nrepl:0.5.3")
228227
" -d "
229-
(shell-quote-argument "cider/cider-nrepl:0.11.0")
228+
(shell-quote-argument "cider/cider-nrepl:0.28.1")
230229
" cider.tasks/add-middleware"
231230
" -m "
232231
(shell-quote-argument "cider.nrepl/cider-middleware")
@@ -241,18 +240,18 @@
241240
(before-each
242241
(fset 'plugins-predicate (lambda (&rest _) t))
243242
(fset 'middlewares-predicate (lambda (&rest _) t))
244-
(setq-local cider-jack-in-lein-plugins '(("refactor-nrepl" "2.0.0" :predicate plugins-predicate) ("cider/cider-nrepl" "0.11.0")))
243+
(setq-local cider-jack-in-lein-plugins '(("refactor-nrepl" "2.0.0" :predicate plugins-predicate)))
245244
(setq-local cider-jack-in-nrepl-middlewares '(("refactor-nrepl.middleware/wrap-refactor" :predicate middlewares-predicate) "cider.nrepl/cider-middleware" ("another/middleware"))))
246245
(it "includes plugins whose predicates return true"
247246
(expect (cider-jack-in-normalized-lein-plugins)
248-
:to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.11.0"))))
247+
:to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.28.1"))))
249248
(it "includes middlewares whose predicates return true"
250249
(expect (cider-jack-in-normalized-nrepl-middlewares)
251250
:to-equal '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware" "another/middleware")))
252251
(it "ignores plugins whose predicates return false"
253252
(spy-on 'plugins-predicate :and-return-value nil)
254253
(expect (cider-jack-in-normalized-lein-plugins)
255-
:to-equal '(("cider/cider-nrepl" "0.11.0")))
254+
:to-equal '(("cider/cider-nrepl" "0.28.1")))
256255
(spy-on 'middlewares-predicate :and-return-value nil)
257256
(expect (cider-jack-in-normalized-nrepl-middlewares)
258257
:to-equal '("cider.nrepl/cider-middleware" "another/middleware")))
@@ -281,7 +280,7 @@
281280
:and-return-value '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware"))
282281
(spy-on 'cider-jack-in-normalized-lein-plugins
283282
:and-return-value '(("refactor-nrepl" "2.0.0")
284-
("cider/cider-nrepl" "0.11.0")
283+
("cider/cider-nrepl" "0.28.1")
285284
("mx.cider/enrich-classpath" "1.8.0")))
286285
(setq-local cider-jack-in-dependencies-exclusions '()))
287286
(it "uses them in a lein project"
@@ -291,19 +290,17 @@
291290
" -- update-in :plugins conj "
292291
(shell-quote-argument "[refactor-nrepl \"2.0.0\"]")
293292
" -- update-in :plugins conj "
294-
(shell-quote-argument "[cider/cider-nrepl \"0.11.0\"]")
293+
(shell-quote-argument "[cider/cider-nrepl \"0.28.1\"]")
295294
" -- update-in :plugins conj "
296295
(shell-quote-argument "[mx.cider/enrich-classpath \"1.8.0\"]")
297296
" -- update-in :middleware conj cider.enrich-classpath/middleware"
298297
" -- repl :headless"))))
299298

300-
(describe "when the middleware and plugin lists have been normalized (Boot)"
299+
(describe "when the middleware lists have been normalized (Boot)"
301300
(before-each
302301
(spy-on 'cider-jack-in-normalized-nrepl-middlewares
303302
:and-return-value '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware"))
304-
(spy-on 'cider-jack-in-normalized-lein-plugins
305-
:and-return-value '(("refactor-nrepl" "2.0.0")
306-
("cider/cider-nrepl" "0.11.0")))
303+
(setq-local cider-jack-in-dependencies ("refactor-nrepl" "2.0.0"))
307304
(setq-local cider-jack-in-dependencies-exclusions '()))
308305
(it "uses them in a boot project"
309306
(expect (cider-inject-jack-in-dependencies "" "repl -s wait" 'boot)
@@ -313,7 +310,7 @@
313310
" -d "
314311
(shell-quote-argument "refactor-nrepl:2.0.0")
315312
" -d "
316-
(shell-quote-argument "cider/cider-nrepl:0.11.0")
313+
(shell-quote-argument "cider/cider-nrepl:0.28.1")
317314
" cider.tasks/add-middleware"
318315
" -m "
319316
(shell-quote-argument "refactor-nrepl.middleware/wrap-refactor")
@@ -396,10 +393,9 @@
396393
(describe "when 'clojure-cli project type"
397394
(it "uses main opts in an alias to prevent other mains from winning"
398395
(setq-local cider-jack-in-dependencies '(("nrepl/nrepl" "0.8.3")))
399-
(setq-local cider-jack-in-lein-plugins '(("cider/cider-nrepl" "0.25.7")))
400396
(setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
401397
(let ((expected (string-join '("clojure -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.8.3\"} "
402-
"cider/cider-nrepl {:mvn/version \"0.25.7\"}} "
398+
"cider/cider-nrepl {:mvn/version \"0.28.1\"}} "
403399
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
404400
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:cider/nrepl")
405401
"")))
@@ -413,7 +409,7 @@
413409
:to-equal expected)))
414410
(it "allows specifying custom aliases with `cider-clojure-cli-aliases`"
415411
(let ((expected (string-join '("clojure -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.8.3\"} "
416-
"cider/cider-nrepl {:mvn/version \"0.25.7\"}} "
412+
"cider/cider-nrepl {:mvn/version \"0.28.1\"}} "
417413
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
418414
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:dev:test:cider/nrepl")
419415
"")))
@@ -427,7 +423,7 @@
427423
:to-equal expected)))
428424
(it "handles aliases correctly"
429425
(let ((expected (string-join '("-Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.8.3\"} "
430-
"cider/cider-nrepl {:mvn/version \"0.25.7\"}} "
426+
"cider/cider-nrepl {:mvn/version \"0.28.1\"}} "
431427
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
432428
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:test:cider/nrepl")
433429
""))
@@ -450,7 +446,7 @@
450446
:to-equal expected)))))
451447
(it "allows for global options"
452448
(let ((expected (string-join '("-J-Djdk.attach.allowAttachSelf -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.8.3\"} "
453-
"cider/cider-nrepl {:mvn/version \"0.25.7\"}} "
449+
"cider/cider-nrepl {:mvn/version \"0.28.1\"}} "
454450
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
455451
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:test:cider/nrepl")
456452
""))

0 commit comments

Comments
 (0)