CLJS-2975: unstrument returns symbol of non-instrumented var

Fixed by checking if var is spec'ed in stest/instrument.

Author: borkdude

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

@@ -56,12 +56,16 @@ returns the set of all symbols naming vars in those nses."
 (defmacro instrument-1
   [[quote s] opts]
   (when-let [v (ana-api/resolve &env s)]
-    (when (and (nil? (:const v))
-               #?(:cljs (nil? (:macro v))))
-      (swap! instrumented-vars conj (:name v))
-      `(let [checked# (#'instrument-1* '~s (var ~s) ~opts)]
-         (when checked# (set! ~s checked#))
-         '~(:name v)))))
+    (let [var-name (:name v)]
+      (when (and (nil? (:const v))
+                 #?(:cljs (nil? (:macro v)))
+                 (contains? #?(:clj (s/speced-vars)
+                               :cljs (cljs.spec.alpha$macros/speced-vars))
+                            var-name))
+        (swap! instrumented-vars conj var-name)
+        `(let [checked# (#'instrument-1* '~s (var ~s) ~opts)]
+           (when checked# (set! ~s checked#))
+           '~var-name)))))
 
 (defmacro unstrument-1
   [[quote s]]

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

@@ -1,6 +1,7 @@
 (ns cljs.spec.test-test
   (:require-macros [cljs.spec.test.test-macros])
-  (:require [cljs.test :as test :refer-macros [deftest is are run-tests]]
+  (:require [cljs.test :as test :refer-macros [deftest testing
+                                               is are run-tests]]
             [cljs.spec.alpha :as s]
             [cljs.spec.test.alpha :as stest]
             [cljs.spec.test.test-ns1]
@@ -109,3 +110,10 @@
                      (is (nil? @#'stest/*instrument-enabled*))
                      (fn-2953 "abc"))))
   (is @#'stest/*instrument-enabled*))
+
+(defn fn-2975 [x])
+
+(deftest test-2975
+  (testing "instrument and unstrument return empty coll when no fdef exists"
+    (is (empty? (stest/instrument `fn-2975)))
+    (is (empty? (stest/unstrument `fn-2975)))))