fix session and flash order in rails/convert_rails_test_request_metho…

…ds_4_2_to_5_0
synvert-hq · Mar 23, 2021 · 0fffce0 · 0fffce0
1 parent 5f786b0
commit 0fffce0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/rails/convert_rails_test_request_methods_4_2_to_5_0.rb b/lib/rails/convert_rails_test_request_methods_4_2_to_5_0.rb
@@ -7,13 +7,13 @@
     functional test:
 
     ```ruby
-    get :show, { id: user.id, format: :json }, { notice: 'Welcome' }, { admin: user.admin? }
+    get :show, { id: user.id, format: :json }, { admin: user.admin? }, { notice: 'Welcome' }
     ```
 
     =>
 
     ```ruby
-    get :show, params: { id: user.id }, flash: { notice: 'Welcome' }, session: { admin: user.admin? }, as: :json
+    get :show, params: { id: user.id }, session: { admin: user.admin? }, flash: { notice: 'Welcome' }, as: :json
     ```
 
     integration test:
@@ -57,8 +57,8 @@
         xhr_value = node.arguments[1].hash_value(:xhr)
         options = []
         options << make_up_hash_pair('params', node.arguments[1])
-        options << make_up_hash_pair('flash', node.arguments[2]) if node.arguments.size > 2
-        options << make_up_hash_pair('session', node.arguments[3]) if node.arguments.size > 3
+        options << make_up_hash_pair('session', node.arguments[2]) if node.arguments.size > 2
+        options << make_up_hash_pair('flash', node.arguments[3]) if node.arguments.size > 3
         options << "as: #{format_value.to_source}" if format_value
         options << "xhr: #{xhr_value.to_source}" if xhr_value
         replace_with "#{message} {{arguments.first}}, #{options.compact.join(', ')}"
@@ -77,8 +77,8 @@
       format_value = node.arguments[2].type == :hash && 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 << make_up_hash_pair('session', node.arguments[3]) if node.arguments.size > 3
+      options << make_up_hash_pair('flash', 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

diff --git a/spec/rails/convert_rails_test_request_methods_4_2_to_5_0_spec.rb b/spec/rails/convert_rails_test_request_methods_4_2_to_5_0_spec.rb
@@ -10,7 +10,7 @@
     let(:test_content) { <<~EOS }
       class PostsControllerTest < ActionController::TestCase
         def test_show
-          get :show, { id: user.id, format: :json }, { notice: 'Welcome' }, { admin: user.admin? }
+          get :show, { id: user.id, format: :json }, { admin: user.admin? }, { notice: 'Welcome' }
         end
 
         def test_index
@@ -22,7 +22,7 @@ def test_create
         end
 
         def test_destroy
-          delete :destroy, { id: user.id }, nil, { admin: user.admin? }
+          delete :destroy, { id: user.id }, { admin: user.admin? }
         end
 
         def test_xhr
@@ -34,7 +34,7 @@ def test_xhr
     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
+          get :show, params: { id: user.id }, session: { admin: user.admin? }, flash: { notice: 'Welcome' }, as: :json
         end
 
         def test_index