Skip to content

Commit 4d6811d

Browse files
author
awb99
committed
transit-cljs tests added
1 parent c970691 commit 4d6811d

File tree

5 files changed

+37
-8
lines changed

5 files changed

+37
-8
lines changed

.github/workflows/ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ jobs:
3232
shell: bash
3333
- name: test-clj
3434
run: clojure -M:test
35+
- name: test-cljs
36+
run: ./cljs-test.sh
3537
- name: Release
3638
if: success()
3739
# if: github.event_name == 'push'

cljs-test.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
clojure -X:webly:npm-install
4+
clojure -X:webly:build-ci
5+
npm test

src/modular/encoding/transit.cljc

+10
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@
3535
(transit/write writer data)
3636
(.toString out))))
3737

38+
#?(:cljs
39+
(defn write-transit [data]
40+
(let [writer (transit/writer :json encode)]
41+
(transit/write writer data))))
42+
3843
#?(:clj
3944
(defn string->stream
4045
([s] (string->stream s "UTF-8"))
@@ -49,6 +54,11 @@
4954
reader (transit/reader in :json decode)]
5055
(transit/read reader))))
5156

57+
#?(:cljs
58+
(defn read-transit [data]
59+
(let [reader (transit/reader :json decode)]
60+
(transit/read reader data))))
61+
5262
#?(:clj
5363
(defn spit-transit [filename data]
5464
(->> (write-transit data)

test/modular/encoding/demo_data.cljc

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
(ns modular.encoding.demo-data
22
(:require
3+
[tick.core :as t]
34
[modular.date :refer [now-local now-date now-instant]]
45
[modular.encoding.bidi :refer [demo-bidi-tag]]))
56

67
(def demo-data {:a 34
7-
:date-local (now-local)
8-
:date (now-date)
9-
:date-instant (now-instant)
10-
:b demo-bidi-tag})
8+
:date {:date-local (t/date-time) ; (now-local)
9+
:date (t/date) ;(now-date)
10+
:date-instant (t/instant) ; (now-instant)
11+
:date-zoned (t/zoned-date-time)}
12+
:bidi {:b demo-bidi-tag}})

test/modular/encoding/transit_test.cljs

+14-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,28 @@
22
(:require
33
[cljs.test :refer-macros [async deftest is testing]]
44
[bidi.bidi :as bidi]
5-
;[modular.encoding.transit :refer [write-transit read-transit]]
5+
[modular.encoding.transit :refer [write-transit read-transit]]
66
[modular.encoding.edn :refer [read-edn]]
77
[modular.encoding.demo-data :refer [demo-data]]))
88

99
(println "encoding test running.")
1010

1111
(deftest encoding-edn-test []
1212
(let [t (pr-str demo-data)]
13-
(println "encoded data: " t)
13+
(println "EDN encoded data: " t)
1414
(is (= demo-data (read-edn t)))))
1515

16-
#_(deftest encoding-transit-test []
17-
(let [t (write-trnsit demo-data)]
16+
(deftest encoding-transit-simple-test []
17+
(let [data (dissoc demo-data :date :bidi)
18+
t (write-transit data)]
19+
(is (= data (read-transit t)))))
20+
21+
(deftest encoding-transit-date-test []
22+
(let [data (dissoc demo-data :bidi)
23+
t (write-transit data)]
24+
(is (= data (read-transit t)))))
25+
26+
#_(deftest encoding-transit-bidi-test []
27+
(let [t (write-transit demo-data)]
1828
(is (= demo-data (read-transit t)))))
1929

0 commit comments

Comments
 (0)