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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 1931eb55ff73af4121df66e05b96f90b383f0c4f..60d14454437c10c9b2e5f46fe609d619e8c6a44f 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.1

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


@@ -43,9 +45,16 @@ Naming/FileName:
 Naming/MethodParameterName:
   Enabled: false
 
 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
 


@@ -55,13 +64,13 @@ 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'
+    - 'app/controllers/users/lists_controller.rb'

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