File tree Expand file tree Collapse file tree 5 files changed +13
-6
lines changed
src/cljc/matcher_combinators Expand file tree Collapse file tree 5 files changed +13
-6
lines changed Original file line number Diff line number Diff line change @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. This
3
3
change log follows the conventions of
4
4
[ keepachangelog.com] ( http://keepachangelog.com/ ) .
5
5
6
+ ## 3.8.7 / 2023-08-31
7
+ - fix more issues when using non-composite matchers (` m/regex ` , ` m/pred ` , etc)
8
+ inside ` match-with ` .
9
+
6
10
## 3.8.6 / 2023-07-18
7
11
- fix issue when using non-composite matchers (` m/regex ` , ` m/pred ` , etc)
8
12
inside ` match-with ` .
Original file line number Diff line number Diff line change 26
26
27
27
test:node
28
28
{:doc " run ClojureScript tests via node"
29
- :task (apply clojure " -M:cljs-test compile cli-test" *command-line-args*)}
29
+ :task (do (apply clojure " -M:cljs-test compile cli-test" *command-line-args*)
30
+ (shell " node ./out/node-tests.js" ))}
30
31
31
32
test:browser
32
33
{:doc " run ClojureScript tests in browser at `http://localhost:9158/`"
Original file line number Diff line number Diff line change 2
2
:source-paths [" src/clj" " src/cljc" " src/cljs" " test" ]
3
3
:builds {:cli-test {:target :node-test
4
4
:output-to " out/node-tests.js"
5
- :ns-regexp " -test$"
6
- :autorun true }
5
+ :ns-regexp " -test$" }
7
6
:browser-test {:target :browser-test
8
7
:test-dir " out/public/js/test"
9
8
:ns-regexp " -test$"
Original file line number Diff line number Diff line change 1
1
(ns matcher-combinators.matchers
2
- (:require #?(:cljs [matcher-combinators.core :as core :refer [Matcher]]
2
+ (:require #?(:cljs [matcher-combinators.core :as core :refer [Matcher Regex Value Absent PredMatcher ]]
3
3
:clj [matcher-combinators.core :as core])
4
4
[clojure.string :as string]
5
5
[matcher-combinators.utils :as utils])
224
224
(update value :expected match-with-elements overrides)
225
225
226
226
; ; non-nested matcher like `(m/equals 1)` or `(m/regex #"hi")`
227
- (instance? Matcher value)
227
+ #?(:clj (instance? Matcher value)
228
+ ; ; TODO: how do you do this in a comprehensive way?
229
+ ; ; `(satisfies? Matcher value)` doesn't seem to work
230
+ :cljs (#{Absent PredMatcher Regex Value} (type value)))
228
231
value
229
232
230
233
(map? value)
Original file line number Diff line number Diff line change 1
1
{:major 3
2
2
:minor 8
3
- :release 6
3
+ :release 7
4
4
#_#_ :qualifier :alpha }
You can’t perform that action at this time.
0 commit comments