[bugfix] Fixes test loading

This has been broken since 0.2.0, which is lame. Resolves #26 and #27.
venantius · Mar 15, 2015 · 38bed23 · 38bed23
1 parent 8f15ffe
commit 38bed23
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/src/ultra/hardcore.clj b/src/ultra/hardcore.clj
@@ -1,7 +1,9 @@
 (ns ultra.hardcore
   "See what I did there?"
   (:require [clojure.tools.nrepl.server]
-            [robert.hooke :refer [add-hook]]))
+            [robert.hooke :refer [add-hook]]
+            [ultra.test]
+            ))
 
 (def configured? (atom {}))
 
@@ -41,7 +43,8 @@
   "Dyanmically import ultra's test namespace and configure them."
   {:added "0.3.0"}
   []
-  `(do ~(require 'ultra.test)))
+  `(do ~(require 'ultra.test)
+       (ultra.test/activate!)))
 
 (defmacro set-colorscheme!
   "Dynamically import ultra's colorscheme namespace and configures it."
@@ -78,7 +81,7 @@
   "Add hooks to configure tests"
   {:added "0.3.1"}
   [opts]
-  (add-hook #'clojure.test/run-tests
+  (add-hook #'clojure.test/try-expr
             (fn [f & args]
               (configure! opts)
               (apply f args))))
diff --git a/src/ultra/test.clj b/src/ultra/test.clj
@@ -7,14 +7,18 @@
             [ultra.test.diff :as diff]
             [whidbey.render :as render]))
 
+
 (defn generate-diffs
   [a more]
   (map vector
        more
        (map #(take 2 (data/diff a %))
             more)))
 
-(defmethod assert-expr '= [msg [_ a & more]]
+(defn activate!
+  {:added "0.3.3"}
+  []
+  (defmethod assert-expr '= [msg [_ a & more]]
   `(let [a# ~a]
      (if-let [more# (seq (list ~@more))]
        (let [result# (apply = a# more#)]
@@ -27,15 +31,15 @@
          result#)
        (throw (Exception. "= expects more than one argument")))))
 
-(defmethod report :fail
-  [{:keys [type expected actual diffs message] :as event}]
-  (with-test-out
-    (inc-report-counter :fail)
-    (println (str (ansi/sgr "\nFAIL" :red) " in " (testing-vars-str event)))
-    (when (seq *testing-contexts*) (println (testing-contexts-str)))
-    (when message (println message))
-    (if (seq diffs)
-      (doseq [[actual [a b]] diffs
-              :when (or a b)]
-        (diff/prn-diffs a b actual expected))
-      (diff/print-expected actual expected))))
+  (defmethod report :fail
+    [{:keys [type expected actual diffs message] :as event}]
+    (with-test-out
+      (inc-report-counter :fail)
+      (println (str (ansi/sgr "\nFAIL" :red) " in " (testing-vars-str event)))
+      (when (seq *testing-contexts*) (println (testing-contexts-str)))
+      (when message (println message))
+      (if (seq diffs)
+        (doseq [[actual [a b]] diffs
+                :when (or a b)]
+          (diff/prn-diffs a b actual expected))
+        (diff/print-expected actual expected)))))