Fix for non-spec expectations

Fixes a bug in 1.1.0 that caused all non-spec expectations to fail to compile

Author: seancorfield

CHANGELOG.md

@@ -1,6 +1,10 @@
-# Version 1.1.0 -- 2019-01-08
+# Version 1.1.1 -- 2019-01-14
 
 * An expectation can now use a qualified keyword spec to test conformance of the actual value. Failures are reported with the spec explanation. #2
 * If Paul Stadig's Humane Test Output is available (on the classpath), failure reporting is automatically made compatible with it. Expectations that use data structure "equality" (the `=?` extension to `is`) will produce "humane" output for failures, showing differences. #1
 
+# Version 1.1.0 -- 2019-01-08
+
+(broken version)
+
 # Initial version 1.0.1 -- 2019-01-02

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>expectations</groupId>
   <artifactId>clojure-test</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <name>exp-clojure-test</name>
 
   <description>A clojure.test-compatible version of the classic Expectations testing library.</description>

src/expectations/clojure/test.clj

@@ -46,13 +46,13 @@
 (defmethod t/assert-expr '=? [msg form]
   ;; (is (=? val-or-pred expr))
   (let [[_ e a] form
-        conform? (spec? e)
-        valid? (when conform? (resolve 'clojure.spec.alpha/valid?))
-        explain-str? (when conform? (resolve 'clojure.spec.alpha/explain-str))]
+        conform? (spec? e)]
     `(let [e# ~e
            a# ~a
+           valid?# (when ~conform? (resolve 'clojure.spec.alpha/valid?))
+           explain-str?# (when ~conform? (resolve 'clojure.spec.alpha/explain-str))
            r# (cond ~conform?
-                    (~valid? e# a#)
+                    (valid?# e# a#)
                     (fn? e#)
                     (e# a#)
                     :else
@@ -64,7 +64,7 @@
                                                    (list '~e a#)
                                                    a#)})
          (t/do-report {:type :fail, :message (if ~conform?
-                                               (~explain-str? e# a#)
+                                               (explain-str?# e# a#)
                                                ~msg)
                        :diffs (if humane?#
                                 [[a# (take 2 (data/diff e# a#))]]