Skip to content

Commit b8a07d6

Browse files
authored
Merge pull request funcool#28 from pepe/master
Fix typo in scheduler creation in cljs
2 parents e93c961 + 308a989 commit b8a07d6

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/beicon/core.cljc

+5-3
Original file line numberDiff line numberDiff line change
@@ -1169,12 +1169,14 @@
11691169
#?(:cljs
11701170
(defn scheduler
11711171
"Get the scheduler instance by type.
1172-
The posible types are: `:asap`, `:queue`, `:async`."
1172+
The posible types are: `:asap`, `:async`, `:queue`.
1173+
Old `:trampoline` type is renamed as `:queue` and is deprecated."
11731174
[type]
11741175
(case type
1175-
:trampoline (.-queue Scheduler)
11761176
:asap (.-asap Scheduler)
1177-
:async (.-async Scheduler)))
1177+
:async (.-async Scheduler)
1178+
:queue (.-queue Scheduler)
1179+
:trampoline (.-queue Scheduler)))
11781180
:clj
11791181
(defn scheduler
11801182
"Get the scheduler instance by type. The possible

test/beicon/tests/test_core.cljc

+1-1
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@
630630
#?(:cljs
631631
(t/async done
632632
(let [coll [1 2 3]
633-
s (s/subscribe-on :trampoline (s/from-coll coll))]
633+
s (s/subscribe-on :queue (s/from-coll coll))]
634634
(t/is (s/observable? s))
635635
(drain! s #(t/is (= % coll)))
636636
(s/on-end s done)))

0 commit comments

Comments
 (0)