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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 34605df1d8b821fe083d88b8caa07a3ea222562b..dc2a33a35b05d863e828a7afd5649ec8461534b4 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,12 +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-minitest
   - rubocop-performance
   - rubocop-rails

+  - rubocop-rake

 
 AllCops:
 
 AllCops:

-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
+  NewCops: enable

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


@@ -36,7 +40,6 @@ Metrics/ModuleLength:
 Naming/FileName:
   Exclude:
     - 'script/deliver-message'
 Naming/FileName:
   Exclude:
     - 'script/deliver-message'

-    - 'script/locale/reload-languages'

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


@@ -54,7 +57,7 @@ Rails/HasManyOrHasOneDependent:
 Rails/HttpPositionalArguments:
   Enabled: false
 
 Rails/HttpPositionalArguments:
   Enabled: false
 

-Rails/InverseOf:
+Rails/ReflectionClassName:

   Enabled: false
 
 Rails/SkipsModelValidations:
   Enabled: false
 
 Rails/SkipsModelValidations:


@@ -66,7 +69,8 @@ Style/Documentation:
   Enabled: false
 
 Style/FormatStringToken:
   Enabled: false
 
 Style/FormatStringToken:

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

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