CLJS-2248: Build API tests rely on Yarn

Author: anmonteiro

.travis.yml

@@ -3,10 +3,9 @@ dist: trusty
 language: node_js
 
 node_js:
-  - "8"
+  - "6"
 
 before_install:
-  - npm install -g yarn
   - wget https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/jsshell-linux-x86_64.zip
   - unzip jsshell-linux-x86_64.zip -d spidermoney
   - sudo apt-get install -y libjavascriptcoregtk-3.0-bin

src/test/clojure/cljs/build_api_tests.clj

@@ -378,31 +378,6 @@
     (build/build (build/inputs (io/file inputs "data_readers_test")) opts cenv)
     (is (contains? (-> @cenv ::ana/data-readers) 'test/custom-identity))))
 
-;(deftest test-node-modules-cljs-2246
-;  (test/delete-node-modules)
-;  (spit (io/file "package.json") (json/json-str {:dependencies {:left-pad "1.1.3"}
-;                                                 :devDependencies {:module-deps "*"
-;                                                                   :resolve "*"
-;                                                                   :browser-resolve "*"}}))
-;  (sh/sh "yarn" "install")
-;  (let [ws (atom [])
-;        out (.getPath (io/file (test/tmp-dir) "node-modules-opt-test-out"))
-;        {:keys [inputs opts]} {:inputs (str (io/file "src" "test" "cljs_build"))
-;                               :opts {:main 'node-modules-opt-test.core
-;                                      :output-dir out
-;                                      :optimizations :none
-;                                      :closure-warnings {:check-types :off}}}
-;        cenv (env/default-compiler-env opts)]
-;    (test/delete-out-files out)
-;    (ana/with-warning-handlers [(collecting-warning-handler ws)]
-;      (build/build (build/inputs (io/file inputs "node_modules_opt_test/core.cljs")) opts cenv))
-;    (is (.exists (io/file out "node_modules/left-pad/index.js")))
-;    (is (contains? (:js-module-index @cenv) "left-pad"))
-;    (is (empty? @ws)))
-;  (.delete (io/file "package.json"))
-;  (.delete (io/file "yarn.lock"))
-;  (test/delete-node-modules))
-
 (deftest test-cljs-2249
   (let [out (io/file (test/tmp-dir) "cljs-2249-out")
         root (io/file "src" "test" "cljs_build")
@@ -414,3 +389,29 @@
     (test/delete-out-files out)
     (closure/build (build/inputs (io/file root "foreign_libs_cljs_2249")) opts)
     (is (.exists (io/file out "calculator_global.js")))))
+
+(deftest test-node-modules-cljs-2246
+  (test/delete-node-modules)
+  (.delete (io/file "package-lock.json"))
+  (spit (io/file "package.json") (json/json-str {:dependencies {:left-pad "1.1.3"}
+                                                 :devDependencies {:module-deps "*"
+                                                                   :resolve "*"
+                                                                   :browser-resolve "*"}}))
+  (sh/sh "npm" "install")
+  (let [ws (atom [])
+        out (.getPath (io/file (test/tmp-dir) "node-modules-opt-test-out"))
+        {:keys [inputs opts]} {:inputs (str (io/file "src" "test" "cljs_build"))
+                               :opts {:main 'node-modules-opt-test.core
+                                      :output-dir out
+                                      :optimizations :none
+                                      :closure-warnings {:check-types :off}}}
+        cenv (env/default-compiler-env opts)]
+    (test/delete-out-files out)
+    (ana/with-warning-handlers [(collecting-warning-handler ws)]
+      (build/build (build/inputs (io/file inputs "node_modules_opt_test/core.cljs")) opts cenv))
+    (is (.exists (io/file out "node_modules/left-pad/index.js")))
+    (is (contains? (:js-module-index @cenv) "left-pad"))
+    (is (empty? @ws)))
+  (.delete (io/file "package.json"))
+  (.delete (io/file "package-lock.json"))
+  (test/delete-node-modules))

src/test/clojure/cljs/test_util.clj

@@ -20,8 +20,10 @@
      (.delete f))))
 
 (defn delete-node-modules []
-  (doseq [f (file-seq (io/file "node_modules"))]
-    (.delete f)))
+  (let [nm (io/file "node_modules")]
+    (while (.exists nm)
+      (doseq [f (file-seq nm)]
+        (.delete f)))))
 
 (defn project-with-modules
   "Returns the build config for a project that uses Google Closure modules."