Skip to content

Commit cb4b448

Browse files
committed
latest specs alpha
1 parent 170c8c2 commit cb4b448

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# UNRELEASED
2+
3+
```clj
4+
[org.clojure/spec.alpha "0.2.168"] is available but we use "0.1.143"
5+
[org.clojure/clojurescript "1.10.339"] is available but we use "1.10.329"
6+
```
7+
18
# 0.7.1 (25.6.2018)
29

310
* Not setting a Swagger response model doesn't emit empty schema `{}`.

project.clj

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
:source-uri "https://github.com/metosin/spec-tools/{version}/{filepath}#L{line}"
1212
:metadata {:doc/format :markdown}}
1313

14-
:dependencies [[org.clojure/spec.alpha "0.1.143"]
14+
:dependencies [[org.clojure/spec.alpha "0.2.168"]
1515
[com.fasterxml.jackson.core/jackson-databind "2.9.6"]]
1616

1717
:profiles {:dev {:plugins [[jonase/eastwood "0.2.6"]
@@ -23,7 +23,7 @@
2323
:jvm-opts ^:replace ["-server"]
2424
;:global-vars {*warn-on-reflection* true}
2525
:dependencies [[org.clojure/clojure "1.9.0"]
26-
[org.clojure/clojurescript "1.10.329"]
26+
[org.clojure/clojurescript "1.10.339"]
2727
[criterium "0.4.4"]
2828
[prismatic/schema "1.1.9"]
2929
[org.clojure/test.check "0.9.0"]

src/spec_tools/impl.cljc

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
(defn nilable-spec? [spec]
115115
(let [form (and spec (s/form spec))]
116116
(boolean
117-
(if-not (= form ::s/unknown)
117+
(if (seq? form)
118118
(some-> form
119119
seq
120120
first

test/cljc/spec_tools/visitor_all_test.cljc

+5-4
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,10 @@
118118
;; tests
119119
;;
120120

121-
(deftest CLJ-2152-test
122-
(testing "this should fail when the issues is fixed"
123-
(is (not (= `(s/& int?) (s/form (s/& int?)))))))
121+
#?(:cljs
122+
(deftest CLJ-2152-test
123+
(testing "this should fail when the issues is fixed"
124+
(is (not (= `(s/& int?) (s/form (s/& int?))))))))
124125

125126
(deftest nested-regexp-test
126127
(is (= #{::p1 ::p2 ::p3}
@@ -134,7 +135,7 @@
134135
(testing "visitor visits all specs but not s/& & s/keys* inner specs"
135136
(is (= #{::p1 ::p2 ::p3 ::p4 ::p5 ::p6 ::p7 ::p8 ::p9 ::p10
136137
::p11 ::p12 ::p13 ::p14 ::p15 ::p16 ::p17 ::p18 ::p19 ::p20
137-
::p21 ::p22 ::p23 ::p24 #_::p25 ::p26 ::p27 #_::p28 #_::p29 #_::p30
138+
::p21 ::p22 ::p23 ::p24 #?(:clj ::p25) ::p26 ::p27 #_::p28 #_::p29 #_::p30
138139
#_::p31 #_::p32 #_:p33 ::p34
139140
::pred ::keys ::keys2 ::keys3
140141
::or ::and ::merge ::every ::every-kv ::coll-of ::map-of

0 commit comments

Comments
 (0)