Fix tests

Author: vspinu

cider-interaction.el

@@ -1785,7 +1785,7 @@ and all ancillary CIDER buffers."
   (if (and quit-all (y-or-n-p "Are you sure you want to quit all CIDER connections? "))
       (progn
         (when-let ((scratch (get-buffer cider-scratch-buffer-name)))
-          (when (y-or-n-p (format "Kill %s? buffer" cider-scratch-buffer-name))
+          (when (y-or-n-p (format "Kill %s buffer? " cider-scratch-buffer-name))
             (kill-buffer cider-scratch-buffer-name)))
         (dolist (connection cider-connections)
           (cider--quit-connection connection))

test/cider-apropos-tests.el

@@ -34,17 +34,17 @@
 (describe "cider-apropos"
   (it "raises user-error when cider is not connected."
     (spy-on 'cider-connected-p :and-return-value nil)
-    (expect (lambda () (cider-apropos "test")) :to-throw 'user-error))
+    (expect (cider-apropos "test") :to-throw 'user-error))
 
   (it "raises user-error when the `apropos' op is not supported."
     (spy-on 'cider-ensure-op-supported :and-return-value nil)
-    (expect (lambda () (cider-apropos "test")) :to-throw 'user-error)))
+    (expect (cider-apropos "test") :to-throw 'user-error)))
 
 (describe "cider-apropos-documentation"
   (it "raises user-error when cider is not connected."
     (spy-on 'cider-connected-p :and-return-value nil)
-    (expect (lambda () (cider-apropos-documentation)) :to-throw 'user-error))
+    (expect (cider-apropos-documentation) :to-throw 'user-error))
 
   (it "raises user-error when the `apropos' op is not supported."
     (spy-on 'cider-ensure-op-supported :and-return-value nil)
-    (expect (lambda () (cider-apropos-documentation)) :to-throw 'user-error)))
+    (expect (cider-apropos-documentation) :to-throw 'user-error)))

test/cider-classpath-tests.el

@@ -34,17 +34,17 @@
 (describe "cider-classpath"
   (it "raises user-error when cider is not connected."
     (spy-on 'cider-connected-p :and-return-value nil)
-    (expect (lambda () (cider-classpath)) :to-throw 'user-error))
+    (expect (cider-classpath) :to-throw 'user-error))
 
   (it "raises user-error when the `classpath' op is not supported."
     (spy-on 'cider-ensure-op-supported :and-return-value nil)
-    (expect (lambda () (cider-classpath)) :to-throw 'user-error)))
+    (expect (cider-classpath) :to-throw 'user-error)))
 
 (describe "cider-open-classpath-entry"
   (it "raises user-error when cider is not connected."
     (spy-on 'cider-connected-p :and-return-value nil)
-    (expect (lambda () (cider-open-classpath-entry)) :to-throw 'user-error))
+    (expect (cider-open-classpath-entry) :to-throw 'user-error))
 
   (it "raises user-error when the `classpath' op is not supported."
     (spy-on 'cider-ensure-op-supported :and-return-value nil)
-    (expect (lambda () (cider-open-classpath-entry)) :to-throw 'user-error)))
+    (expect (cider-open-classpath-entry) :to-throw 'user-error)))

test/cider-client-tests.el

@@ -438,15 +438,15 @@
     (expect (cider-ensure-connected) :to-equal nil))
   (it "raises a user-error in the absence of a connection"
     (spy-on 'cider-connected-p :and-return-value nil)
-    (expect (lambda () (cider-ensure-connected)) :to-throw 'user-error)))
+    (expect (cider-ensure-connected) :to-throw 'user-error)))
 
 (describe "cider-ensure-op-supported"
   (it "returns nil when the op is supported"
     (spy-on 'cider-nrepl-op-supported-p :and-return-value t)
     (expect (cider-ensure-op-supported "foo") :to-equal nil))
   (it "raises a user-error if the op is not supported"
     (spy-on 'cider-nrepl-op-supported-p :and-return-value nil)
-    (expect (lambda () (cider-ensure-op-supported "foo"))
+    (expect (cider-ensure-op-supported "foo")
             :to-throw 'user-error)))
 
 (describe "cider-expected-ns"

test/cider-interaction-tests.el

@@ -58,47 +58,47 @@
 (describe "cider-refresh"
   (it "raises a user error if cider is not connected"
     (spy-on 'cider-connected-p :and-return-value nil)
-    (expect (lambda () (cider-refresh)) :to-throw 'user-error)))
+    (expect (cider-refresh) :to-throw 'user-error)))
 
 (describe "cider-quit"
   (it "raises a user error if cider is not connected"
     (spy-on 'cider-connected-p :and-return-value nil)
-    (expect (lambda () (cider-quit)) :to-throw 'user-error)))
+    (expect (cider-quit) :to-throw 'user-error)))
 
 (describe "cider-restart"
   (it "raises a user error if cider is not connected"
     (spy-on 'cider-connected-p :and-return-value nil)
-    (expect (lambda () (cider-restart)) :to-throw 'user-error)))
+    (expect (cider-restart) :to-throw 'user-error)))
 
 (describe "cider-find-ns"
   (it "raises a user error if cider is not connected"
     (spy-on 'cider-connected-p :and-return-value nil)
-    (expect (lambda () (cider-find-ns)) :to-throw 'user-error))
+    (expect (cider-find-ns) :to-throw 'user-error))
   (it "raises a user error if the op is not supported"
     (spy-on 'cider-nrepl-op-supported-p :and-return-value nil)
-    (expect (lambda () (cider-find-ns)) :to-throw 'user-error)))
+    (expect (cider-find-ns) :to-throw 'user-error)))
 
 (describe "cider-load-all-project-ns"
   (it "raises a user error if cider is not connected"
     (spy-on 'cider-connected-p :and-return-value nil)
-    (expect (lambda () (cider-load-all-project-ns)) :to-throw 'user-error))
+    (expect (cider-load-all-project-ns) :to-throw 'user-error))
   (it "raises a user error if the op is not supported"
     (spy-on 'cider-nrepl-op-supported-p :and-return-value nil)
-    (expect (lambda () (cider-load-all-project-ns)) :to-throw 'user-error)))
+    (expect (cider-load-all-project-ns) :to-throw 'user-error)))
 
 (describe "cider-load-file"
-          (it "works as expected in empty Clojure buffers"
-              (spy-on 'cider-request:load-file :and-return-value nil)
-              (with-connection-buffer "clj" b
-                                      (with-temp-buffer
-                                        (clojure-mode)
-                                        (setq buffer-file-name (make-temp-name "tmp.clj"))
-                                        (expect (lambda () (cider-load-buffer)) :not :to-throw)))))
+  (it "works as expected in empty Clojure buffers"
+    (spy-on 'cider-request:load-file :and-return-value nil)
+    (with-connection-buffer "clj" b
+      (with-temp-buffer
+        (clojure-mode)
+        (setq buffer-file-name (make-temp-name "tmp.clj"))
+        (expect (cider-load-buffer) :not :to-throw)))))
 
 (describe "cider-interactive-eval"
-          (it "works as expected in empty Clojure buffers"
-              (spy-on 'cider-nrepl-request:eval :and-return-value nil)
-              (with-connection-buffer "clj" b
-                                      (with-temp-buffer
-                                        (clojure-mode)
-                                        (expect (lambda () (cider-interactive-eval "(+ 1)")) :not :to-throw)))))
+  (it "works as expected in empty Clojure buffers"
+    (spy-on 'cider-nrepl-request:eval :and-return-value nil)
+    (with-connection-buffer "clj" b
+      (with-temp-buffer
+        (clojure-mode)
+        (expect (cider-interactive-eval "(+ 1)") :not :to-throw)))))