- Cleaned up jsx_test and moved JSXTransformer test to its own class

- Cleaned up Babel transformer test
- Refactored and cleaned up Babel Transformer

Author: vipulnsward

lib/react/jsx/babel_transformer.rb

@@ -3,25 +3,17 @@ module React
   module JSX
     class BabelTransformer
       DEPRECATED_OPTIONS = [:harmony, :strip_types, :asset_path]
-
+      DEFAULT_TRANSFORM_OPTIONS = { blacklist: ['spec.functionName', 'validation.react'] }
       def initialize(options)
-        _options = options.dup
-        has_old_opts = DEPRECATED_OPTIONS.map do |option|
-          _options.delete option
-        end.any?
-
-        if has_old_opts
+        if (options.keys & DEPRECATED_OPTIONS).any?
           ActiveSupport::Deprecation.warn("Setting config.react.jsx_transform_options for :harmony, :strip_types, and :asset_path keys is now deprecated and has no effect with the default Babel Transformer."+
                                               "Please use new Babel Transformer options :whitelist, :plugin instead.")
         end
 
-        @transform_options = {
-            blacklist: ['spec.functionName', 'validation.react']
-        }.merge(_options)
+        DEFAULT_TRANSFORM_OPTIONS.merge(options)
       end
 
       def transform(code)
-        puts @transform_options
         Babel::Transpiler.transform(code)['code']
       end
     end

test/react/jsx_test.rb

@@ -3,10 +3,14 @@
 
 # Sprockets is inserting a newline after the docblock for some reason...
 EXPECTED_JS = <<eos
+"use strict";
+
 React.createElement("div", null);
 eos
 
 EXPECTED_JS_2 = <<eos
+"use strict";
+
 (function() {
   var Component;
 
@@ -30,18 +34,19 @@ def transform(code)
 class JSXTransformTest < ActionDispatch::IntegrationTest
   setup do
     clear_sprockets_cache
+    React::JSX.transformer_class = React::JSX::BabelTransformer
+    React::JSX.transform_options = {}
   end
 
   teardown do
     clear_sprockets_cache
-    React::JSX.transformer_class = React::JSX::JSXTransformer
-    React::JSX.transform_options = {}
   end
 
   test 'asset pipeline should transform JSX' do
     get '/assets/example.js'
     assert_response :success
-    assert_equal EXPECTED_JS, @response.body
+
+    assert_equal EXPECTED_JS.gsub(/\s/, ''), @response.body.gsub(/\s/, '')
   end
 
   test 'asset pipeline should transform JSX + Coffeescript' do
@@ -51,9 +56,31 @@ class JSXTransformTest < ActionDispatch::IntegrationTest
     # as some version inserts an extra "\n" at the beginning.
     # Because appraisal is used, multiple versions of coffee-script are treated
     # together. Remove all spaces to make test pass.
+    # puts @response.body
     assert_equal EXPECTED_JS_2.gsub(/\s/, ''), @response.body.gsub(/\s/, '')
   end
 
+  test 'use a custom transformer' do
+    React::JSX.transformer_class = NullTransformer
+    manually_expire_asset('example2.js')
+    get '/assets/example2.js'
+    assert_equal "TRANSFORMED CODE!;\n", @response.body
+  end
+
+end
+
+class JSXTransformerTest < ActionDispatch::IntegrationTest
+
+  setup do
+    clear_sprockets_cache
+    React::JSX.transformer_class = React::JSX::JSXTransformer
+    React::JSX.transform_options = {}
+  end
+
+  teardown do
+    clear_sprockets_cache
+  end
+
   test 'can use dropped-in version of JSX transformer' do
     hidden_path =     Rails.root.join("vendor/assets/react/JSXTransformer__.js")
     replacing_path =  Rails.root.join("vendor/assets/react/JSXTransformer.js")
@@ -89,7 +116,6 @@ class JSXTransformTest < ActionDispatch::IntegrationTest
     replacing_path =  custom_path.join("CustomTransformer.js")
 
     React::JSX.transform_options = {asset_path: "custom/CustomTransformer.js"}
-    React::JSX.transformer_class = React::JSX::JSXTransformer
 
     FileUtils.mkdir_p(custom_path)
     FileUtils.cp(hidden_path, replacing_path)
@@ -100,10 +126,4 @@ class JSXTransformTest < ActionDispatch::IntegrationTest
     assert_equal 'test_confirmation_token_jsx_transformed;', @response.body
   end
 
-  test 'use a custom transformer' do
-    React::JSX.transformer_class = NullTransformer
-    manually_expire_asset('example2.js')
-    get '/assets/example2.js'
-    assert_equal "TRANSFORMED CODE!;\n", @response.body
-  end
 end