Skip to content

Commit ea92371

Browse files
anmonteiroswannodette
authored andcommitted
CLJS-2272: Tests that depended on default install deps behavior failing
1 parent fb8ce05 commit ea92371

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

script/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ mkdir -p builds/out-adv
1212
possible=5
1313
ran=0
1414

15-
if ! bin/cljsc src/test/cljs "{:optimizations :advanced :output-wrapper true :verbose true :compiler-stats true :parallel-build true :output-dir \"builds/out-adv\" :npm-deps {:lodash \"4.17.4\"} :closure-warnings {:non-standard-jsdoc :off :global-this :off} :foreign-libs [{:file \"src/test/cljs/calculator_global.js\" :provides [\"calculator\"] :global-exports {calculator Calculator}}]}" > builds/out-adv/core-advanced-test.js; then
15+
if ! bin/cljsc src/test/cljs "{:optimizations :advanced :output-wrapper true :verbose true :compiler-stats true :parallel-build true :output-dir \"builds/out-adv\" :npm-deps {:lodash \"4.17.4\"} :closure-warnings {:non-standard-jsdoc :off :global-this :off} :install-deps true :foreign-libs [{:file \"src/test/cljs/calculator_global.js\" :provides [\"calculator\"] :global-exports {calculator Calculator}}]}" > builds/out-adv/core-advanced-test.js; then
1616
>&2 echo ClojureScript compilation failed
1717
exit 1
1818
fi;

script/test-simple

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ possible=5
1212
ran=0
1313

1414
#bin/cljsc test >out/core-test.js
15-
if ! bin/cljsc src/test/cljs "{:optimizations :simple :static-fns true :output-dir \"builds/out-simp\" :cache-analysis true :output-wrapper true :verbose true :compiler-stats true :npm-deps {:lodash \"4.17.4\"} :closure-warnings {:non-standard-jsdoc :off :global-this :off} :foreign-libs [{:file \"src/test/cljs/calculator_global.js\" :provides [\"calculator\"] :global-exports {calculator Calculator}}]}" > builds/out-simp/core-simple-test.js; then
15+
if ! bin/cljsc src/test/cljs "{:optimizations :simple :static-fns true :output-dir \"builds/out-simp\" :cache-analysis true :output-wrapper true :verbose true :compiler-stats true :npm-deps {:lodash \"4.17.4\"} :closure-warnings {:non-standard-jsdoc :off :global-this :off} :install-deps true :foreign-libs [{:file \"src/test/cljs/calculator_global.js\" :provides [\"calculator\"] :global-exports {calculator Calculator}}]}" > builds/out-simp/core-simple-test.js; then
1616
>&2 echo ClojureScript compilation failed
1717
exit 1
1818
fi;

src/test/clojure/cljs/build_api_tests.clj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@
216216
:opts {:main 'npm-deps-test.core
217217
:output-dir out
218218
:optimizations :none
219+
:install-deps true
219220
:npm-deps {:left-pad "1.1.3"}
220221
:closure-warnings {:check-types :off}}}
221222
cenv (env/default-compiler-env)]
@@ -229,6 +230,7 @@
229230
:opts {:main 'npm-deps-test.string-requires
230231
:output-dir out
231232
:optimizations :none
233+
:install-deps true
232234
:npm-deps {:react "15.6.1"
233235
:react-dom "15.6.1"
234236
:lodash "4.17.4"}
@@ -298,6 +300,7 @@
298300
:output-dir out
299301
:optimizations :none
300302
:target :nodejs
303+
:install-deps true
301304
:npm-deps {:react "15.6.1"
302305
:react-dom "15.6.1"}
303306
:closure-warnings {:check-types :off

0 commit comments

Comments
 (0)