deprecate rails/convert_rails_test_xhr_4_2_to_5_0, use rails/convert_rails_test_request_methods_4_2_to_5_0 instead

Author: flyerhzm

lib/rails/convert_rails_test_request_methods_4_2_to_5_0.rb

@@ -64,6 +64,24 @@
     end
   end
 
+  within_files '{test,spec}/{functional,controllers}/**/*.rb' do
+    with_node type: 'send', message: 'xhr' do
+      request_method = node.arguments[0].to_value
+      action = node.arguments[1].to_value
+      if node.arguments.size == 2
+        replace_with "#{request_method} :#{action}, xhr: true"
+        next
+      end
+      format_value = node.arguments[2].hash_value(:format)
+      options = []
+      options << make_up_hash_pair('params', node.arguments[2])
+      options << make_up_hash_pair('flash', node.arguments[3]) if node.arguments.size > 3
+      options << make_up_hash_pair('session', node.arguments[4]) if node.arguments.size > 4
+      options << "as: #{format_value.to_source}" if format_value
+      replace_with "#{request_method} :#{action}, #{options.compact.join(', ')}, xhr: true"
+    end
+  end
+
   # get '/posts/1', user_id: user.id, { 'HTTP_AUTHORIZATION' => 'fake' }
   # =>
   # get '/posts/1', params: { user_id: user.id }, headers: { 'HTTP_AUTHORIZATION' => 'fake' }

lib/rails/convert_rails_test_xhr_4_2_to_5_0.rb

@@ -1,26 +1,6 @@
 # frozen_string_literal: true
 
 Synvert::Rewriter.new 'rails', 'convert_rails_test_xhr_4_2_to_5_0' do
-  description <<~EOS
-    It converts xhr method in rails test from 4.2 to 5.0.
-
-    ```ruby
-    xhr :get, :show
-    ```
-
-    =>
-
-    ```ruby
-    get :show, xhr: true
-    ```
-  EOS
-
-  if_gem 'rails', { gte: '5.0' }
-
-  within_files '{test,spec}/{functional,controllers}/**/*.rb' do
-    with_node type: 'send', receiver: nil, message: 'xhr', arguments: { size: 2 } do
-      method, action = node.arguments.map(&:to_value)
-      replace_with("#{method} :#{action}, xhr: true")
-    end
-  end
+  description "It's deprecated, please use `rails/convert_rails_test_request_methods_4_2_to_5_0` instead"
+  warn "It's deprecated, please use `rails/convert_rails_test_request_methods_4_2_to_5_0` instead"
 end

spec/rails/convert_rails_test_request_methods_4_2_to_5_0_spec.rb

@@ -7,8 +7,7 @@
 
   context 'functional test' do
     let(:fake_file_path) { 'test/functional/posts_controller_test.rb' }
-    let(:test_content) {
-      "
+    let(:test_content) { <<~EOS }
       class PostsControllerTest < ActionController::TestCase
         def test_show
           get :show, { id: user.id, format: :json }, { notice: 'Welcome' }, { admin: user.admin? }
@@ -25,11 +24,14 @@ def test_create
         def test_destroy
           delete :destroy, { id: user.id }, nil, { admin: user.admin? }
         end
+
+        def test_xhr
+          xhr :get, :test
+          xhr :post, :test, foo: 'bar'
+        end
       end
-    "
-    }
-    let(:test_rewritten_content) {
-      "
+    EOS
+    let(:test_rewritten_content) { <<~EOS }
       class PostsControllerTest < ActionController::TestCase
         def test_show
           get :show, params: { id: user.id }, flash: { notice: 'Welcome' }, session: { admin: user.admin? }, as: :json
@@ -46,9 +48,13 @@ def test_create
         def test_destroy
           delete :destroy, params: { id: user.id }, session: { admin: user.admin? }
         end
+
+        def test_xhr
+          get :test, xhr: true
+          post :test, params: { foo: 'bar' }, xhr: true
+        end
       end
-    "
-    }
+    EOS
 
     include_examples 'convertable'
   end