Merge pull request rails#52928 from jeromedalbert/fix-rubocop-when-skipping-jbuilder

Fix Rubocop offenses for Rails apps without Jbuilder

Author: byroot

railties/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb.tt

@@ -50,7 +50,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       <%- if attributes_names.empty? -%>
       params.expect(<%= singular_table_name %>: {})
       <%- else -%>
-      params.expect(<%= singular_table_name %>: [<%= permitted_params %>])
+      params.expect(<%= singular_table_name %>: [ <%= permitted_params %> ])
       <%- end -%>
     end
 end

railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb.tt

@@ -57,7 +57,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       <%- if attributes_names.empty? -%>
       params.expect(<%= singular_table_name %>: {})
       <%- else -%>
-      params.expect(<%= singular_table_name %>: [<%= permitted_params %>])
+      params.expect(<%= singular_table_name %>: [ <%= permitted_params %> ])
       <%- end -%>
     end
 end

railties/test/generators/scaffold_controller_generator_test.rb

@@ -58,7 +58,7 @@ def test_controller_skeleton_is_created
       end
 
       assert_match(/def user_params/, content)
-      assert_match(/params\.expect\(user: \[:name, :age\]\)/, content)
+      assert_match(/params\.expect\(user: \[ :name, :age \]\)/, content)
     end
   end
 
@@ -76,7 +76,7 @@ def test_controller_permit_references_attributes
 
     assert_file "app/controllers/line_items_controller.rb" do |content|
       assert_match(/def line_item_params/, content)
-      assert_match(/params\.expect\(line_item: \[:product_id, :cart_id\]\)/, content)
+      assert_match(/params\.expect\(line_item: \[ :product_id, :cart_id \]\)/, content)
     end
   end
 
@@ -85,7 +85,7 @@ def test_controller_permit_polymorphic_references_attributes
 
     assert_file "app/controllers/line_items_controller.rb" do |content|
       assert_match(/def line_item_params/, content)
-      assert_match(/params\.expect\(line_item: \[:product_id, :product_type\]\)/, content)
+      assert_match(/params\.expect\(line_item: \[ :product_id, :product_type \]\)/, content)
     end
   end
 
@@ -94,7 +94,7 @@ def test_controller_permit_attachment_attributes
 
     assert_file "app/controllers/messages_controller.rb" do |content|
       assert_match(/def message_params/, content)
-      assert_match(/params\.expect\(message: \[:video, photos: \[\]\]\)/, content)
+      assert_match(/params\.expect\(message: \[ :video, photos: \[\] \]\)/, content)
     end
   end
 
@@ -103,7 +103,7 @@ def test_controller_permit_attachments_attributes_only
 
     assert_file "app/controllers/messages_controller.rb" do |content|
       assert_match(/def message_params/, content)
-      assert_match(/params\.expect\(message: \[photos: \[\]\]\)/, content)
+      assert_match(/params\.expect\(message: \[ photos: \[\] \]\)/, content)
     end
   end
 
@@ -353,7 +353,7 @@ def test_api_only_generates_params_for_attachments
 
     assert_file "app/controllers/messages_controller.rb" do |content|
       assert_match(/def message_params/, content)
-      assert_match(/params\.expect\(message: \[:video, photos: \[\]\]\)/, content)
+      assert_match(/params\.expect\(message: \[ :video, photos: \[\] \]\)/, content)
     end
   end
 

railties/test/generators/scaffold_generator_test.rb

@@ -430,7 +430,7 @@ def test_scaffold_generator_belongs_to_and_references
 
     assert_file "app/controllers/accounts_controller.rb" do |content|
       assert_instance_method :account_params, content do |m|
-        assert_match(/expect\(account: \[:name, :currency_id, :user_id\]\)/, m)
+        assert_match(/expect\(account: \[ :name, :currency_id, :user_id \]\)/, m)
       end
     end
 
@@ -461,7 +461,7 @@ def test_scaffold_generator_attachments
 
     assert_file "app/controllers/messages_controller.rb" do |content|
       assert_instance_method :message_params, content do |m|
-        assert_match(/expect\(message: \[:video, photos: \[\], images: \[\]\]\)/, m)
+        assert_match(/expect\(message: \[ :video, photos: \[\], images: \[\] \]\)/, m)
       end
     end
 
@@ -488,7 +488,7 @@ def test_scaffold_generator_rich_text
 
     assert_file "app/controllers/messages_controller.rb" do |content|
       assert_instance_method :message_params, content do |m|
-        assert_match(/expect\(message: \[:content\]\)/, m)
+        assert_match(/expect\(message: \[ :content \]\)/, m)
       end
     end
 
@@ -536,7 +536,7 @@ def test_scaffold_generator_password_digest
 
     assert_file "app/controllers/users_controller.rb" do |content|
       assert_instance_method :user_params, content do |m|
-        assert_match(/expect\(user: \[:name, :password, :password_confirmation\]\)/, m)
+        assert_match(/expect\(user: \[ :name, :password, :password_confirmation \]\)/, m)
       end
     end