Iron out problems left uncaught during rebase

Author: jtmalinowski

lib/react/jsx.rb

@@ -8,13 +8,15 @@ module JSX
     def self.context
       # lazily loaded during first request and reloaded every time when in dev or test
       unless @context && ::Rails.env.production?
-
-        # TODO: create React::Source::contents_for
         contents =
           # If execjs uses therubyracer, there is no 'global'. Make sure
           # we have it so JSX script can work properly.
           'var global = global || this;' +
-          File.read(React::Source.bundled_path_for('JSXTransformer.js'))
+
+          # search for transformer file using sprockets - allows user to override
+          # this file in his own application
+          File.read(::Rails.application.assets.resolve('JSXTransformer.js'))
+
         @context = ExecJS.compile(contents)
       end
 

lib/react/rails/railtie.rb

@@ -8,8 +8,6 @@ class Railtie < ::Rails::Railtie
       # run after all initializers to allow sprockets to pick up react.js and
       # jsxtransformer.js from end-user to override ours if needed
       config.after_initialize do |app|
-        variant = app.config.react.variant
-
         # Mimic behavior of ember-rails...
         # We want to include different files in dev/prod. The unminified builds
         # contain console logging for invariants and logging to help catch

test/jsxtransform_test.rb

@@ -27,9 +27,9 @@ class JSXTransformTest < ActionDispatch::IntegrationTest
 
   test 'asset pipeline should transform JSX' do
     get 'assets/example.js'
+    FileUtils.rm_r CACHE_PATH if CACHE_PATH.exist?
     assert_response :success
     assert_equal EXPECTED_JS, @response.body
-    FileUtils.rm_r CACHE_PATH if CACHE_PATH.exist?
   end
 
   test 'asset pipeline should transform JSX + Coffeescript' do
@@ -50,9 +50,11 @@ class JSXTransformTest < ActionDispatch::IntegrationTest
 
     FileUtils.mv hidden_path, replacing_path
     get 'assets/example3.js'
-    assert_response :success
-    assert_equal 'test_confirmation_token_jsx_transformed;', @response.body
+
     FileUtils.mv replacing_path, hidden_path
     FileUtils.rm_r CACHE_PATH if CACHE_PATH.exist?
+
+    assert_response :success
+    assert_equal 'test_confirmation_token_jsx_transformed;', @response.body
   end
 end

test/react_test.rb

@@ -11,11 +11,12 @@ class ReactTest < ActionDispatch::IntegrationTest
     File.open(actual_react_file_path, 'w') {|f| f.write react_file_token}
 
     get 'assets/react.js'
-    assert_response :success
-    assert_equal react_file_token, @response.body
 
     File.open(actual_react_file_path, 'w') {|f| f.write actual_react_file_content}
     FileUtils.rm_r CACHE_PATH if CACHE_PATH.exist?
+
+    assert_response :success
+    assert_equal react_file_token, @response.body
   end
 
   test 'asset pipeline should deliver drop-in react file replacement' do
@@ -24,10 +25,12 @@ class ReactTest < ActionDispatch::IntegrationTest
 
     FileUtils.mv hidden_path, replacing_path
     get 'assets/react.js'
-    assert_response :success
-    assert_equal "'test_confirmation_token_react_content';\n", @response.body
+
     FileUtils.mv replacing_path, hidden_path
     FileUtils.rm_r CACHE_PATH if CACHE_PATH.exist?
+
+    assert_response :success
+    assert_equal "'test_confirmation_token_react_content';\n", @response.body
   end
 
 end