Skip to content

Commit 491ed9e

Browse files
authored
Merge branch 'main' into fix-test-seq
2 parents c8a7080 + e789dad commit 491ed9e

5 files changed

Lines changed: 25 additions & 21 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
## Fixed
66

77
- Fix beholder watch functionality that would cause a NullPointerException earlier.
8+
- Resolve reflective calls in profiling plugin.
89
- Fix `kaocha.testable/test-seq` not respecting `:kaocha.testable/skip` on root testable
910
- Fix `kaocha.testable/test-seq-with-skipped` omitting skipped tests on nested testables
1011

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Jump to [Quick start](#quick-start) | [Docs](#docs)
2424
- to observe and study
2525
- on-the-spot investigation
2626

27-
See the [Line Dict entry](https://dict.naver.com/linedict/zhendict/dict.html#/cnen/entry/89b3f694bb3a4fd49e3241c6bd1cb79f) for an audio sample.
27+
See the [Hanzii entry](https://hanzii.net/search/word/%E8%80%83%E5%AF%9F) for an audio sample.
2828

2929

3030
## Need help?

src/kaocha/plugin/profiling.clj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
(:import java.time.Instant
88
java.time.temporal.ChronoUnit))
99

10+
(set! *warn-on-reflection* true)
11+
1012
(spec/def ::start #(instance? Instant %))
1113
(spec/def ::duration nat-int?)
1214
(spec/def ::profiling? boolean?)
@@ -18,7 +20,7 @@
1820
(defn stop [testable]
1921
(cond-> testable
2022
(::start testable)
21-
(assoc ::duration (.until (::start testable)
23+
(assoc ::duration (.until ^Instant (::start testable)
2224
(Instant/now)
2325
ChronoUnit/NANOS))))
2426

test/features/plugins/orchestra_plugin.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Feature: Orchestra (spec instrumentation)
4545
"""
4646
ERROR in orchestra-test/spec-fail-test (orchestra_test.clj:11)
4747
Just testing simple-fn
48-
Call to orchestra-test/simple-fn did not conform to spec.
48+
Call to #'orchestra-test/simple-fn did not conform to spec.
4949
orchestra_test.clj:11
5050
5151
-- Spec failed --------------------

tests.edn

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
#kaocha/v1
2-
{:plugins [:kaocha.plugin.alpha/info
3-
:profiling
4-
:print-invocations
5-
:hooks
6-
:notifier
7-
:kaocha.plugin/version-filter]
2+
{:plugins [:kaocha.plugin.alpha/info
3+
:profiling
4+
:print-invocations
5+
:hooks
6+
:notifier
7+
:kaocha.plugin/version-filter]
88

9-
:tests [{:id :unit
10-
:test-paths ["test/shared"
11-
"test/unit"]}
12-
{:id :integration
13-
:type :kaocha.type/cucumber
14-
:test-paths ["test/shared"
15-
"test/features"]
16-
:cucumber/glue-paths ["test/step_definitions"]}]
9+
:tests [{:id :unit
10+
:test-paths ["test/shared"
11+
"test/unit"]}
12+
{:id :integration
13+
:type :kaocha.type/cucumber
14+
:test-paths ["test/shared"
15+
"test/features"]
16+
:cucumber/glue-paths ["test/step_definitions"]
17+
:kaocha.filter/skip [plugins.notifier-plugin/enabling-desktop-notifications]}]
1718

18-
:kaocha.hooks/pre-load [kaocha.assertions/load-assertions]
19+
:kaocha.hooks/pre-load [kaocha.assertions/load-assertions]
1920

20-
:kaocha/bindings {kaocha.stacktrace/*stacktrace-filters* []
21-
kaocha.stacktrace/*stacktrace-stop-list* []}
21+
:kaocha/bindings {kaocha.stacktrace/*stacktrace-filters* []
22+
kaocha.stacktrace/*stacktrace-stop-list* []}
2223

23-
:reporter kaocha.report/documentation}
24+
:reporter kaocha.report/documentation}

0 commit comments

Comments
 (0)