Skip to content

Commit 1e3ec87

Browse files
cichlibbatsov
authored andcommitted
Use Nashorn for CLJS tests
1 parent 8586dd9 commit 1e3ec87

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
/checkouts
55
pom.xml
66
pom.xml.asc
7+
nashorn_code_cache
78
*.jar
89
*.class
9-
.cljs_node_repl
10+
.cljs_nashorn_repl
1011
.lein-deps-sum
1112
.lein-failures
1213
.lein-plugins

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: test-clj test-cljs eastwood cljfmt cloverage install smoketest release deploy clean check_node detect_timeout
1+
.PHONY: test-clj test-cljs eastwood cljfmt cloverage install smoketest release deploy clean detect_timeout
22

33
CLOJURE_VERSION ?= 1.9
44
export CLOVERAGE_VERSION = 1.0.13
@@ -16,7 +16,7 @@ source-deps: .source-deps
1616
test-clj: .source-deps smoketest
1717
lein with-profile +$(CLOJURE_VERSION),+plugin.mranderson/config,+test-clj test
1818

19-
test-cljs: .source-deps check_node detect_timeout
19+
test-cljs: .source-deps
2020
lein with-profile +$(CLOJURE_VERSION),+plugin.mranderson/config,+test-cljs test
2121

2222
eastwood:
@@ -47,8 +47,6 @@ smoketest: install
4747
lein with-profile +$(CLOJURE_VERSION) uberjar && \
4848
java -jar target/smoketest-0.1.0-SNAPSHOT-standalone.jar
4949

50-
check_node:
51-
which node
5250

5351
# Run a background process that prints all JVM stacktraces after five minutes,
5452
# then kills all JVMs, to help diagnose issues with ClojureScript tests getting

test/cljs/cider/nrepl/piggieback_test.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#'piggieback/wrap-cljs-repl))]
1717
(session/message {:op :eval
1818
:code (nrepl/code (require '[cider.piggieback :as piggieback])
19-
(require '[cljs.repl.node :as node])
20-
(piggieback/cljs-repl (node/repl-env)))})
19+
(require '[cljs.repl.nashorn :as nashorn])
20+
(piggieback/cljs-repl (nashorn/repl-env)))})
2121
(session/message {:op :eval
2222
:code (nrepl/code (require 'clojure.data))})
2323
(f)

0 commit comments

Comments
 (0)