Merge tag 'v0.17.0+dfsg'

DFSG-clean upstream version 0.17.0

23 files changed, 160 insertions, 106 deletions

diff --git a/test/cider-apropos-tests.el b/test/cider-apropos-tests.el
index 9bd0502f..5e2a6530 100644
--- a/test/cider-apropos-tests.el
+++ b/test/cider-apropos-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-apropos-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 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 29c88da0..6967b4b4 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-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 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 76c5a8ba..98fdceb7 100644
--- a/test/cider-classpath-tests.el
+++ b/test/cider-classpath-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-classpath-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 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 65603606..2231e4ce 100644
--- a/test/cider-client-tests.el
+++ b/test/cider-client-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-client-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
@@ -99,9 +99,6 @@
              (expect (cider-current-connection "clj") :to-equal b))
            (with-temp-buffer
              (clojurec-mode)
-             (expect (cider-current-connection "clj") :to-equal b))
-           (with-temp-buffer
-             (clojurex-mode)
              (expect (cider-current-connection "clj") :to-equal b))))))
 
     (describe "when type argument is given"
@@ -235,6 +232,46 @@
             :to-equal "stub")
     (expect (cider-var-info "") :to-equal nil)))
 
+(describe "cider-toggle-buffer-connection"
+  (spy-on 'message :and-return-value nil)
+
+  (describe "when there are multiple connections"
+    (it "toggles between multiple buffers"
+      (with-connection-buffer "clj" clj-buffer
+        (with-connection-buffer "cljs" cljs-buffer
+          (with-temp-buffer
+            (setq major-mode 'clojurec-mode)
+            (expect (cider-connections)
+                    :to-equal (list cljs-buffer clj-buffer))
+
+            (cider-toggle-buffer-connection)
+            (expect (cider-connections)
+                    :to-equal (list clj-buffer))
+
+            (cider-toggle-buffer-connection)
+            (expect (cider-connections)
+                    :to-equal (list cljs-buffer))
+
+            (cider-toggle-buffer-connection t)
+            (expect (cider-connections)
+                    :to-equal (list cljs-buffer clj-buffer)))))))
+
+  (describe "when there is a single connection"
+    (it "reports a user error"
+      (with-connection-buffer "clj" clj-buffer
+        (with-temp-buffer
+          (setq major-mode 'clojurec-mode)
+          (expect (cider-connections)
+                  :to-equal (list clj-buffer))
+
+          (expect (cider-toggle-buffer-connection) :to-throw 'user-error)
+
+          (expect (cider-connections)
+                  :to-equal (list clj-buffer))
+
+          (expect (local-variable-p 'cider-connections)
+                  :to-be nil))))))
+
 (describe "cider-make-connection-default"
   :var (connections)
 
diff --git a/test/cider-common-tests.el b/test/cider-common-tests.el
index 36cb246f..b222f3ba 100644
--- a/test/cider-common-tests.el
+++ b/test/cider-common-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-common-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
@@ -64,3 +64,14 @@
     (expect (cider--kw-to-symbol ":clj.core/str") :to-equal "clj.core/str")
     (expect (cider--kw-to-symbol "::keyword") :to-equal "keyword")
     (expect (cider--kw-to-symbol nil) :to-equal nil)))
+
+(describe "cider-make-tramp-prefix"
+  (it "returns tramp-prefix only"
+      ;;; The third parameter is a host. It must contains a port number.
+      (expect (cider-make-tramp-prefix "ssh" "cider-devs" "192.168.50.9#22")
+              :to-equal "/ssh:cider-devs@192.168.50.9#22:")
+      ;;; These two cases are for using ssh config alias.
+      (expect (cider-make-tramp-prefix "ssh" nil "test.cider.com")
+              :to-equal "/ssh:test.cider.com:")
+      (expect (cider-make-tramp-prefix "ssh" nil "test.local")
+              :to-equal "/ssh:test.local:")))
diff --git a/test/cider-debug-tests.el b/test/cider-debug-tests.el
index 0b66fee5..f93732b7 100644
--- a/test/cider-debug-tests.el
+++ b/test/cider-debug-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-debug-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 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 0bdd083e..750483c6 100644
--- a/test/cider-eldoc-tests.el
+++ b/test/cider-eldoc-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-eldoc-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 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 d393e001..ce137f49 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-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/cider-grimoire-tests.el b/test/cider-grimoire-tests.el
index 64ecb958..66c7f6ec 100644
--- a/test/cider-grimoire-tests.el
+++ b/test/cider-grimoire-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-grimoire-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 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 e59c2c0b..46ac0c75 100644
--- a/test/cider-interaction-tests.el
+++ b/test/cider-interaction-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-interaction-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
@@ -102,3 +102,21 @@
       (with-temp-buffer
         (clojure-mode)
         (expect (cider-interactive-eval "(+ 1)") :not :to-throw)))))
+
+(describe "cider--calculate-opening-delimiters"
+  (it "returns the right opening delimiters"
+    (with-temp-buffer
+      (clojure-mode)
+      (insert "(let [a 1] (let [b 2] (+ a b)))")
+      (backward-char 2)
+      (expect (cider--calculate-opening-delimiters) :to-equal '(40 40)))))
+
+(describe "cider--matching-delimiter"
+  (it "returns the right closing delimiter"
+    (expect (cider--matching-delimiter ?\() :to-equal ?\))
+    (expect (cider--matching-delimiter ?\{) :to-equal ?\})
+    (expect (cider--matching-delimiter ?\[) :to-equal ?\]))
+  (it "returns the right opening delimiter"
+    (expect (cider--matching-delimiter ?\)) :to-equal ?\()
+    (expect (cider--matching-delimiter ?\}) :to-equal ?\{)
+    (expect (cider--matching-delimiter ?\]) :to-equal ?\[)))
diff --git a/test/cider-overlay-tests.el b/test/cider-overlay-tests.el
index 3109c451..13b17be8 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-2017 Bozhidar Batsov, Artur Malabarba and CIDER contributors
+;; Copyright © 2015-2018 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 b8d59a18..0a40ac0f 100644
--- a/test/cider-repl-tests.el
+++ b/test/cider-repl-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-repl-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
@@ -142,3 +142,15 @@ PROPERTY shoudl be a symbol of either 'text, 'ansi-context or
           (fill-column 80))
       (expect (cider--pretty-print-width)
               :to-equal fill-column))))
+
+(describe "cider-repl--build-config-expression"
+  (it "returns nil when all the config values are nil"
+    (let ((cider-repl-print-length nil)
+          (cider-repl-print-level nil))
+      (expect (cider-repl--build-config-expression) :to-equal nil)))
+  (it "returns an when any the config values are non-nil"
+    (let ((cider-repl-print-length 10)
+          (cider-repl-print-level 10))
+      (expect (cider-repl--build-config-expression)
+              :to-equal
+              "(do (set! *print-length* 10) (set! *print-level* 10))"))))
diff --git a/test/cider-selector-tests.el b/test/cider-selector-tests.el
index 9a2d680e..63eee4c9 100644
--- a/test/cider-selector-tests.el
+++ b/test/cider-selector-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-selector-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/cider-stacktrace-tests.el b/test/cider-stacktrace-tests.el
index 7a206e4a..91e4da15 100644
--- a/test/cider-stacktrace-tests.el
+++ b/test/cider-stacktrace-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-stacktrace-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 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 0b7db012..c27bd50b 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-2017 Jeff Valk, Bozhidar Batsov and CIDER contributors
+;; Copyright © 2014-2018 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 91090173..179fcd71 100644
--- a/test/cider-tests.el
+++ b/test/cider-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
@@ -134,7 +134,62 @@
                 :to-equal "-C -o -i \"(require 'cider.tasks)\" -d org.clojure/tools.nrepl\\:0.2.12 -d cider/cider-nrepl\\:0.11.0 cider.tasks/add-middleware -m cider.nrepl/cider-middleware repl -s wait"))
     (it "can concat in a gradle project"
         (expect (cider-inject-jack-in-dependencies "-m" "--no-daemon clojureRepl" "gradle")
-                :to-equal "-m --no-daemon clojureRepl"))))
+                :to-equal "-m --no-daemon clojureRepl")))
+
+  (describe "when there are predicates"
+    :var (plugins-predicate middlewares-predicate)
+
+    (before-each
+      (fset 'plugins-predicate (lambda (&rest _) t))
+      (fset 'middlewares-predicate (lambda (&rest _) t))
+      (setq-local cider-jack-in-lein-plugins '(("refactor-nrepl" "2.0.0" :predicate plugins-predicate) ("cider/cider-nrepl" "0.11.0")))
+      (setq-local cider-jack-in-nrepl-middlewares '(("refactor-nrepl.middleware/wrap-refactor" :predicate middlewares-predicate) "cider.nrepl/cider-middleware" ("another/middleware"))))
+    (it "includes plugins whose predicates return true"
+      (expect (cider-jack-in-normalized-lein-plugins)
+              :to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.11.0"))))
+    (it "includes middlewares whose predicates return true"
+      (expect (cider-jack-in-normalized-nrepl-middlewares)
+              :to-equal '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware" "another/middleware")))
+    (it "ignores plugins whose predicates return false"
+      (spy-on 'plugins-predicate :and-return-value nil)
+      (expect (cider-jack-in-normalized-lein-plugins)
+              :to-equal '(("cider/cider-nrepl" "0.11.0"))))
+    (it "ignores plugins whose predicates return false"
+      (spy-on 'middlewares-predicate :and-return-value nil)
+      (expect (cider-jack-in-normalized-nrepl-middlewares)
+              :to-equal '("cider.nrepl/cider-middleware" "another/middleware")))
+    (it "calls plugin predicates with the whole list entry"
+      (spy-on 'plugins-predicate)
+      (cider-jack-in-normalized-lein-plugins)
+      (expect 'plugins-predicate
+              :to-have-been-called-with '("refactor-nrepl" "2.0.0" :predicate plugins-predicate)))
+    (it "calls middleware predicates with the whole list entry"
+      (spy-on 'middlewares-predicate)
+      (cider-jack-in-normalized-nrepl-middlewares)
+      (expect 'middlewares-predicate
+              :to-have-been-called-with '("refactor-nrepl.middleware/wrap-refactor" :predicate middlewares-predicate)))
+    (it "only calls plugin predicates for their own entries"
+      (spy-on 'plugins-predicate)
+      (cider-jack-in-normalized-lein-plugins)
+      (expect 'plugins-predicate :to-have-been-called-times 1))
+    (it "only calls middleware predicates for their own entries"
+      (spy-on 'middlewares-predicate)
+      (cider-jack-in-normalized-nrepl-middlewares)
+      (expect 'middlewares-predicate :to-have-been-called-times 1)))
+
+  (describe "when the middleware and plugin lists have been normalized"
+    (before-each
+      (spy-on 'cider-jack-in-normalized-nrepl-middlewares
+              :and-return-value '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware"))
+      (spy-on 'cider-jack-in-normalized-lein-plugins
+              :and-return-value '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.11.0")))
+      (setq-local cider-jack-in-dependencies-exclusions '()))
+    (it "uses them in a lein project"
+      (expect (cider-inject-jack-in-dependencies "" "repl :headless" "lein")
+              :to-equal "update-in :dependencies conj \\[org.clojure/tools.nrepl\\ \\\"0.2.12\\\"\\] -- update-in :plugins conj \\[refactor-nrepl\\ \\\"2.0.0\\\"\\] -- update-in :plugins conj \\[cider/cider-nrepl\\ \\\"0.11.0\\\"\\] -- repl :headless"))
+    (it "uses them in a boot project"
+      (expect (cider-inject-jack-in-dependencies "" "repl -s wait" "boot")
+              :to-equal "-i \"(require 'cider.tasks)\" -d org.clojure/tools.nrepl\\:0.2.12 -d refactor-nrepl\\:2.0.0 -d cider/cider-nrepl\\:0.11.0 cider.tasks/add-middleware -m refactor-nrepl.middleware/wrap-refactor -m cider.nrepl/cider-middleware repl -s wait"))))
 
 (describe "cider-jack-in-auto-inject-clojure"
   (it "injects `cider-minimum-clojure-version' when `cider-jack-in-auto-inject-clojure' is set to minimal"
diff --git a/test/cider-util-tests.el b/test/cider-util-tests.el
index 83d7a5f6..cd5042fc 100644
--- a/test/cider-util-tests.el
+++ b/test/cider-util-tests.el
@@ -1,6 +1,6 @@
 ;;; cider-util-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
@@ -184,11 +184,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://cider.readthedocs.org/en/stable/"))
+;;     (expect (cider-manual-url) :to-equal "http://cider.readthedocs.io/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://cider.readthedocs.org/en/latest/")))
+;;     (expect (cider-manual-url) :to-equal "http://cider.readthedocs.io/en/latest/")))
 
 (describe "cider-refcard-url"
   :var (cider-version)
diff --git a/test/nrepl-bencode-tests.el b/test/nrepl-bencode-tests.el
index 827a76ed..4e704357 100644
--- a/test/nrepl-bencode-tests.el
+++ b/test/nrepl-bencode-tests.el
@@ -1,6 +1,6 @@
 ;;; nrepl-bencode-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 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 c8d4f0d7..5716e0a4 100644
--- a/test/nrepl-client-tests.el
+++ b/test/nrepl-client-tests.el
@@ -1,6 +1,6 @@
 ;;; nrepl-client-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/nrepl-dict-tests.el b/test/nrepl-dict-tests.el
index 8c8159ce..0011ff7c 100644
--- a/test/nrepl-dict-tests.el
+++ b/test/nrepl-dict-tests.el
@@ -1,6 +1,6 @@
 ;;; nrepl-dict-tests.el
 
-;; Copyright © 2012-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/test/scripts/cider-bytecomp-warnings.el b/test/scripts/cider-bytecomp-warnings.el
deleted file mode 100644
index cdc632d9..00000000
--- a/test/scripts/cider-bytecomp-warnings.el
+++ /dev/null
@@ -1,46 +0,0 @@
-;;; cider-bytecomp-warnings.el --- Check for byte-compilation problems
-
-;; Copyright © 2012-2017 Bozhidar Batsov and contributors
-;;
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;; This file is not part of GNU Emacs.
-
-;;; Commentary:
-
-;; This is a script to be loaded while visiting a CIDER source file.  It will
-;; prepare all requirements and then byte-compile the file and signal an error
-;; on any warning.  For example:
-;;
-;;    emacs -Q --batch -l test/cider-bytecomp-warnings.el cider-mode.el
-
-;; This assumes that all CIDER dependencies are already on the package dir
-;; (probably from running `cask install').
-
-(setq load-prefer-newer t)
-(add-to-list 'load-path (expand-file-name "./"))
-(require 'package)
-(package-generate-autoloads 'cider default-directory)
-(package-initialize)
-(load-file "cider-autoloads.el")
-(setq byte-compile-error-on-warn t)
-
-;; Avoid spurious unused lexical arg warning from `condition-case'
-;; See: https://emacs.stackexchange.com/a/10058/10269
-(when (version< emacs-version "25.1")
-  (setq byte-compile--use-old-handlers nil))
-
-(batch-byte-compile)
-
-;;; cider-bytecomp-warnings.el ends here
diff --git a/test/scripts/cider-checks.el b/test/scripts/cider-checks.el
deleted file mode 100644
index d7e29980..00000000
--- a/test/scripts/cider-checks.el
+++ /dev/null
@@ -1,33 +0,0 @@
-;; This is a script to be loaded from the root CIDER directory. It will prepare
-;; all requirements and then run `check-declare-directory' on
-;; `default-directory'. For example:
-;;     emacs -Q --batch -l test/cider-checks.el
-
-;; This assumes that all CIDER dependencies are already on the package dir
-;; (probably from running `cask install').
-
-(add-to-list 'load-path (expand-file-name "./"))
-(require 'package)
-(require 'check-declare)
-(require 'seq)
-(package-initialize)
-
-;; disable some annoying (or non-applicable) checkdoc checks
-(setq checkdoc-package-keywords-flag nil)
-(setq checkdoc-arguments-in-order-flag nil)
-(setq checkdoc-verb-check-experimental-flag nil)
-
-(let ((files (seq-filter
-              (lambda (el) (not (string-match-p "autoloads" el)))
-              (directory-files default-directory t
-                               "\\`[^.].*\\.el\\'" t))))
-  ;; `checkdoc-file' was introduced in Emacs 25
-  (when (fboundp 'checkdoc-file)
-    (dolist (file files)
-      (checkdoc-file file))
-    (when (get-buffer "*Warnings*")
-      (message "Failing due to checkdoc warnings...")
-      (kill-emacs 1)))
-
-  (when (apply #'check-declare-files files)
-    (kill-emacs 1)))
diff --git a/test/utils/cider-connection-test-utils.el b/test/utils/cider-connection-test-utils.el
index b51f090e..1ea36c95 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-2017 Tim King, Bozhidar Batsov
+;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
 
 ;; Author: Tim King <kingtim@gmail.com>
 ;;         Bozhidar Batsov <bozhidar@batsov.com>