clojure.test is always :refer :all

AlexBaranosky · Jan 24, 2013 · b7b3472 · b7b3472
1 parent 1be45be
commit b7b3472
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/project.clj b/project.clj
@@ -7,13 +7,15 @@
   :dependencies [[org.clojure/clojure "1.4.0"]]
   :profiles {:dev {:dependencies [[org.clojure/tools.trace "0.7.3"]
                                   [org.clojars.runa/clj-schema "0.7.0"]
+                                  [gui-diff "0.3.9"]
                                   [korma "0.3.0-beta11"]]}}
   :test-selectors {:default (constantly true)
                    :integration :integration
                    :unit :unit}
   ;; retain compatibility with lein1 for now
   :dev-dependencies [[org.clojure/tools.trace "0.7.3"]
                      [org.clojars.runa/clj-schema "0.7.0"]
+                     [gui-diff "0.3.9"]
                      [korma "0.3.0-beta11"]]
   :dev-resource-paths "dev-resources")
 
diff --git a/src/slam/hound/regrow.clj b/src/slam/hound/regrow.clj
@@ -75,7 +75,9 @@
     :require-refer (for [n (all-ns)
                          [sym var] (ns-publics n)
                          :when (= missing (name sym))]
-                     [(ns-name n) :refer [sym]])))
+                     (if (= (ns-name n) 'clojure.test)
+                       ['clojure.test :refer :all]
+                       [(ns-name n) :refer [sym]]))))
 
 (defn- butlast-regex [candidate]
   (if (symbol? candidate)

diff --git a/src/slam/hound/stitch.clj b/src/slam/hound/stitch.clj
@@ -15,9 +15,12 @@
                   (-> c resolve .getName (.split "\\.") last symbol))))))
 
 (defn- group-by-namespace [uses]
-  (for [[namespace subclause] (group-by first uses)]
-    [namespace :refer (vec (sort (for [[_ _ [var]] subclause]
-                                   var)))]))
+  (for [[namespace subclause] (group-by first uses)
+        :let [referred (nth (first subclause) 2)]]
+    (if (= :all referred)
+      [namespace :refer :all]
+      [namespace :refer (vec (sort (for [[_ _ [var]] subclause]
+                                     var)))])))
 
 (defn collapse-clause [ns-map clause]
   (case clause

diff --git a/test/slam/hound/regrow_test.clj b/test/slam/hound/regrow_test.clj
@@ -19,8 +19,7 @@
             :gen-class nil
             :require-as '[[clojure.java.io :as io] [clojure.set :as set]]
             :require-refer '[[slam.hound.stitch :refer [ns-from-map]]
-                             [clojure.test :refer [is]]
-                             [clojure.test :refer [deftest]]]
+                             [clojure.test :refer :all]]
             :import '(java.io.File java.io.ByteArrayInputStream
                                    clojure.lang.Compiler$BodyExpr
                                    java.util.UUID)

diff --git a/test/slam/hound_test.clj b/test/slam/hound_test.clj
@@ -31,7 +31,7 @@
   \"Testing some things going on here.\"
   (:require [clojure.java.io :as io]
             [clojure.set :as set]
-            [clojure.test :refer [deftest is]]
+            [clojure.test :refer :all]
             [slam.hound.stitch :refer [ns-from-map]])
   (:import (clojure.lang Compiler$BodyExpr)
            (java.io ByteArrayInputStream File)