mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Re-enable `Layout/SpaceAroundOperators` cop 

We prefer space around operators, but `Layout/SpaceAroundOperators` cop
was temporarily disabled in #36943 since that cop changed to check
alignment strictly somehow.

In RuboCop 1.0.0, that is fixed by https://github.com/rubocop-hq/rubocop/pull/8906.

Related https://github.com/rails/rails/pull/38034#discussion_r359845661,
https://github.com/rails/rails/pull/39770#discussion_r448829561.
This commit is contained in:
Ryuta Kamizono 2020-10-22 16:12:38 +09:00
parent 7eb855bfbc
commit 92ff708476
8 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.rubocop.yml
View File

@ -119,6 +119,9 @@ Layout/SpaceAroundEqualsInParameterDefault:
Layout/SpaceAroundKeyword:
Enabled: true
Layout/SpaceAroundOperators:
Enabled: true
Layout/SpaceBeforeComma:
Enabled: true

31
Gemfile.lock
View File

@ -370,7 +370,7 @@ GEM
mini_portile2 (~> 2.4.0)
os (1.1.1)
parallel (1.19.2)
parser (2.7.1.4)
parser (2.7.2.0)
ast (~> 2.4.1)
path_expander (1.1.0)
pg (1.2.3)
@ -410,7 +410,7 @@ GEM
rdoc (6.2.1)
redcarpet (3.2.3)
redis (4.2.2)
regexp_parser (1.7.1)
regexp_parser (1.8.2)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
@ -429,25 +429,26 @@ GEM
retriable (3.1.2)
rexml (3.2.4)
rouge (3.20.0)
rubocop (0.90.0)
rubocop (1.0.0)
parallel (~> 1.10)
parser (>= 2.7.1.1)
parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7)
regexp_parser (>= 1.8)
rexml
rubocop-ast (>= 0.3.0, < 1.0)
rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.3.0)
parser (>= 2.7.1.4)
rubocop-packaging (0.4.0)
rubocop (~> 0.89)
rubocop-performance (1.6.1)
rubocop (>= 0.71.0)
rubocop-rails (2.5.2)
activesupport
rubocop-ast (1.0.1)
parser (>= 2.7.1.5)
rubocop-packaging (0.5.1)
rubocop (>= 0.89, < 2.0)
rubocop-performance (1.8.1)
rubocop (>= 0.87.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.8.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 0.72.0)
rubocop (>= 0.87.0)
ruby-progressbar (1.10.1)
ruby-vips (2.0.17)
ffi (~> 1.9)

2
activemodel/lib/active_model/type/helpers/time_value.rb
View File

@ -75,7 +75,7 @@ module ActiveModel
usec = $7.to_i
usec_len = $7&.length
if usec_len&.< 6
usec *= 10 ** (6 - usec_len)
usec *= 10**(6 - usec_len)
end
if $8

6
activerecord/test/cases/database_configurations_test.rb
View File

@ -57,13 +57,13 @@ class DatabaseConfigurationsTest < ActiveRecord::TestCase
def test_find_db_config_returns_first_config_for_env
config = ActiveRecord::DatabaseConfigurations.new({
"test" => {
"config_1"=> {
"config_1" => {
"database" => "db"
},
"config_2"=> {
"config_2" => {
"database" => "db"
},
"config_3"=> {
"config_3" => {
"database" => "db"
},
}