CLJS-3033: Maintain backward compatibility test.check keyword

CLJS-2964 unified the key for passing clojure.test.check options with
Clojure. This introduced a breaking change. This commit unbreaks that change by
maintaining backward compatibility, supporting both keywords.

Author: borkdude

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

@@ -193,11 +193,17 @@ Returns a collection of syms naming the vars unstrumented."
   [[quote s :as qs] f spec opts]
   (let [{:keys [name] :as v} (when qs (ana-api/resolve &env s))]
     `(let [s#        '~name
-           opts#     ~opts
            v#        ~(when v `(var ~name))
            spec#     (or ~spec ~(when v `(s/get-spec (var ~name))))
            re-inst?# (and v# (seq (unstrument '~name)) true)
-           f#        (or ~f (when v# @v#))]
+           f#        (or ~f (when v# @v#))
+           opts#     ~opts
+           old-tc-ns# "clojure.test.check"
+           old-tc-opts-key# (keyword old-tc-ns# "opts")
+           [tc-ns# opts#] (if-let [old-tc-opts# (get opts# old-tc-opts-key#)]
+                            [old-tc-ns# (assoc opts# :clojure.spec.test.check/opts
+                                               old-tc-opts#)]
+                            ["clojure.spec.test.check" opts#])]
        (try
          (cond
            (nil? f#)
@@ -206,7 +212,8 @@ Returns a collection of syms naming the vars unstrumented."
 
            (:args spec#)
            (let [tcret# (#'quick-check f# spec# opts#)]
-             (#'make-check-result s# spec# tcret#))
+             (#'make-check-result s# spec# tcret#
+                                  (keyword tc-ns# "ret")))
 
            :default
            {:failure (ex-info "No :args spec" {::s/failure :no-args-spec})

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

@@ -236,9 +236,9 @@ with explain-data + ::s/failure."
 
 (defn- make-check-result
   "Builds spec result map."
-  [check-sym spec test-check-ret]
+  [check-sym spec test-check-ret tc-ret-key]
   (merge {:spec spec
-          :clojure.spec.test.check/ret test-check-ret}
+          tc-ret-key test-check-ret}
     (when check-sym
       {:sym check-sym})
     (when-let [result (-> test-check-ret :result)]

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

@@ -164,3 +164,16 @@
                            :clojure.spec.test.check/ret
                            :num-tests)))
                 check-res))))
+
+(defn cljs-3033 [x] true)
+(s/fdef cljs-3033 :args (s/cat :x int?) :ret true?)
+
+(deftest test-cljs-3033
+  (let [check-res
+        (stest/check `cljs-3033 {:clojure.test.check/opts {:num-tests 1}})]
+    (is (seq check-res))
+    (is (every? (fn [res]
+                  (= 1 (-> res
+                           :clojure.test.check/ret
+                           :num-tests)))
+                check-res))))