CLJS-2278 & CLJS-2279

Author: swannodette

src/test/clojure/cljs/build_api_tests.clj

@@ -396,7 +396,7 @@
       (ana/with-warning-handlers [(collecting-warning-handler ws)]
         (build/build (build/inputs (io/file inputs "emit_global_requires_test/core.cljs")) opts cenv))
       (is (.exists (io/file out "emit_global_requires_test/core.js")))
-      (is (true? (boolean (re-find #"emit_global_requires_test\.core\.global\$module\$react_dom\$server = goog\.global\.ReactDOMServer;"
+      (is (true? (boolean (re-find #"emit_global_requires_test\.core\.global\$module\$react_dom\$server = goog\.global\[\"ReactDOMServer\"\];"
                             (slurp (io/file out "emit_global_requires_test/core.js"))))))
       (is (true? (boolean (re-find #"emit_global_requires_test\.core\.global\$module\$react_dom\$server\.renderToString"
                             (slurp (io/file out "emit_global_requires_test/core.js"))))))

src/test/self/self_host/test.cljs

@@ -1088,7 +1088,7 @@
          :eval node-eval}
         (fn [{:keys [error value] :as m}]
           (is (nil? error))
-          (is (some? (re-find #"foo\.core\.global\$module\$calculator = goog.global.Calculator;" value)))
+          (is (some? (re-find #"foo\.core\.global\$module\$calculator = goog.global\[\"Calculator\"\];" value)))
           (inc! l)))
       (cljs/eval-str
         (atom @st)
@@ -1166,7 +1166,7 @@
            :load calculator-load
            :eval identity}
           (fn [{{:keys [source]} :value}]
-            (is (some? (re-find #"foo\.core\.global\$module\$calculator = goog.global.Calculator;\snull;" source)))
+            (is (some? (re-find #"foo\.core\.global\$module\$calculator = goog.global\[\"Calculator\"\];\snull;" source)))
             (inc! l)))))))
 
 (deftest test-cljs-2261