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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 1931eb55ff73af4121df66e05b96f90b383f0c4f..f8060f9484cc72939fd84e9ac2f94a98804468b4 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,13 +1,15 @@
 inherit_from: .rubocop_todo.yml
 
 require:
 inherit_from: .rubocop_todo.yml
 
 require:

+  - rubocop-capybara
+  - rubocop-factory_bot

   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
   - rubocop-rake
 
 AllCops:
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
   - rubocop-rake
 
 AllCops:

-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0

   NewCops: enable
   Exclude:
     - 'vendor/**/*'
   NewCops: enable
   Exclude:
     - 'vendor/**/*'


@@ -15,6 +17,11 @@ AllCops:
 Rails:
   Enabled: true
 
 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
 
 Layout/ExtraSpacing:
   AllowForAlignment: true
 


@@ -55,7 +62,7 @@ Rails/HasManyOrHasOneDependent:
 Rails/HttpPositionalArguments:
   Enabled: false
 
 Rails/HttpPositionalArguments:
   Enabled: false
 

-Rails/InverseOf:
+Rails/ReflectionClassName:

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