1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Enable Layout/EmptyLinesAroundBlockBody to reduce review cost in the future

We sometimes ask "✂️ extra blank lines" to a contributor in reviews like
https://github.com/rails/rails/pull/33337#discussion_r201509738.

It is preferable to deal automatically without depending on manpower.
This commit is contained in:
Ryuta Kamizono 2018-07-12 21:29:48 +09:00
parent 7fc499d135
commit 6f58b2cfc9
17 changed files with 3 additions and 30 deletions

View file

@ -52,6 +52,9 @@ Layout/EndAlignment:
Layout/EmptyLineAfterMagicComment: Layout/EmptyLineAfterMagicComment:
Enabled: true Enabled: true
Layout/EmptyLinesAroundBlockBody:
Enabled: true
# In a regular class definition, no empty lines around the body. # In a regular class definition, no empty lines around the body.
Layout/EmptyLinesAroundClassBody: Layout/EmptyLinesAroundClassBody:
Enabled: true Enabled: true

View file

@ -41,7 +41,6 @@ class ActionCable::Connection::ClientSocketTest < ActionCable::TestCase
# Internal hax = :( # Internal hax = :(
client = connection.websocket.send(:websocket) client = connection.websocket.send(:websocket)
client.instance_variable_get("@stream").stub(:write, proc { raise "foo" }) do client.instance_variable_get("@stream").stub(:write, proc { raise "foo" }) do
assert_not_called(client, :client_gone) do assert_not_called(client, :client_gone) do
client.write("boo") client.write("boo")
end end

View file

@ -41,7 +41,6 @@ module ActionDispatch
rescue SystemCallError rescue SystemCallError
false false
end end
} }
return ::Rack::Utils.escape_path(match).b return ::Rack::Utils.escape_path(match).b
end end

View file

@ -66,7 +66,6 @@ class ResourcesTest < ActionController::TestCase
member_methods.each_key do |action| member_methods.each_key do |action|
assert_named_route "/messages/1/#{path_names[action] || action}", "#{action}_message_path", action: action, id: "1" assert_named_route "/messages/1/#{path_names[action] || action}", "#{action}_message_path", action: action, id: "1"
end end
end end
end end
end end

View file

@ -937,7 +937,6 @@ class RouteSetTest < ActiveSupport::TestCase
@default_route_set ||= begin @default_route_set ||= begin
set = ActionDispatch::Routing::RouteSet.new set = ActionDispatch::Routing::RouteSet.new
set.draw do set.draw do
ActiveSupport::Deprecation.silence do ActiveSupport::Deprecation.silence do
get "/:controller(/:action(/:id))" get "/:controller(/:action(/:id))"
end end
@ -1342,11 +1341,9 @@ class RouteSetTest < ActiveSupport::TestCase
def test_namespace def test_namespace
set.draw do set.draw do
namespace "api" do namespace "api" do
get "inventory" => "products#inventory" get "inventory" => "products#inventory"
end end
end end
params = request_path_params("/api/inventory", method: :get) params = request_path_params("/api/inventory", method: :get)

View file

@ -220,7 +220,6 @@ module Arel
end end
describe "select" do describe "select" do
it "accepts a select query in place of a VALUES clause" do it "accepts a select query in place of a VALUES clause" do
table = Table.new :users table = Table.new :users
@ -238,7 +237,6 @@ module Arel
INSERT INTO "users" ("id", "name") (SELECT 1, "aaron") INSERT INTO "users" ("id", "name") (SELECT 1, "aaron")
} }
end end
end end
end end
end end

View file

@ -244,8 +244,6 @@ module Arel
@m2 = Arel::SelectManager.new table @m2 = Arel::SelectManager.new table
@m2.project Arel.star @m2.project Arel.star
@m2.where(table[:age].gt(99)) @m2.where(table[:age].gt(99))
end end
it "should union two managers" do it "should union two managers" do
@ -266,7 +264,6 @@ module Arel
( SELECT * FROM "users" WHERE "users"."age" < 18 UNION ALL SELECT * FROM "users" WHERE "users"."age" > 99 ) ( SELECT * FROM "users" WHERE "users"."age" < 18 UNION ALL SELECT * FROM "users" WHERE "users"."age" > 99 )
} }
end end
end end
describe "intersect" do describe "intersect" do
@ -279,8 +276,6 @@ module Arel
@m2 = Arel::SelectManager.new table @m2 = Arel::SelectManager.new table
@m2.project Arel.star @m2.project Arel.star
@m2.where(table[:age].lt(99)) @m2.where(table[:age].lt(99))
end end
it "should interect two managers" do it "should interect two managers" do
@ -293,7 +288,6 @@ module Arel
( SELECT * FROM "users" WHERE "users"."age" > 18 INTERSECT SELECT * FROM "users" WHERE "users"."age" < 99 ) ( SELECT * FROM "users" WHERE "users"."age" > 18 INTERSECT SELECT * FROM "users" WHERE "users"."age" < 99 )
} }
end end
end end
describe "except" do describe "except" do
@ -318,7 +312,6 @@ module Arel
( SELECT * FROM "users" WHERE "users"."age" BETWEEN 18 AND 60 EXCEPT SELECT * FROM "users" WHERE "users"."age" BETWEEN 40 AND 99 ) ( SELECT * FROM "users" WHERE "users"."age" BETWEEN 18 AND 60 EXCEPT SELECT * FROM "users" WHERE "users"."age" BETWEEN 40 AND 99 )
} }
end end
end end
describe "with" do describe "with" do
@ -647,7 +640,6 @@ module Arel
end end
describe "joins" do describe "joins" do
it "returns inner join sql" do it "returns inner join sql" do
table = Table.new :users table = Table.new :users
aliaz = table.alias aliaz = table.alias
@ -1002,7 +994,6 @@ module Arel
end end
describe "update" do describe "update" do
it "creates an update statement" do it "creates an update statement" do
table = Table.new :users table = Table.new :users
manager = Arel::SelectManager.new manager = Arel::SelectManager.new
@ -1075,7 +1066,6 @@ module Arel
UPDATE "users" SET "id" = 1 WHERE "users"."id" IN (SELECT "users"."id" FROM "users" WHERE "users"."foo" = 10 LIMIT 42) UPDATE "users" SET "id" = 1 WHERE "users"."id" IN (SELECT "users"."id" FROM "users" WHERE "users"."foo" = 10 LIMIT 42)
} }
end end
end end
describe "project" do describe "project" do
@ -1097,7 +1087,6 @@ module Arel
manager.project "*" manager.project "*"
manager.to_sql.must_be_like %{ SELECT * } manager.to_sql.must_be_like %{ SELECT * }
end end
end end
describe "projections" do describe "projections" do

View file

@ -91,7 +91,6 @@ class InheritanceTest < ActiveRecord::TestCase
end end
ActiveSupport::Dependencies.stub(:safe_constantize, proc { raise e }) do ActiveSupport::Dependencies.stub(:safe_constantize, proc { raise e }) do
exception = assert_raises NameError do exception = assert_raises NameError do
Company.send :compute_type, "InvalidModel" Company.send :compute_type, "InvalidModel"
end end

View file

@ -669,7 +669,6 @@ module NestedAttributesOnACollectionAssociationTests
def test_should_take_a_hash_with_composite_id_keys_and_assign_the_attributes_to_the_associated_models def test_should_take_a_hash_with_composite_id_keys_and_assign_the_attributes_to_the_associated_models
@child_1.stub(:id, "ABC1X") do @child_1.stub(:id, "ABC1X") do
@child_2.stub(:id, "ABC2X") do @child_2.stub(:id, "ABC2X") do
@pirate.attributes = { @pirate.attributes = {
association_getter => [ association_getter => [
{ id: @child_1.id, name: "Grace OMalley" }, { id: @child_1.id, name: "Grace OMalley" },

View file

@ -482,7 +482,6 @@ class QueryCacheTest < ActiveRecord::TestCase
assert_not ActiveRecord::Base.connection.query_cache_enabled assert_not ActiveRecord::Base.connection.query_cache_enabled
}.join }.join
}.call({}) }.call({})
end end
end end

View file

@ -573,7 +573,6 @@ class TransactionTest < ActiveRecord::TestCase
assert_called(Topic.connection, :begin_db_transaction) do assert_called(Topic.connection, :begin_db_transaction) do
Topic.connection.stub(:commit_db_transaction, -> { raise("OH NOES") }) do Topic.connection.stub(:commit_db_transaction, -> { raise("OH NOES") }) do
assert_called(Topic.connection, :rollback_db_transaction) do assert_called(Topic.connection, :rollback_db_transaction) do
e = assert_raise RuntimeError do e = assert_raise RuntimeError do
Topic.transaction do Topic.transaction do
# do nothing # do nothing

View file

@ -1,7 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
ActiveRecord::Schema.define do ActiveRecord::Schema.define do
if subsecond_precision_supported? if subsecond_precision_supported?
create_table :datetime_defaults, force: true do |t| create_table :datetime_defaults, force: true do |t|
t.datetime :modified_datetime, default: -> { "CURRENT_TIMESTAMP" } t.datetime :modified_datetime, default: -> { "CURRENT_TIMESTAMP" }

View file

@ -1,7 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
ActiveRecord::Schema.define do ActiveRecord::Schema.define do
execute "drop table test_oracle_defaults" rescue nil execute "drop table test_oracle_defaults" rescue nil
execute "drop sequence test_oracle_defaults_seq" rescue nil execute "drop sequence test_oracle_defaults_seq" rescue nil
execute "drop sequence companies_nonstd_seq" rescue nil execute "drop sequence companies_nonstd_seq" rescue nil
@ -38,5 +37,4 @@ create sequence test_oracle_defaults_seq minvalue 10000
) )
SQL SQL
execute "create sequence defaults_seq minvalue 10000" execute "create sequence defaults_seq minvalue 10000"
end end

View file

@ -1,7 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
ActiveRecord::Schema.define do ActiveRecord::Schema.define do
enable_extension!("uuid-ossp", ActiveRecord::Base.connection) enable_extension!("uuid-ossp", ActiveRecord::Base.connection)
enable_extension!("pgcrypto", ActiveRecord::Base.connection) if ActiveRecord::Base.connection.supports_pgcrypto_uuid? enable_extension!("pgcrypto", ActiveRecord::Base.connection) if ActiveRecord::Base.connection.supports_pgcrypto_uuid?

View file

@ -258,7 +258,6 @@ module Rails
namespaces = Hash[subclasses.map { |klass| [klass.namespace, klass] }] namespaces = Hash[subclasses.map { |klass| [klass.namespace, klass] }]
lookups.each do |namespace| lookups.each do |namespace|
klass = namespaces[namespace] klass = namespaces[namespace]
return klass if klass return klass if klass
end end

View file

@ -1,7 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
namespace :log do namespace :log do
## ##
# Truncates all/specified log files # Truncates all/specified log files
# ENV['LOGS'] # ENV['LOGS']

View file

@ -570,7 +570,6 @@ YAML
get("/arunagw") get("/arunagw")
assert_equal "arunagw", last_response.body assert_equal "arunagw", last_response.body
end end
test "it provides routes as default endpoint" do test "it provides routes as default endpoint" do