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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 1c41c027a68b40d4e79fb07f081cd891ae31a731..f8060f9484cc72939fd84e9ac2f94a98804468b4 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,17 +1,27 @@
 inherit_from: .rubocop_todo.yml
 
 require:
+  - rubocop-capybara
+  - rubocop-factory_bot
+  - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
+  - rubocop-rake
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
+  NewCops: enable
   Exclude:
     - 'vendor/**/*'
 
 Rails:
   Enabled: true
 
+# Config can be removed after https://github.com/rubocop/rubocop-factory_bot/issues/53
+FactoryBot/AssociationStyle:
+  Include:
+    - 'test/factories/**/*'
+
 Layout/ExtraSpacing:
   AllowForAlignment: true
 
@@ -35,7 +45,6 @@ Metrics/ModuleLength:
 Naming/FileName:
   Exclude:
     - 'script/deliver-message'
-    - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 
 Naming/MethodParameterName:
@@ -53,7 +62,7 @@ Rails/HasManyOrHasOneDependent:
 Rails/HttpPositionalArguments:
   Enabled: false
 
-Rails/InverseOf:
+Rails/ReflectionClassName:
   Enabled: false
 
 Rails/SkipsModelValidations:
@@ -65,7 +74,8 @@ Style/Documentation:
   Enabled: false
 
 Style/FormatStringToken:
-  EnforcedStyle: template
+  Exclude:
+    - 'config/routes.rb'
 
 Style/IfInsideElse:
   Enabled: false