Merge pull request #112 from clojure/cljs-3343/windows-tests

CLJS-3343: Fix Windows module processing tests

Author: swannodette

src/main/clojure/cljs/closure.clj

@@ -2889,7 +2889,12 @@
                                           (when (or ana/*verbose* (:verbose opts))
                                             (util/debug-prn "Ignoring JS module" url "based on the file extension"))
                                           (assoc js :source ""))
-                                        (assoc js :source (deps/-source js opts))))))
+                                        (if-let [src (deps/-source js opts)]
+                                          (assoc js :source src)
+                                          (throw
+                                            (ex-info (str "Could not get source for JS module")
+                                              {:js-module lib
+                                               :clojure.error/phase :compilation})))))))
                              (map (fn [js]
                                     (if (:preprocess js)
                                       (preprocess-js js opts)

src/test/clojure/cljs/module_processing_tests.clj

@@ -23,11 +23,11 @@
 (defn preprocess-jsx [ijs _]
   (assoc ijs :source (clojure.string/replace
                        (:source ijs)
-                       (re-pattern (str "\\(\n"
-                                        "\\s*<svg width=\"200px\" height=\"200px\" className=\"center\">\n"
-                                        "\\s*<circle cx=\"100px\" cy=\"100px\" r=\"100px\" fill=\\{this.props.color\\}>\n"
-                                        "\\s*</circle>\n"
-                                        "\\s*</svg>\n"
+                       (re-pattern (str "\\(\\R"
+                                        "\\s*<svg width=\"200px\" height=\"200px\" className=\"center\">\\R"
+                                        "\\s*<circle cx=\"100px\" cy=\"100px\" r=\"100px\" fill=\\{this.props.color\\}>\\R"
+                                        "\\s*</circle>\\R"
+                                        "\\s*</svg>\\R"
                                         "\\s*\\)"))
                        (str " React.createElement(\"svg\", {width:\"200px\", height:\"200px\", className:\"center\"}, "
                             "React.createElement(\"circle\", {cx:\"100px\", cy:\"100px\", r:\"100px\", fill:this.props.color})"