Upgrade and satisfy Eastwood

Author: vemv

project.clj

@@ -138,9 +138,8 @@
                                           try-if-let [[:block 1]]}}}]
 
              :eastwood [:test
-                        {:plugins [[jonase/eastwood "0.3.11"]]
+                        {:plugins [[jonase/eastwood "0.4.0"]]
                          :eastwood {:config-files ["eastwood.clj"]
-                                    ;; TODO: Add :test-paths once
-                                    ;; https://github.com/jonase/eastwood/issues/298
-                                    ;; is resolved
-                                    :namespaces [:source-paths]}}]})
+                                    :exclude-namespaces [cider.nrepl.middleware.test-filter-tests]
+                                    :ignored-faults {:unused-ret-vals-in-try {cider.nrepl.middleware.profile-test [{:line 25}]}
+                                                     :suspicious-test {cider.nrepl.middleware.profile-test [{:line 25}]}}}}]})

test/clj/cider/nrepl/middleware/slurp_test.clj

@@ -6,10 +6,11 @@
    [clojure.string :as str]))
 
 (t/deftest test-project-clj-is-clj
-  (let [resp (slurp-url-to-content+body
-              (.toString
-               (.toURL
-                (io/file "project.clj"))))]
+  (let [resp (-> "project.clj"
+                 io/file
+                 io/as-url
+                 .toString
+                 slurp-url-to-content+body)]
     (t/is (= ["text/clojure" {}] (:content-type resp)))
     (t/is (not= "base64" (:content-transfer-encoding resp)))))
 
@@ -28,8 +29,11 @@
     (t/is (str/ends-with? (:body resp) ",size=681]"))))
 
 (t/deftest test-directory
-  (let [resp (slurp-url-to-content+body
-              (.toString (.toURL (io/file "test"))))]
+  (let [resp (-> "test"
+                 io/file
+                 io/as-url
+                 .toString
+                 slurp-url-to-content+body)]
     (t/is (= ["application/octet-stream" {}] (:content-type resp)))
     (t/is (str/starts-with? (:body resp) "#binary[location="))
     (t/is (str/ends-with? (:body resp) ",size=0]"))))

test/clj/cider/nrepl/middleware/stacktrace_test.clj

@@ -153,20 +153,21 @@
            (extract-location {:class "clojure.lang.Compiler$CompilerException"
                               :message "java.lang.NegativeArraySizeException, compiling:(/foo/bar/baz.clj:1:42)"}))))
   (testing "extract-location with location-data already present"
-    (= {:class "clojure.lang.Compiler$CompilerException"
-        :message "Syntax error macroexpanding clojure.core/let at (1:1)."
-        :file nil
-        :file-url nil
-        :path "/foo/bar/baz.clj"
-        :line 1
-        :column 42}
-       (extract-location {:class "clojure.lang.Compiler$CompilerException"
-                          :location {:clojure.error/line 1
-                                     :clojure.error/column 42
-                                     :clojure.error/source "/foo/bar/baz.clj"
-                                     :clojure.error/phase :macroexpand
-                                     :clojure.error/symbol 'clojure.core/let}
-                          :message "Syntax error macroexpanding clojure.core/let at (1:1)."}))))
+    (is (= {:class    "clojure.lang.Compiler$CompilerException"
+            :location '#:clojure.error{:line 1, :column 42, :source "/foo/bar/baz.clj", :phase :macroexpand, :symbol clojure.core/let},
+            :message  "Syntax error macroexpanding clojure.core/let at (1:1)."
+            :file     "/foo/bar/baz.clj"
+            :file-url nil
+            :path     "/foo/bar/baz.clj"
+            :line     1
+            :column   42}
+           (extract-location {:class    "clojure.lang.Compiler$CompilerException"
+                              :location {:clojure.error/line   1
+                                         :clojure.error/column 42
+                                         :clojure.error/source "/foo/bar/baz.clj"
+                                         :clojure.error/phase  :macroexpand
+                                         :clojure.error/symbol 'clojure.core/let}
+                              :message  "Syntax error macroexpanding clojure.core/let at (1:1)."})))))
 
 (deftest analyze-cause-test
   (testing "check that location-data is returned"

test/clj/cider/nrepl/middleware/util/instrument_test.clj

@@ -178,6 +178,5 @@
   ;; This is because Namespace objects implement IMeta, but not IObj.
   (let [an-ns (create-ns (with-meta 'foo.bar {:doc "ns docstring"}))]
     (binding [*ns* an-ns]
-      (t/breakpoint-tester '(let [x (cider.nrepl.middleware.util.instrument-test/ns-embedding-macro)] x))
-      ;; If the above did not throw, then we pass
-      (is true))))
+      (is (some? (t/breakpoint-tester '(let [x (cider.nrepl.middleware.util.instrument-test/ns-embedding-macro)] x)))
+          "Does not throw-exceptions"))))

test/clj/cider/nrepl/version_test.clj

@@ -1,4 +1,4 @@
-(ns cider.nrepl.middleware.version-test
+(ns cider.nrepl.version-test
   (:require
    [cider.nrepl.version :as v]
    [clojure.test :refer :all]))

test/spec/cider/nrepl/middleware/stacktrace_spec_test.clj

@@ -30,15 +30,15 @@
 (s/def ::person (s/keys :req [::first-name ::last-name ::email]
                         :opt [::phone]))
 
-(deftest spec-assert-stacktrace-test
+(def broken-musk {::first-name "Elon"
+                  ::last-name  "Musk"
+                  ::email      "n/a"})
 
-  (def broken-musk {::first-name "Elon"
-                    ::last-name "Musk"
-                    ::email "n/a"})
+(def broken-musk-causes
+  (causes
+   `(s/assert ::person broken-musk)))
 
-  (def broken-musk-causes
-    (causes
-     `(s/assert ::person broken-musk)))
+(deftest spec-assert-stacktrace-test
 
   (testing "Spec assert components"
     (is (= 1 (count broken-musk-causes)))