Skip to content

Commit fcbfd7f

Browse files
committed
Fix Rubocop errors for Rails apps without jbuilder
Format generated controllers correctly so that apps created with the `--skip-jbuilder` option are compliant with rubocop-rails-omakase.
1 parent 435a693 commit fcbfd7f

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class <%= controller_class_name %>Controller < ApplicationController
5050
<%- if attributes_names.empty? -%>
5151
params.expect(<%= singular_table_name %>: {})
5252
<%- else -%>
53-
params.expect(<%= singular_table_name %>: [<%= permitted_params %>])
53+
params.expect(<%= singular_table_name %>: [ <%= permitted_params %> ])
5454
<%- end -%>
5555
end
5656
end

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class <%= controller_class_name %>Controller < ApplicationController
5757
<%- if attributes_names.empty? -%>
5858
params.expect(<%= singular_table_name %>: {})
5959
<%- else -%>
60-
params.expect(<%= singular_table_name %>: [<%= permitted_params %>])
60+
params.expect(<%= singular_table_name %>: [ <%= permitted_params %> ])
6161
<%- end -%>
6262
end
6363
end

railties/test/generators/scaffold_controller_generator_test.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def test_controller_skeleton_is_created
5858
end
5959

6060
assert_match(/def user_params/, content)
61-
assert_match(/params\.expect\(user: \[:name, :age\]\)/, content)
61+
assert_match(/params\.expect\(user: \[ :name, :age \]\)/, content)
6262
end
6363
end
6464

@@ -76,7 +76,7 @@ def test_controller_permit_references_attributes
7676

7777
assert_file "app/controllers/line_items_controller.rb" do |content|
7878
assert_match(/def line_item_params/, content)
79-
assert_match(/params\.expect\(line_item: \[:product_id, :cart_id\]\)/, content)
79+
assert_match(/params\.expect\(line_item: \[ :product_id, :cart_id \]\)/, content)
8080
end
8181
end
8282

@@ -85,7 +85,7 @@ def test_controller_permit_polymorphic_references_attributes
8585

8686
assert_file "app/controllers/line_items_controller.rb" do |content|
8787
assert_match(/def line_item_params/, content)
88-
assert_match(/params\.expect\(line_item: \[:product_id, :product_type\]\)/, content)
88+
assert_match(/params\.expect\(line_item: \[ :product_id, :product_type \]\)/, content)
8989
end
9090
end
9191

@@ -94,7 +94,7 @@ def test_controller_permit_attachment_attributes
9494

9595
assert_file "app/controllers/messages_controller.rb" do |content|
9696
assert_match(/def message_params/, content)
97-
assert_match(/params\.expect\(message: \[:video, photos: \[\]\]\)/, content)
97+
assert_match(/params\.expect\(message: \[ :video, photos: \[\] \]\)/, content)
9898
end
9999
end
100100

@@ -103,7 +103,7 @@ def test_controller_permit_attachments_attributes_only
103103

104104
assert_file "app/controllers/messages_controller.rb" do |content|
105105
assert_match(/def message_params/, content)
106-
assert_match(/params\.expect\(message: \[photos: \[\]\]\)/, content)
106+
assert_match(/params\.expect\(message: \[ photos: \[\] \]\)/, content)
107107
end
108108
end
109109

@@ -353,7 +353,7 @@ def test_api_only_generates_params_for_attachments
353353

354354
assert_file "app/controllers/messages_controller.rb" do |content|
355355
assert_match(/def message_params/, content)
356-
assert_match(/params\.expect\(message: \[:video, photos: \[\]\]\)/, content)
356+
assert_match(/params\.expect\(message: \[ :video, photos: \[\] \]\)/, content)
357357
end
358358
end
359359

railties/test/generators/scaffold_generator_test.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ def test_scaffold_generator_belongs_to_and_references
430430

431431
assert_file "app/controllers/accounts_controller.rb" do |content|
432432
assert_instance_method :account_params, content do |m|
433-
assert_match(/expect\(account: \[:name, :currency_id, :user_id\]\)/, m)
433+
assert_match(/expect\(account: \[ :name, :currency_id, :user_id \]\)/, m)
434434
end
435435
end
436436

@@ -461,7 +461,7 @@ def test_scaffold_generator_attachments
461461

462462
assert_file "app/controllers/messages_controller.rb" do |content|
463463
assert_instance_method :message_params, content do |m|
464-
assert_match(/expect\(message: \[:video, photos: \[\], images: \[\]\]\)/, m)
464+
assert_match(/expect\(message: \[ :video, photos: \[\], images: \[\] \]\)/, m)
465465
end
466466
end
467467

@@ -488,7 +488,7 @@ def test_scaffold_generator_rich_text
488488

489489
assert_file "app/controllers/messages_controller.rb" do |content|
490490
assert_instance_method :message_params, content do |m|
491-
assert_match(/expect\(message: \[:content\]\)/, m)
491+
assert_match(/expect\(message: \[ :content \]\)/, m)
492492
end
493493
end
494494

@@ -536,7 +536,7 @@ def test_scaffold_generator_password_digest
536536

537537
assert_file "app/controllers/users_controller.rb" do |content|
538538
assert_instance_method :user_params, content do |m|
539-
assert_match(/expect\(user: \[:name, :password, :password_confirmation\]\)/, m)
539+
assert_match(/expect\(user: \[ :name, :password, :password_confirmation \]\)/, m)
540540
end
541541
end
542542

0 commit comments

Comments
 (0)