Simplify some version-related code

Author: bbatsov

src/cider/nrepl.clj

@@ -480,7 +480,7 @@
 
 (def-wrapper wrap-version cider.nrepl.middleware.version/handle-version
   {:doc "Provides CIDER-nREPL version information."
-   :describe-fn #'version/cider-version-reply ;; For the "describe" op. Merged into `:aux`.
+   :describe-fn (fn [_] {:cider-version version/version}) ;; For the "describe" op. Merged into `:aux`.
    :handles
    {"cider-version"
     {:doc "Returns the version of the CIDER-nREPL middleware."

src/cider/nrepl/middleware/version.clj

@@ -7,7 +7,7 @@
 
 (defn handle-version [handler msg]
   (if (= (:op msg) "cider-version")
-    (->> (version/cider-version-reply msg)
+    (->> {:cider-version version/version}
          (merge {:status #{"done"}})
          (response-for msg)
          (transport/send (:transport msg)))

src/cider/nrepl/version.clj

@@ -20,10 +20,3 @@
               (map #(try (Integer/parseInt %) (catch Exception e nil)))
               (zipmap [:major :minor :incremental :qualifier]))
          :version-string version-string))
-
-(defn cider-version-reply
-  "Returns CIDER-nREPL's version as a map which contains `:major`,
-  `:minor`, `:incremental`, and `:qualifier` keys, just as
-  `*clojure-version*` does."
-  [msg]
-  {:cider-version version})

test/clj/cider/nrepl/middleware/version_test.clj

@@ -1,17 +1,8 @@
 (ns cider.nrepl.middleware.version-test
   (:require
-   [cider.nrepl.version :as v]
    [cider.nrepl.test-session :as session]
    [clojure.test :refer :all]))
 
-(deftest cider-version-test
-  (let [outer-map (#'v/cider-version-reply {})
-        version-map (:cider-version outer-map)]
-    (is (contains? version-map :major))
-    (is (contains? version-map :minor))
-    (is (contains? version-map :incremental))
-    (is (contains? version-map :version-string))))
-
 (use-fixtures :once session/session-fixture)
 
 (deftest integration-test

test/clj/cider/nrepl/version_test.clj

@@ -0,0 +1,13 @@
+(ns cider.nrepl.middleware.version-test
+  (:require
+   [cider.nrepl.version :as v]
+   [clojure.test :refer :all]))
+
+(deftest version-string-test
+  (is (string? v/version-string)))
+
+(deftest version-test
+  (is (contains? v/version :major))
+  (is (contains? v/version :minor))
+  (is (contains? v/version :incremental))
+  (is (contains? v/version :version-string)))