Merge remote-tracking branch 'upstream/pull/5391'

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 77f26d863bf5b41a23ea4ca47540ab36eb21ff7c..60d14454437c10c9b2e5f46fe609d619e8c6a44f 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,11 +1,16 @@
 inherit_from: .rubocop_todo.yml
 
 require:
 inherit_from: .rubocop_todo.yml
 
 require:

+  - rubocop-capybara
+  - rubocop-factory_bot
+  - rubocop-minitest

   - rubocop-performance
   - rubocop-rails
   - rubocop-performance
   - rubocop-rails

+  - rubocop-rake

 
 AllCops:
 
 AllCops:

-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.1
+  NewCops: enable

   Exclude:
     - 'vendor/**/*'
 
   Exclude:
     - 'vendor/**/*'
 


@@ -35,15 +40,21 @@ Metrics/ModuleLength:
 Naming/FileName:
   Exclude:
     - 'script/deliver-message'
 Naming/FileName:
   Exclude:
     - 'script/deliver-message'

-    - 'script/locale/reload-languages'

     - 'script/update-spam-blocks'
 
 Naming/MethodParameterName:
   Enabled: false
 
     - 'script/update-spam-blocks'
 
 Naming/MethodParameterName:
   Enabled: false
 

+# This conflicts with Strong Migrations, which can't check `change_table`
+Rails/BulkChangeTable:
+  Enabled: false
+

 Rails/CreateTableWithTimestamps:
   Enabled: false
 
 Rails/CreateTableWithTimestamps:
   Enabled: false
 

+Rails/FindBy:
+  IgnoreWhereFirst: false
+

 Rails/FindEach:
   Enabled: false
 
 Rails/FindEach:
   Enabled: false
 


@@ -53,22 +64,20 @@ Rails/HasManyOrHasOneDependent:
 Rails/HttpPositionalArguments:
   Enabled: false
 
 Rails/HttpPositionalArguments:
   Enabled: false
 

-Rails/InverseOf:
+Rails/ReflectionClassName:

   Enabled: false
 
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/*.rb'
   Enabled: false
 
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/*.rb'

-    - 'app/controllers/users_controller.rb'
-
-Style/BracesAroundHashParameters:
-  EnforcedStyle: context_dependent
+    - 'app/controllers/users/lists_controller.rb'

 
 Style/Documentation:
   Enabled: false
 
 Style/FormatStringToken:
 
 Style/Documentation:
   Enabled: false
 
 Style/FormatStringToken:

-  EnforcedStyle: template
+  Exclude:
+    - 'config/routes.rb'

 
 Style/IfInsideElse:
   Enabled: false
 
 Style/IfInsideElse:
   Enabled: false


@@ -76,12 +85,21 @@ Style/IfInsideElse:
 Style/GuardClause:
   Enabled: false
 
 Style/GuardClause:
   Enabled: false
 

+Style/HashEachMethods:
+  Enabled: true
+

 Style/HashSyntax:
   EnforcedStyle: hash_rockets
   Exclude:
     - 'lib/tasks/testing.rake'
     - 'config/initializers/wrap_parameters.rb'
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
   Exclude:
     - 'lib/tasks/testing.rake'
     - 'config/initializers/wrap_parameters.rb'
 

+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+

 Style/MixinUsage:
   Exclude:
     - 'bin/setup'
 Style/MixinUsage:
   Exclude:
     - 'bin/setup'