Merge tag 'v0.19.0+dfsg'

DFSG-clean upstream version 0.19.0

25 files changed, 102 insertions, 104 deletions

diff --git a/test/cider-apropos-tests.el b/test/cider-apropos-tests.el
index 2c44e02c..1ab00449 100644
--- a/test/cider-apropos-tests.el
+++ b/test/cider-apropos-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-apropos-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/cider-browse-ns-tests.el b/test/cider-browse-ns-tests.el
index 6967b4b4..f3c7fc31 100644
--- a/test/cider-browse-ns-tests.el
+++ b/test/cider-browse-ns-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-browse-ns-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/cider-classpath-tests.el b/test/cider-classpath-tests.el
index 19b14298..e5e5af82 100644
--- a/test/cider-classpath-tests.el
+++ b/test/cider-classpath-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-classpath-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/cider-client-tests.el b/test/cider-client-tests.el
index 02b797f6..702d87a9 100644
--- a/test/cider-client-tests.el
+++ b/test/cider-client-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-client-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
@@ -63,20 +63,20 @@
     ;; clojure mode
     (with-temp-buffer
       (clojure-mode)
-      (expect (cider-repl-type-for-buffer) :to-equal "clj"))
+      (expect (cider-repl-type-for-buffer) :to-equal 'clj))
     ;; clojurescript mode
     (with-temp-buffer
       (clojurescript-mode)
-      (expect (cider-repl-type-for-buffer) :to-equal "cljs")))
+      (expect (cider-repl-type-for-buffer) :to-equal 'cljs)))
 
   (it "returns the connection type based on `cider-repl-type'"
     ;; clj
-    (setq cider-repl-type "clj")
-    (expect (cider-repl-type-for-buffer) :to-equal "clj")
+    (setq cider-repl-type 'clj)
+    (expect (cider-repl-type-for-buffer) :to-equal 'clj)
 
     ;; cljs
-    (setq cider-repl-type "cljs")
-    (expect (cider-repl-type-for-buffer) :to-equal "cljs"))
+    (setq cider-repl-type 'cljs)
+    (expect (cider-repl-type-for-buffer) :to-equal 'cljs))
 
   (it "returns nil as its default value"
     (setq cider-repl-type nil)
@@ -85,7 +85,7 @@
 (describe "cider-nrepl-send-unhandled-request"
   (it "returns the id of the request sent to nREPL server and ignores the response"
     (spy-on 'process-send-string :and-return-value nil)
-    (with-repl-buffer "cider-nrepl-send-request" "clj" b
+    (with-repl-buffer "cider-nrepl-send-request" 'clj b
       (setq-local nrepl-pending-requests (make-hash-table :test 'equal))
       (setq-local nrepl-completed-requests (make-hash-table :test 'equal))
       (let ((id (cider-nrepl-send-unhandled-request '("op" "t" "extra" "me"))))
diff --git a/test/cider-common-tests.el b/test/cider-common-tests.el
index 4b8144fc..894207c8 100644
--- a/test/cider-common-tests.el
+++ b/test/cider-common-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-common-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/cider-connection-tests.el b/test/cider-connection-tests.el
index 4d2c3b0e..be2e2dca 100644
--- a/test/cider-connection-tests.el
+++ b/test/cider-connection-tests.el
@@ -1,6 +1,6 @@
  ;;; cider-connection-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov, Vitalie Spinu
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov, Vitalie Spinu
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
@@ -43,7 +43,7 @@
 
   (it "returns nil when a cider connection is available"
     (let ((default-directory "/tmp/a-dir"))
-      (with-repl-buffer "cider-ensure-session" "clj" b
+      (with-repl-buffer "cider-ensure-session" 'clj b
         (expect (cider-ensure-connected) :to-equal
                 (list "cider-ensure-session" b)))))
 
@@ -63,22 +63,22 @@
   (describe "when there are no active connections"
     (it "returns nil"
       (expect (cider-current-repl) :not :to-be-truthy)
-      (expect (cider-current-repl "clj") :not :to-be-truthy)
-      (expect (cider-current-repl "cljs") :not :to-be-truthy)))
+      (expect (cider-current-repl 'clj) :not :to-be-truthy)
+      (expect (cider-current-repl 'cljs) :not :to-be-truthy)))
 
   (describe "when active connections are available"
 
     (it "always returns the latest connection"
       (let ((default-directory "/tmp/a-dir"))
-        (with-repl-buffer ses-name "clj" bb1
-          (with-repl-buffer ses-name "cljs" bb2
-            (with-repl-buffer ses-name "clj" b1
-              (with-repl-buffer ses-name "cljs" b2
+        (with-repl-buffer ses-name 'clj bb1
+          (with-repl-buffer ses-name 'cljs bb2
+            (with-repl-buffer ses-name 'clj b1
+              (with-repl-buffer ses-name 'cljs b2
                 (expect (cider-current-repl) :to-equal b2)
 
                 ;; follows type arguments
-                (expect (cider-current-repl "clj") :to-equal b1)
-                (expect (cider-current-repl "cljs") :to-equal b2)
+                (expect (cider-current-repl 'clj) :to-equal b1)
+                (expect (cider-current-repl 'cljs) :to-equal b2)
 
                 ;; follows file type
                 (with-temp-buffer
@@ -91,19 +91,19 @@
 
     (it "always returns the most recently used connection"
       (let ((default-directory "/tmp/a-dir"))
-        (with-repl-buffer ses-name "clj" bb1
-          (with-repl-buffer ses-name "cljs" bb2
-            (with-repl-buffer ses-name "clj" b1
-              (with-repl-buffer ses-name "cljs" b2
+        (with-repl-buffer ses-name 'clj bb1
+          (with-repl-buffer ses-name 'cljs bb2
+            (with-repl-buffer ses-name 'clj b1
+              (with-repl-buffer ses-name 'cljs b2
 
                 (switch-to-buffer bb2)
                 (switch-to-buffer bb1)
                 (expect (cider-current-repl) :to-equal bb1)
 
                 ;; follows type arguments
-                (expect (cider-current-repl "clj") :to-equal bb1)
+                (expect (cider-current-repl 'clj) :to-equal bb1)
                 (message "%S" (seq-take (buffer-list) 10))
-                (expect (cider-current-repl "cljs") :to-equal bb2)
+                (expect (cider-current-repl 'cljs) :to-equal bb2)
 
                 ;; follows file type
                 (with-temp-buffer
@@ -118,13 +118,13 @@
       (describe "when there is only one connection available"
         (it "returns the only connection"
           (let ((default-directory "/tmp/a-dir"))
-            (with-repl-buffer ses-name "clj" b
+            (with-repl-buffer ses-name 'clj b
               (with-temp-buffer
                 (clojure-mode)
-                (expect (cider-current-repl "clj") :to-equal b))
+                (expect (cider-current-repl 'clj) :to-equal b))
               (with-temp-buffer
                 (clojurec-mode)
-                (expect (cider-current-repl "clj") :to-equal b)))))))
+                (expect (cider-current-repl 'clj) :to-equal b)))))))
 
     (describe "when type argument is given"
 
@@ -132,23 +132,23 @@
         (it "returns that connection buffer"
           (let ((default-directory "/tmp/a-dir"))
             ;; for clj
-            (with-repl-buffer ses-name "clj" b1
-              (with-repl-buffer ses-name "cljs" b2
-                (expect (cider-current-repl "clj") :to-equal b1)))
+            (with-repl-buffer ses-name 'clj b1
+              (with-repl-buffer ses-name 'cljs b2
+                (expect (cider-current-repl 'clj) :to-equal b1)))
             ;; for cljs
-            (with-repl-buffer ses-name "cljs" b1
-              (with-repl-buffer ses-name "clj" b2
-                (expect (cider-current-repl "cljs") :to-equal b1))))))
+            (with-repl-buffer ses-name 'cljs b1
+              (with-repl-buffer ses-name 'clj b2
+                (expect (cider-current-repl 'cljs) :to-equal b1))))))
 
       (describe "when connection of that type doesn't exists"
         (it "returns nil"
           ;; for clj
-          (with-repl-buffer ses-name "cljs" b1
-            (expect (cider-current-repl "clj") :to-equal nil))
+          (with-repl-buffer ses-name 'cljs b1
+            (expect (cider-current-repl 'clj) :to-equal nil))
 
           ;; for cljs
-          (with-repl-buffer ses-name "clj" b2
-            (expect (cider-current-repl "cljs") :to-equal nil))))
+          (with-repl-buffer ses-name 'clj b2
+            (expect (cider-current-repl 'cljs) :to-equal nil))))
 
       (describe "when type argument is not given"
 
@@ -156,15 +156,15 @@
           (it "returns that connection buffer"
             (let ((default-directory "/tmp/a-dir"))
               ;; for clj
-              (with-repl-buffer ses-name "clj" b1
-                (with-repl-buffer ses-name "cljs" b2
+              (with-repl-buffer ses-name 'clj b1
+                (with-repl-buffer ses-name 'cljs b2
                   (with-temp-buffer
                     (setq major-mode 'clojure-mode)
                     (expect (cider-current-repl) :to-equal b1))))
 
               ;; for cljs
-              (with-repl-buffer ses-name "cljs" b1
-                (with-repl-buffer ses-name "clj" b2
+              (with-repl-buffer ses-name 'cljs b1
+                (with-repl-buffer ses-name 'clj b2
                   (with-temp-buffer
                     (setq major-mode 'clojurescript-mode)
                     (expect (cider-current-repl) :to-equal b1)))))))
@@ -172,13 +172,13 @@
         (describe "when a connection matching current file extension doesn't exist"
           (it "returns nil"
             ;; for clj
-            (with-repl-buffer ses-name "clj" b1
+            (with-repl-buffer ses-name 'clj b1
               (with-temp-buffer
                 (setq major-mode 'clojurescript-mode)
                 (expect (cider-current-repl) :to-equal nil)))
 
             ;; for cljs
-            (with-repl-buffer ses-name "cljs" b2
+            (with-repl-buffer ses-name 'cljs b2
               (with-temp-buffer
                 (setq major-mode 'clojure-mode)
                 (expect (cider-current-repl) :to-equal nil))))))))
@@ -188,19 +188,19 @@
       (let ((a-dir "/tmp/a-dir")
             (b-dir "/tmp/b-dir"))
         (let ((default-directory a-dir))
-          (with-repl-buffer ses-name "clj" bb1
-            (with-repl-buffer ses-name "cljs" bb2
+          (with-repl-buffer ses-name 'clj bb1
+            (with-repl-buffer ses-name 'cljs bb2
               (let ((default-directory a-dir))
-                (with-repl-buffer ses-name2 "clj" b1
-                  (with-repl-buffer ses-name2 "cljs" b2
+                (with-repl-buffer ses-name2 'clj b1
+                  (with-repl-buffer ses-name2 'cljs b2
 
                     (switch-to-buffer bb2)
                     (switch-to-buffer bb1)
                     (expect (cider-current-repl) :to-equal bb1)
 
                     ;; follows type arguments
-                    (expect (cider-current-repl "clj") :to-equal bb1)
-                    (expect (cider-current-repl "cljs") :to-equal bb2)
+                    (expect (cider-current-repl 'clj) :to-equal bb1)
+                    (expect (cider-current-repl 'cljs) :to-equal bb2)
 
                     ;; follows file type
                     (with-temp-buffer
@@ -234,19 +234,19 @@
   (describe "when there are no active connections"
     (it "returns nil"
       (expect (cider-repls) :to-equal nil)
-      (expect (cider-repls "clj") :to-equal nil)
-      (expect (cider-repls "cljs") :to-equal nil)))
+      (expect (cider-repls 'clj) :to-equal nil)
+      (expect (cider-repls 'cljs) :to-equal nil)))
 
   (describe "when multiple sessions exist"
     (it "always returns the most recently used connection"
       (let ((a-dir "/tmp/a-dir")
             (b-dir "/tmp/b-dir"))
         (let ((default-directory a-dir))
-          (with-repl-buffer ses-name "clj" bb1
-            (with-repl-buffer ses-name "cljs" bb2
+          (with-repl-buffer ses-name 'clj bb1
+            (with-repl-buffer ses-name 'cljs bb2
               (let ((default-directory b-dir))
-                (with-repl-buffer ses-name2 "clj" b1
-                  (with-repl-buffer ses-name2 "cljs" b2
+                (with-repl-buffer ses-name2 'clj b1
+                  (with-repl-buffer ses-name2 'cljs b2
 
                     (expect (cider-repls) :to-equal (list b2 b1))
 
@@ -254,8 +254,8 @@
                     (expect (cider-repls) :to-equal (list bb2 bb1))
 
                     ;; follows type arguments
-                    (expect (cider-repls "clj") :to-equal (list bb1))
-                    (expect (cider-repls "cljs") :to-equal (list bb2))
+                    (expect (cider-repls 'clj) :to-equal (list bb1))
+                    (expect (cider-repls 'cljs) :to-equal (list bb2))
 
                     (switch-to-buffer bb2)
                     ;; follows file type
@@ -263,13 +263,13 @@
                       (with-temp-buffer
                         (setq major-mode 'clojure-mode)
                         (expect (cider-repls) :to-equal (list b2 b1))
-                        (expect (cider-repls "clj") :to-equal (list b1))))
+                        (expect (cider-repls 'clj) :to-equal (list b1))))
 
                     (let ((default-directory a-dir))
                       (with-temp-buffer
                         (setq major-mode 'clojurescript-mode)
                         (expect (cider-repls) :to-equal (list bb2 bb1))
-                        (expect (cider-repls "cljs") :to-equal (list bb2)))))))))))))
+                        (expect (cider-repls 'cljs) :to-equal (list bb2)))))))))))))
 
   (describe "killed buffers"
     (it "do not show up in it"
@@ -278,9 +278,9 @@
          (a b)
          (let ((session (list "some-session" a b)))
            (with-current-buffer a
-             (setq cider-repl-type "clj"))
+             (setq cider-repl-type 'clj))
            (with-current-buffer b
-             (setq cider-repl-type "clj"))
+             (setq cider-repl-type 'clj))
            (sesman-register 'CIDER session)
            (expect (cider-repls) :to-equal (list a b))
            (kill-buffer b)
@@ -297,7 +297,7 @@
       (with-temp-buffer
         (setq-local nrepl-endpoint '(:host "localhost" :port 4005))
         (setq-local nrepl-project-dir "proj")
-        (setq-local cider-repl-type "clj")
+        (setq-local cider-repl-type 'clj)
         (expect (cider--connection-info (current-buffer))
                 :to-equal "CLJ proj@localhost:4005 (Java 1.7, Clojure 1.7.0, nREPL 0.2.1)"))))
 
@@ -305,7 +305,7 @@
     (it "returns information about the connection buffer without project name"
       (with-temp-buffer
         (setq-local nrepl-endpoint '(:host "localhost" :port 4005))
-        (setq-local cider-repl-type "clj")
+        (setq-local cider-repl-type 'clj)
         (expect (cider--connection-info (current-buffer))
                 :to-equal "CLJ <no project>@localhost:4005 (Java 1.7, Clojure 1.7.0, nREPL 0.2.1)")))))
 
@@ -316,9 +316,9 @@
        (a b)
        (let ((session (list "some-session" a b)))
          (with-current-buffer a
-           (setq cider-repl-type "clj"))
+           (setq cider-repl-type 'clj))
          (with-current-buffer b
-           (setq cider-repl-type "clj"))
+           (setq cider-repl-type 'clj))
          (sesman-register 'CIDER session)
          (expect (cider-repls) :to-equal (list a b))
          (cider--close-connection b)
@@ -350,7 +350,7 @@
             :and-return-value '(:project-dir "some/project" :host "localhost" :port 1234))
     (spy-on 'nrepl-start-server-process
             :and-return-value nil)
-    (spy-on 'sesman-linked-sessions
+    (spy-on 'sesman-current-sessions
             :and-return-value '(("a-session")))
     (spy-on 'y-or-n-p
             :and-return-value t)
@@ -361,5 +361,3 @@
     (cider-jack-in-clj&cljs '(:project-dir "some/other/project")))
   (it "detects existing project"
     (expect 'y-or-n-p :to-have-been-called-times 3)))
-
-
diff --git a/test/cider-debug-tests.el b/test/cider-debug-tests.el
index e6afa658..606ecf5c 100644
--- a/test/cider-debug-tests.el
+++ b/test/cider-debug-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-debug-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/cider-eldoc-tests.el b/test/cider-eldoc-tests.el
index 750483c6..03a2cbbe 100644
--- a/test/cider-eldoc-tests.el
+++ b/test/cider-eldoc-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-eldoc-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/cider-error-parsing-tests.el b/test/cider-error-parsing-tests.el
index 299d47b3..46b56647 100644
--- a/test/cider-error-parsing-tests.el
+++ b/test/cider-error-parsing-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-error-parsing-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/cider-find-tests.el b/test/cider-find-tests.el
index 3fcb3cb0..657274c1 100644
--- a/test/cider-find-tests.el
+++ b/test/cider-find-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-find-tests.el
 
-;; Copyright © 2012-2018 Bozhidar Batsov
+;; Copyright © 2012-2019 Bozhidar Batsov
 
 ;; Author: Bozhidar Batsov <bozhidar@batsov.com>
 
diff --git a/test/cider-font-lock-tests.el b/test/cider-font-lock-tests.el
index 1d135d9f..eade1673 100644
--- a/test/cider-font-lock-tests.el
+++ b/test/cider-font-lock-tests.el
@@ -68,7 +68,7 @@
     (it "uses cider-reader-conditional-face"
       (spy-on 'cider-connected-p :and-return-value t)
       (spy-on 'cider-repls :and-return-value '(list t))
-      (spy-on 'cider-repl-type :and-return-value "clj")
+      (spy-on 'cider-repl-type :and-return-value 'clj)
       (cider--test-with-temp-buffer "#?(:clj 'clj :cljs 'cljs :cljr 'cljr)"
         (let ((cider-font-lock-reader-conditionals t)
               (found (cider--face-exists-in-range-p (point-min) (point-max)
@@ -78,7 +78,7 @@
     (it "highlights unmatched reader conditionals"
       (spy-on 'cider-connected-p :and-return-value t)
       (spy-on 'cider-repls :and-return-value '(list t))
-      (spy-on 'cider-repl-type :and-return-value "clj")
+      (spy-on 'cider-repl-type :and-return-value 'clj)
       (cider--test-with-temp-buffer "#?(:clj 'clj :cljs 'cljs :cljr 'cljr)"
         (let ((cider-font-lock-reader-conditionals t))
           (expect (cider--face-exists-in-range-p 4 12 'cider-reader-conditional-face)
@@ -91,7 +91,7 @@
     (it "works with splicing"
       (spy-on 'cider-connected-p :and-return-value t)
       (spy-on 'cider-repls :and-return-value '(list t))
-      (spy-on 'cider-repl-type :and-return-value "clj")
+      (spy-on 'cider-repl-type :and-return-value 'clj)
       (cider--test-with-temp-buffer "[1 2 #?(:clj [3 4] :cljs [5 6] :cljr [7 8])]"
         (let ((cider-font-lock-reader-conditionals t))
           (expect (cider--face-exists-in-range-p 1 18 'cider-reader-conditional-face)
@@ -104,7 +104,7 @@
     (it "does not apply inside strings or comments"
       (spy-on 'cider-connected-p :and-return-value t)
       (spy-on 'cider-repls :and-return-value '(list t))
-      (spy-on 'cider-repl-type :and-return-value "clj")
+      (spy-on 'cider-repl-type :and-return-value 'clj)
       (cider--test-with-temp-buffer "\"#?(:clj 'clj :cljs 'cljs :cljr 'cljr)\" ;; #?(:clj 'clj :cljs 'cljs :cljr 'cljr)"
         (let ((cider-font-lock-reader-conditionals t))
           (expect (cider--face-exists-in-range-p (point-min) (point-max) 'cider-reader-conditional-face)
@@ -113,7 +113,7 @@
     (it "highlights all unmatched reader conditionals"
       (spy-on 'cider-connected-p :and-return-value t)
       (spy-on 'cider-repls :and-return-value '(list t))
-      (spy-on 'cider-repl-type :and-return-value "cljs")
+      (spy-on 'cider-repl-type :and-return-value 'cljs)
       (cider--test-with-temp-buffer
           "#?(:clj 'clj :cljs 'cljs :cljr 'cljr)\n#?(:clj 'clj :cljs 'cljs :cljr 'cljr)\n"
         (let ((cider-font-lock-reader-conditionals t))
@@ -129,7 +129,7 @@
     (it "does not highlight beyond the limits of the reader conditional group"
       (spy-on 'cider-connected-p :and-return-value t)
       (spy-on 'cider-repls :and-return-value '(list t))
-      (spy-on 'cider-repl-type :and-return-value "clj")
+      (spy-on 'cider-repl-type :and-return-value 'clj)
       (cider--test-with-temp-buffer
           "#?(:clj 'clj :cljs 'cljs :cljr 'cljr)\n#?(:clj 'clj :cljs 'cljs :cljr 'cljr)\n"
         (let ((cider-font-lock-reader-conditionals t))
@@ -144,7 +144,7 @@
     (it "is disabled"
       (spy-on 'cider-connected-p :and-return-value nil)
       (spy-on 'cider-repls :and-return-value '(list t))
-      (spy-on 'cider-repl-type :and-return-value '("clj" "cljs"))
+      (spy-on 'cider-repl-type :and-return-value '(clj cljs))
       (cider--test-with-temp-buffer "#?(:clj 'clj :cljs 'cljs :cljr 'cljr)"
         (let ((cider-font-lock-reader-conditionals t))
           (expect (cider--face-exists-in-range-p (point-min) (point-max) 'cider-reader-conditional-face)
diff --git a/test/cider-grimoire-tests.el b/test/cider-grimoire-tests.el
index 0fd1c80b..2318970e 100644
--- a/test/cider-grimoire-tests.el
+++ b/test/cider-grimoire-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-grimoire-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/cider-interaction-tests.el b/test/cider-interaction-tests.el
index 6dc8e379..9d300310 100644
--- a/test/cider-interaction-tests.el
+++ b/test/cider-interaction-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-eval-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
@@ -77,7 +77,7 @@
   (it "works as expected in empty Clojure buffers"
     (spy-on 'cider-request:load-file :and-return-value nil)
     (let ((default-directory "/tmp/a-dir"))
-      (with-repl-buffer "load-file-session" "clj" b
+      (with-repl-buffer "load-file-session" 'clj b
         (with-temp-buffer
           (clojure-mode)
           (setq buffer-file-name (make-temp-name "tmp.clj"))
@@ -87,7 +87,7 @@
   (it "works as expected in empty Clojure buffers"
     (spy-on 'cider-nrepl-request:eval :and-return-value nil)
     (let ((default-directory "/tmp/a-dir"))
-      (with-repl-buffer "interaction-session" "clj" b
+      (with-repl-buffer "interaction-session" 'clj b
         (with-temp-buffer
           (clojure-mode)
           (expect (cider-interactive-eval "(+ 1)") :not :to-throw))))))
diff --git a/test/cider-ns-tests.el b/test/cider-ns-tests.el
index ed28984a..4944523e 100644
--- a/test/cider-ns-tests.el
+++ b/test/cider-ns-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-ns-tests.el
 
-;; Copyright © 2018 Bozhidar Batsov
+;; Copyright © 2019 Bozhidar Batsov
 
 ;; Author: Bozhidar Batsov <bozhidar@batsov.com>
 
diff --git a/test/cider-overlay-tests.el b/test/cider-overlay-tests.el
index 13b17be8..16c2d08f 100644
--- a/test/cider-overlay-tests.el
+++ b/test/cider-overlay-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-overlay-tests.el                       -*- lexical-binding: t; -*-
 
-;; Copyright © 2015-2018 Bozhidar Batsov, Artur Malabarba and CIDER contributors
+;; Copyright © 2015-2019 Bozhidar Batsov, Artur Malabarba and CIDER contributors
 
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
 
diff --git a/test/cider-repl-tests.el b/test/cider-repl-tests.el
index 5229b03a..02124e5d 100644
--- a/test/cider-repl-tests.el
+++ b/test/cider-repl-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-repl-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/cider-selector-tests.el b/test/cider-selector-tests.el
index 88a87949..b5565eb3 100644
--- a/test/cider-selector-tests.el
+++ b/test/cider-selector-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-selector-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
@@ -65,7 +65,7 @@
 ;; (describe "cider-selector-method-m"
 ;;   (it "switches to current connection's *nrepl-messages* buffer"
 ;;     (let ((buf (get-buffer-create "*nrepl-messages some-id*")))
-;;       (with-repl-buffer "a-session" "clj" _
+;;       (with-repl-buffer "a-session" 'clj _
 ;;         (setq-local nrepl-messages-buffer buf)
 ;;         (message "%S" (nrepl-messages-buffer (cider-current-repl)))
 ;;         (cider--test-selector-method ?m nil "*nrepl-messages some-id*")))))
diff --git a/test/cider-stacktrace-tests.el b/test/cider-stacktrace-tests.el
index 94c09566..9caccf70 100644
--- a/test/cider-stacktrace-tests.el
+++ b/test/cider-stacktrace-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-stacktrace-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/cider-tests--no-auto.el b/test/cider-tests--no-auto.el
index c27bd50b..e5116cb4 100644
--- a/test/cider-tests--no-auto.el
+++ b/test/cider-tests--no-auto.el
@@ -1,6 +1,6 @@
 ;;; cider-tests--no-auto.el --- Non-automated tests -*- lexical-binding: t -*-
 
-;; Copyright © 2014-2018 Jeff Valk, Bozhidar Batsov and CIDER contributors
+;; Copyright © 2014-2019 Jeff Valk, Bozhidar Batsov and CIDER contributors
 
 ;; Author: Jeff Valk <jv@jeffvalk.com>
 
diff --git a/test/cider-tests.el b/test/cider-tests.el
index 61796cc3..4c6a5dae 100644
--- a/test/cider-tests.el
+++ b/test/cider-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/cider-util-tests.el b/test/cider-util-tests.el
index b38cc941..ad434242 100644
--- a/test/cider-util-tests.el
+++ b/test/cider-util-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-util-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
@@ -183,11 +183,11 @@
 ;;   :var (cider-version)
 ;;   (it "returns the manual correct url for stable cider versions"
 ;;     (setq cider-version "0.11.0")
-;;     (expect (cider-manual-url) :to-equal "http://docs.cider.mx/en/stable/"))
+;;     (expect (cider-manual-url) :to-equal "https://docs.cider.mx/en/stable/"))
 
 ;;   (it "returns the manual correct url for snapshot cider versions"
 ;;     (setq cider-version "0.11.0-snapshot")
-;;     (expect (cider-manual-url) :to-equal "http://docs.cider.mx/en/latest/")))
+;;     (expect (cider-manual-url) :to-equal "https://docs.cider.mx/en/latest/")))
 
 (describe "cider-refcard-url"
   :var (cider-version)
diff --git a/test/nrepl-bencode-tests.el b/test/nrepl-bencode-tests.el
index 4e704357..64b11b04 100644
--- a/test/nrepl-bencode-tests.el
+++ b/test/nrepl-bencode-tests.el
@@ -1,6 +1,6 @@
 ;;; nrepl-bencode-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/nrepl-client-tests.el b/test/nrepl-client-tests.el
index 840525c2..0c99a0f3 100644
--- a/test/nrepl-client-tests.el
+++ b/test/nrepl-client-tests.el
@@ -1,6 +1,6 @@
 ;;; nrepl-client-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
@@ -78,14 +78,14 @@
   (it "understands all formats"
     (with-temp-buffer
       (let ((params '(:project-dir "path/to/dirB" :host "localhost" :port 100
-                                   :repl-type "cljs" :cljs-repl-type "node")))
+                                   :repl-type cljs :cljs-repl-type "node")))
         (expect (nrepl-make-buffer-name "*buff-name %j:%J:%h:%H:%p:%r:%S*" params)
                 :to-equal "*buff-name dirB:to/dirB:localhost:100:cljs:node*"))))
 
   (it "strips trailing separators"
     (with-temp-buffer
       (let ((params '(:project-dir "path/to/dirB" :host "localhost" :port 100
-                                   :repl-type "cljs" :cljs-repl-type nil)))
+                                   :repl-type cljs :cljs-repl-type nil)))
         (expect (nrepl-make-buffer-name "*buff-name [%r:%S]*" params)
                 :to-equal "*buff-name [cljs]*")
         (expect (nrepl-make-buffer-name "*buff-name (%r:%S)*" params)
diff --git a/test/nrepl-dict-tests.el b/test/nrepl-dict-tests.el
index 0011ff7c..fb50c7b3 100644
--- a/test/nrepl-dict-tests.el
+++ b/test/nrepl-dict-tests.el
@@ -1,6 +1,6 @@
 ;;; nrepl-dict-tests.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/utils/cider-connection-test-utils.el b/test/utils/cider-connection-test-utils.el
index a9c53ad3..2c04c390 100644
--- a/test/utils/cider-connection-test-utils.el
+++ b/test/utils/cider-connection-test-utils.el
@@ -1,6 +1,6 @@
 ;;; cider-connection-test-utils.el
 
-;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2019 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>