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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 66942d6a47c1c01168ab854b187dea49eb2c2caf..61109ddc9b7320ae231dd71692ff57edd3685265 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # This configuration was generated by
 # `rubocop --auto-gen-config`

-# on 2020-08-02 18:37:55 UTC using RuboCop version 0.86.0.
+# on 2020-09-02 06:16:56 UTC using RuboCop version 0.90.0.

 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new


@@ -39,13 +39,13 @@ Lint/AssignmentInCondition:
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
     - 'lib/osm.rb'
     - 'script/deliver-message'
 

-# Offense count: 739
+# Offense count: 682

 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:

-  Max: 189
+  Max: 194

 
 # Offense count: 72
 
 # Offense count: 72

-# Configuration parameters: CountComments, ExcludedMethods.
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.

 # ExcludedMethods: refine
 Metrics/BlockLength:
   Max: 71
 # ExcludedMethods: refine
 Metrics/BlockLength:
   Max: 71


@@ -56,17 +56,17 @@ Metrics/BlockNesting:
   Max: 5
 
 # Offense count: 25
   Max: 5
 
 # Offense count: 25

-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.

 Metrics/ClassLength:
 Metrics/ClassLength:

-  Max: 645
+  Max: 643

 
 # Offense count: 68
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
 
 # Offense count: 68
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:

-  Max: 28
+  Max: 26

 
 # Offense count: 735
 
 # Offense count: 735

-# Configuration parameters: CountComments, ExcludedMethods.
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.

 Metrics/MethodLength:
   Max: 179
 
 Metrics/MethodLength:
   Max: 179
 


@@ -75,10 +75,29 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 9
 
 Metrics/ParameterLists:
   Max: 9
 

-# Offense count: 73
+# Offense count: 69

 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:

-  Max: 25
+  Max: 26
+
+# Offense count: 540
+Minitest/MultipleAssertions:
+  Max: 81
+
+# Offense count: 26
+# Cop supports --auto-correct.
+Minitest/TestMethodName:
+  Exclude:
+    - 'test/abilities/api_capability_test.rb'
+    - 'test/controllers/api/nodes_controller_test.rb'
+    - 'test/controllers/api/old_nodes_controller_test.rb'
+    - 'test/controllers/api/relations_controller_test.rb'
+    - 'test/controllers/api/ways_controller_test.rb'
+    - 'test/helpers/browse_helper_test.rb'
+    - 'test/integration/client_applications_test.rb'
+    - 'test/integration/short_links_test.rb'
+    - 'test/integration/user_blocks_test.rb'
+    - 'test/integration/user_creation_test.rb'

 
 # Offense count: 6
 Naming/AccessorMethodName:
 
 # Offense count: 6
 Naming/AccessorMethodName:


@@ -130,6 +149,14 @@ Rails/HelperInstanceVariable:
   Exclude:
     - 'app/helpers/title_helper.rb'
 
   Exclude:
     - 'app/helpers/title_helper.rb'
 

+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: Include.
+# Include: app/mailers/**/*.rb
+Rails/MailerName:
+  Exclude:
+    - 'app/mailers/notifier.rb'
+

 # Offense count: 5
 # Configuration parameters: Include.
 # Include: db/migrate/*.rb
 # Offense count: 5
 # Configuration parameters: Include.
 # Include: db/migrate/*.rb


@@ -173,3 +200,24 @@ Style/FrozenStringLiteralComment:
 # Configuration parameters: Strict.
 Style/NumericLiterals:
   MinDigits: 11
 # Configuration parameters: Strict.
 Style/NumericLiterals:
   MinDigits: 11

+
+# Offense count: 20
+Style/OptionalBooleanParameter:
+  Exclude:
+    - 'app/controllers/api/notes_controller.rb'
+    - 'app/controllers/application_controller.rb'
+    - 'app/helpers/browse_helper.rb'
+    - 'app/models/changeset.rb'
+    - 'app/models/node.rb'
+    - 'app/models/relation.rb'
+    - 'app/models/trace.rb'
+    - 'app/models/tracepoint.rb'
+    - 'app/models/way.rb'
+    - 'test/models/diary_entry_test.rb'
+    - 'test/models/trace_test.rb'
+    - 'test/models/tracetag_test.rb'
+
+# Offense count: 28
+# Cop supports --auto-correct.
+Style/StringConcatenation:
+  Enabled: false