CLJS-1687: Self-host: cljs.spec: inst-in-range? and int-in-range? need qualification

Author: mfikes

src/main/cljs/cljs/spec.cljc

@@ -422,7 +422,7 @@ specified, return speced vars from all namespaces."
   `(let [st# (inst-ms ~start)
          et# (inst-ms ~end)
          mkdate# (fn [d#] (js/Date. d#))]
-     (spec (and inst? #(inst-in-range? ~start ~end %))
+     (spec (and inst? #(cljs.spec/inst-in-range? ~start ~end %))
        :gen (fn []
               (gen/fmap mkdate#
                 (gen/large-integer* {:min st# :max et#}))))))
@@ -431,7 +431,7 @@ specified, return speced vars from all namespaces."
   "Returns a spec that validates longs in the range from start
   (inclusive) to end (exclusive)."
   [start end]
-  `(spec (and c/int? #(int-in-range? ~start ~end %))
+  `(spec (and c/int? #(cljs.spec/int-in-range? ~start ~end %))
      :gen #(gen/large-integer* {:min ~start :max (dec ~end)})))
 
 (defmacro instrument

src/test/cljs/cljs/spec_test.cljs

@@ -43,6 +43,14 @@
   (is (= "good" (testmm {:type :good})))
   (is (thrown? js/Error (testmm "foo"))))
 
+(deftest int-in-test
+  (is (s/valid? (s/int-in 1 3) 2))
+  (is (not (s/valid? (s/int-in 1 3) 0))))
+
+(deftest inst-in-test
+  (is (s/valid? (s/inst-in #inst "1999" #inst "2001") #inst "2000"))
+  (is (not (s/valid? (s/inst-in #inst "1999" #inst "2001") #inst "1492"))))
+
 (comment
 
   (s/conform s2 [42 11 13 15 {:a 1 :b 2 :c 3} 1 2 3 42 43 44 11])