branch: elpa/cider
commit f3f7d83bb1a56098f96a0c7cedcc12465572eb9c
Author: vemv <v...@users.noreply.github.com>
Commit: Bozhidar Batsov <bozhi...@batsov.dev>
Use `it` more
This ensures their execution is displayed on CI.
---
test/cider-connection-tests.el | 4 +--
test/cider-doc-tests.el | 30 ++++++++++++++-------
test/cider-jar-test.el | 60 +++++++++++++++++++++++-------------------
test/cider-test-tests.el | 19 ++++++-------
4 files changed, 66 insertions(+), 47 deletions(-)
diff --git a/test/cider-connection-tests.el b/test/cider-connection-tests.el
index d4c6ea9a21..a397d5a8c1 100644
--- a/test/cider-connection-tests.el
+++ b/test/cider-connection-tests.el
@@ -434,7 +434,7 @@
(sesman-unregister 'CIDER session))))))
(describe "cider-format-connection-params"
- (describe "correctly abbreviates short directory names"
+ (it "correctly abbreviates short directory names"
(expect (cider-format-connection-params "%J" '(:project-dir "~"))
:to-equal "~")
(expect (cider-format-connection-params "%j" '(:project-dir "~"))
@@ -470,7 +470,7 @@
(expect 'y-or-n-p :to-have-been-called-times 3)))
(describe "cider-compatible-middleware-version-p"
- (describe "correctly check compatible required and middleware versions"
+ (it "correctly checks compatible required and middleware versions"
(expect (cider--compatible-middleware-version-p "0.24.0" "0.24.1")
:to-be t)
(expect (cider--compatible-middleware-version-p "0.24.1" "0.23.2")
diff --git a/test/cider-doc-tests.el b/test/cider-doc-tests.el
index 586a893e7c..f4b680064f 100644
--- a/test/cider-doc-tests.el
+++ b/test/cider-doc-tests.el
@@ -29,12 +29,24 @@
(require 'cider-doc)
(describe "cider--abbreviate-file-protocol"
- (expect (cider--abbreviate-file-protocol "file:foo.clj")
- :to-equal
- "foo.clj")
- (expect (cider--abbreviate-file-protocol
"jar:file:/root/.m2/org/clojure/clojure/1.10.3/clojure-1.10.3.jar!/clojure/core.clj")
- :to-equal
- "clojure/core.clj")
- (expect (cider--abbreviate-file-protocol
"zip:file:/root/.m2/org/clojure/clojure/1.10.3/clojure-1.10.3.jar!/clojure/core.clj")
- :to-equal
- "clojure/core.clj"))
+ (it "Removes the file or jar part"
+ (expect (cider--abbreviate-file-protocol "file:foo.clj")
+ :to-equal
+ "foo.clj")
+ (expect (cider--abbreviate-file-protocol
"jar:file:/root/.m2/org/clojure/clojure/1.10.3/clojure-1.10.3.jar!/clojure/core.clj")
+ :to-equal
+ "clojure/core.clj")
+ (expect (cider--abbreviate-file-protocol
"zip:file:/root/.m2/org/clojure/clojure/1.10.3/clojure-1.10.3.jar!/clojure/core.clj")
+ :to-equal
+ "clojure/core.clj")
+ (expect (format-spec "*cider-repl %s(%r:%S)*"
+ (list '(115 . "ClojureProjects/PPL:localhost:36453")
+ '(104 . "localhost")
+ '(72 . "")
+ '(112 . 36453)
+ '(106 . "PPL")
+ '(74 . "ClojureProjects/PPL")
+ '(114 . clj)
+ '(83 . "")))
+ :to-equal
+ "*cider-repl ClojureProjects/PPL:localhost:36453(clj:)*")))
diff --git a/test/cider-jar-test.el b/test/cider-jar-test.el
index fb567f1f84..e639ebd2dd 100644
--- a/test/cider-jar-test.el
+++ b/test/cider-jar-test.el
@@ -30,43 +30,49 @@
(require 'map)
(describe "cider-jar--cider-nrepl-clojars-url"
- (expect (cider-jar-clojars-url "cider" "cider-nrepl" "0.1.2")
- :to-equal
-
"https://repo.clojars.org/cider/cider-nrepl/0.1.2/cider-nrepl-0.1.2.jar";))
+ (it "Builds a Clojars url"
+ (expect (cider-jar-clojars-url "cider" "cider-nrepl" "0.1.2")
+ :to-equal
+
"https://repo.clojars.org/cider/cider-nrepl/0.1.2/cider-nrepl-0.1.2.jar";)))
(describe "cider-jar-ensure-cider-nrepl-jar"
- (expect (cider-jar-find-or-fetch "cider" "cider-nrepl" "0.20.0")
- :to-match
- (rx
"cider-cache/repo.clojars.org/cider/cider-nrepl/0.20.0/cider-nrepl-0.20.0.jar")))
+ (it "Builds a path"
+ (expect (cider-jar-find-or-fetch "cider" "cider-nrepl" "0.20.0")
+ :to-match
+ (rx
"cider-cache/repo.clojars.org/cider/cider-nrepl/0.20.0/cider-nrepl-0.20.0.jar"))))
(describe "cider-jar-contents"
- (expect
- (cider-jar-contents (cider-jar-find-or-fetch "cider" "cider-nrepl"
"0.20.0"))
- :to-contain
- "cider/nrepl.clj"))
+ (it "Has reasonable contents"
+ (expect
+ (cider-jar-contents (cider-jar-find-or-fetch "cider" "cider-nrepl"
"0.20.0"))
+ :to-contain
+ "cider/nrepl.clj")))
(describe "cider-jar-contents-cached"
- (expect
- (map-elt (cider-jar-contents-cached (cider-jar-find-or-fetch "cider"
"cider-nrepl" "0.20.0"))
- "cider/nrepl.clj")
- :to-be t))
+ (it "Has reasonable contents"
+ (expect
+ (map-elt (cider-jar-contents-cached (cider-jar-find-or-fetch "cider"
"cider-nrepl" "0.20.0"))
+ "cider/nrepl.clj")
+ :to-be t)))
(describe "cider-jar-contains"
- (expect
- (cider-jar-contains-p (cider-jar-find-or-fetch "cider" "cider-nrepl"
"0.20.0")
- "cider/nrepl.clj")
- :to-be t)
- (expect
- (cider-jar-contains-p (cider-jar-find-or-fetch "cider" "cider-nrepl"
"0.20.0")
- "foo/bar.clj")
- :to-be nil))
+ (it "Returns t if and only if a given file is contained"
+ (expect
+ (cider-jar-contains-p (cider-jar-find-or-fetch "cider" "cider-nrepl"
"0.20.0")
+ "cider/nrepl.clj")
+ :to-be t)
+ (expect
+ (cider-jar-contains-p (cider-jar-find-or-fetch "cider" "cider-nrepl"
"0.20.0")
+ "foo/bar.clj")
+ :to-be nil)))
(describe "cider-jar-retrieve-resource"
- (expect
- (cider-jar-retrieve-resource (cider-jar-find-or-fetch "cider" "cider-nrepl"
"0.20.0")
- "data_readers.clj")
- :to-equal
- "{dbg cider.nrepl.middleware.debug/debug-reader
+ (it "Correctly extracts and slurps the given file"
+ (expect
+ (cider-jar-retrieve-resource (cider-jar-find-or-fetch "cider"
"cider-nrepl" "0.20.0")
+ "data_readers.clj")
+ :to-equal
+ "{dbg cider.nrepl.middleware.debug/debug-reader
break cider.nrepl.middleware.debug/breakpoint-reader
light cider.nrepl.middleware.enlighten/light-reader}
")))
diff --git a/test/cider-test-tests.el b/test/cider-test-tests.el
index c7ed4dbeaa..35b2c3fd5a 100644
--- a/test/cider-test-tests.el
+++ b/test/cider-test-tests.el
@@ -29,12 +29,13 @@
(require 'cider-test)
(describe "cider-test--string-contains-newline"
- (expect (cider-test--string-contains-newline "n")
- :to-equal
- nil)
- (expect (cider-test--string-contains-newline "Hello\nWorld")
- :to-equal
- nil)
- (expect (cider-test--string-contains-newline "Hello\\nWorld")
- :to-equal
- t))
+ (it "Returns `t' only for escaped newlines"
+ (expect (cider-test--string-contains-newline "n")
+ :to-equal
+ nil)
+ (expect (cider-test--string-contains-newline "Hello\nWorld")
+ :to-equal
+ nil)
+ (expect (cider-test--string-contains-newline "Hello\\nWorld")
+ :to-equal
+ t)))
