Re-enable Layout/SpaceAroundOperators cop

We prefer space around operators, but `Layout/SpaceAroundOperators` cop was temporarily disabled in rails#36943 since that cop changed to check alignment strictly somehow. In RuboCop 1.0.0, that is fixed by rubocop/rubocop#8906. Related rails#38034 (comment), rails#39770 (comment).
kabelak · Oct 23, 2020 · 92ff708 · 92ff708
1 parent 7eb855b
commit 92ff708
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 30 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -119,6 +119,9 @@ Layout/SpaceAroundEqualsInParameterDefault:
 Layout/SpaceAroundKeyword:
   Enabled: true
 
+Layout/SpaceAroundOperators:
+  Enabled: true
+
 Layout/SpaceBeforeComma:
   Enabled: true
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -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)

diff --git a/actionpack/lib/action_dispatch/journey/gtg/builder.rb b/actionpack/lib/action_dispatch/journey/gtg/builder.rb
@@ -34,7 +34,7 @@ def transition_table
               from = state_id[s]
 
               if u.all? { |pos| pos == DUMMY }
-                to   = state_id[Object.new]
+                to = state_id[Object.new]
                 dtrans[from, to] = sym
                 dtrans.add_accepting(to)
 

diff --git a/actionpack/lib/action_dispatch/middleware/actionable_exceptions.rb b/actionpack/lib/action_dispatch/middleware/actionable_exceptions.rb
@@ -24,7 +24,7 @@ def call(env)
 
     private
       def actionable_request?(request)
-        request.get_header("action_dispatch.show_detailed_exceptions")  && request.post? && request.path == endpoint
+        request.get_header("action_dispatch.show_detailed_exceptions") && request.post? && request.path == endpoint
       end
 
       def redirect_to(location)

diff --git a/activemodel/lib/active_model/type/helpers/time_value.rb b/activemodel/lib/active_model/type/helpers/time_value.rb
@@ -75,7 +75,7 @@ def fast_string_to_time(string)
             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

diff --git a/activerecord/test/cases/connection_adapters/connection_handlers_sharding_db_test.rb b/activerecord/test/cases/connection_adapters/connection_handlers_sharding_db_test.rb
@@ -40,7 +40,7 @@ def test_establish_connection_using_3_levels_config
 
           config = {
             "default_env" => {
-              "primary"  => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" },
+              "primary" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" },
               "primary_shard_one" => { "adapter" => "sqlite3", "database" => "test/db/primary_shard_one.sqlite3" },
             }
           }
@@ -73,8 +73,8 @@ def test_establish_connection_using_3_levels_config_with_shards_and_replica
 
           config = {
             "default_env" => {
-              "primary"  => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" },
-              "primary_replica"  => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3", "replica" => true },
+              "primary" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" },
+              "primary_replica" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3", "replica" => true },
               "primary_shard_one" => { "adapter" => "sqlite3", "database" => "test/db/primary_shard_one.sqlite3" },
               "primary_shard_one_replica" => { "adapter" => "sqlite3", "database" => "test/db/primary_shard_one.sqlite3", "replica" => true }
             }
@@ -117,8 +117,8 @@ def test_switching_connections_via_handler
 
           config = {
             "default_env" => {
-              "primary"  => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" },
-              "primary_replica"  => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3", "replica" => true },
+              "primary" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" },
+              "primary_replica" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3", "replica" => true },
               "primary_shard_one" => { "adapter" => "sqlite3", "database" => "test/db/primary_shard_one.sqlite3" },
               "primary_shard_one_replica" => { "adapter" => "sqlite3", "database" => "test/db/primary_shard_one.sqlite3", "replica" => true }
             }
@@ -185,8 +185,8 @@ def test_retrieves_proper_connection_with_nested_connected_to
 
           config = {
             "default_env" => {
-              "primary"  => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" },
-              "primary_replica"  => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3", "replica" => true },
+              "primary" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" },
+              "primary_replica" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3", "replica" => true },
               "primary_shard_one" => { "adapter" => "sqlite3", "database" => "test/db/primary_shard_one.sqlite3" },
               "primary_shard_one_replica" => { "adapter" => "sqlite3", "database" => "test/db/primary_shard_one.sqlite3", "replica" => true }
             }

diff --git a/activerecord/test/cases/database_configurations_test.rb b/activerecord/test/cases/database_configurations_test.rb
@@ -57,13 +57,13 @@ def test_default_hash_returns_config_hash_from_default_env
   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"
           },
         }

diff --git a/activerecord/test/cases/tasks/database_tasks_test.rb b/activerecord/test/cases/tasks/database_tasks_test.rb
@@ -1291,7 +1291,7 @@ class DatabaseTasksCharsetTest < ActiveRecord::TestCase
     def test_charset_current
       old_configurations = ActiveRecord::Base.configurations
       configurations = {
-        "production"  => { "database" => "prod-db" }
+        "production" => { "database" => "prod-db" }
       }
 
       ActiveRecord::Base.configurations = configurations
@@ -1324,7 +1324,7 @@ class DatabaseTasksCollationTest < ActiveRecord::TestCase
     def test_collation_current
       old_configurations = ActiveRecord::Base.configurations
       configurations = {
-        "production"  => { "database" => "prod-db" }
+        "production" => { "database" => "prod-db" }
       }
 
       ActiveRecord::Base.configurations = configurations