CLJS-2964: Requiring spec.test.alpha loads clojure.test.check

Patch fixes lazy loading of clojure.test.check.
Unifies key for passing options to clojure.test.check with Clojure.

Author: borkdude

src/main/cljs/cljs/spec/test/alpha.cljc

@@ -255,7 +255,7 @@ is not specified, check all checkable vars. If a symbol identifies a
 namespace then all symbols in that namespace will be enumerated.
 
 The opts map includes the following optional keys, where stc
-aliases clojure.test.check:
+aliases clojure.spec.test.check:
 
 ::stc/opts  opts to flow through test.check/quick-check
 :gen        map from spec names to generator overrides
@@ -289,12 +289,17 @@ spec itself will have an ::s/failure value in ex-data:
   ([sym-or-syms opts]
    (let [syms (sym-or-syms->syms (form->sym-or-syms sym-or-syms))
          opts-sym (gensym "opts")]
-     `(let [~opts-sym ~opts]
-        [~@(->> syms
-             (filter (checkable-syms* opts))
-             (map
-               (fn [sym]
-                 (do `(check-1 '~sym nil nil ~opts-sym)))))]))))
+     `(if (and (cljs.core/exists? clojure.test.check)
+               (cljs.core/exists? clojure.test.check.properties))
+        (let [~opts-sym ~opts]
+          [~@(->> syms
+                  (filter (checkable-syms* opts))
+                  (map
+                   (fn [sym]
+                     (do `(check-1 '~sym nil nil ~opts-sym)))))])
+        (throw
+         (js/Error. (str "Require clojure.test.check and "
+                         "clojure.test.check.properties before calling check.")))))))
 
 (defmacro ^:private maybe-setup-static-dispatch [f ret conform! arity]
   (let [arity-accessor (symbol (str ".-cljs$core$IFn$_invoke$arity$" arity))

src/main/cljs/cljs/spec/test/alpha.cljs

@@ -15,9 +15,7 @@
     [cljs.stacktrace :as st]
     [cljs.pprint :as pp]
     [cljs.spec.alpha :as s]
-    [cljs.spec.gen.alpha :as gen]
-    [clojure.test.check :as stc]
-    [clojure.test.check.properties]))
+    [cljs.spec.gen.alpha :as gen]))
 
 (defn distinct-by
   ([f coll]
@@ -228,7 +226,7 @@ with explain-data + ::s/failure."
             true))))))
 
 (defn- quick-check
-  [f specs {gen :gen opts ::stc/opts}]
+  [f specs {gen :gen opts :clojure.spec.test.check/opts}]
   (let [{:keys [num-tests] :or {num-tests 1000}} opts
         g (try (s/gen (:args specs) gen) (catch js/Error t t))]
     (if (instance? js/Error g)
@@ -240,7 +238,7 @@ with explain-data + ::s/failure."
   "Builds spec result map."
   [check-sym spec test-check-ret]
   (merge {:spec spec
-          ::stc/ret test-check-ret}
+          :clojure.spec.test.check/ret test-check-ret}
     (when check-sym
       {:sym check-sym})
     (when-let [result (-> test-check-ret :result)]
@@ -282,10 +280,10 @@ with explain-data + ::s/failure."
 suitable for summary use."
   [x]
   (if (:failure x)
-    (-> (dissoc x ::stc/ret)
+    (-> (dissoc x :clojure.spec.test.check/ret)
       (update :spec s/describe)
       (update :failure unwrap-failure))
-    (dissoc x :spec ::stc/ret)))
+    (dissoc x :spec :clojure.spec.test.check/opts)))
 
 (defn summarize-results
   "Given a collection of check-results, e.g. from 'check', pretty

src/test/cljs/cljs/spec/test_test.cljs

@@ -20,7 +20,7 @@
   (is (= (stest/unstrument `h-cljs-1812)
         []))
 
-  (stest/check `h-cljs-1812 {:clojure.test.check/opts {:num-tests 1}})
+  (stest/check `h-cljs-1812 {:clojure.spec.test.check/opts {:num-tests 1}})
 
   ; Calling h-cljs-1812 with an argument of the wrong type shouldn't throw,
   ; because the function should not have been instrumented by stest/check.
@@ -151,3 +151,16 @@
     (is (= [0 1] (fn-2995 0)))
     (is (= [0 1] (fn-2995 0)))
     (is (thrown? js/Error (fn-2995 "not a number")))))
+
+(defn cljs-2964 [x] true)
+(s/fdef cljs-2964 :args (s/cat :x int?) :ret true?)
+
+(deftest test-cljs-2964
+  (let [check-res
+        (stest/check `cljs-2964 {:clojure.spec.test.check/opts {:num-tests 1}})]
+    (is (seq check-res))
+    (is (every? (fn [res]
+                  (= 1 (-> res
+                           :clojure.spec.test.check/ret
+                           :num-tests)))
+                check-res))))