Merge remote-tracking branch 'upstream/pull/2948' into master

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 66942d6a47c1c01168ab854b187dea49eb2c2caf..cfff8c43e2cd9459cb02f157d9bf5adf2f633db6 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # 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
@@ -18,7 +18,7 @@ require:
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 370
+  Max: 250
 
 # Offense count: 36
 # Configuration parameters: AllowSafeAssignment.
@@ -33,19 +33,19 @@ Lint/AssignmentInCondition:
     - 'app/controllers/users_controller.rb'
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_tags_helper.rb'
-    - 'app/mailers/notifier.rb'
+    - 'app/mailers/user_mailer.rb'
     - 'app/models/client_application.rb'
     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
-# Offense count: 739
+# Offense count: 682
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
-  Max: 189
+  Max: 194
 
 # Offense count: 72
-# Configuration parameters: CountComments, ExcludedMethods.
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
   Max: 71
@@ -56,17 +56,17 @@ Metrics/BlockNesting:
   Max: 5
 
 # Offense count: 25
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 645
+  Max: 643
 
 # Offense count: 68
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 28
+  Max: 26
 
 # Offense count: 735
-# Configuration parameters: CountComments, ExcludedMethods.
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
 Metrics/MethodLength:
   Max: 179
 
@@ -75,10 +75,14 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 9
 
-# Offense count: 73
+# Offense count: 69
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 25
+  Max: 26
+
+# Offense count: 540
+Minitest/MultipleAssertions:
+  Max: 81
 
 # Offense count: 6
 Naming/AccessorMethodName:
@@ -146,11 +150,6 @@ Rails/OutputSafety:
   Exclude:
     - 'app/controllers/users_controller.rb'
     - 'app/helpers/application_helper.rb'
-    - 'app/helpers/changesets_helper.rb'
-    - 'app/helpers/geocoder_helper.rb'
-    - 'app/helpers/note_helper.rb'
-    - 'app/helpers/open_graph_helper.rb'
-    - 'app/helpers/user_blocks_helper.rb'
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 
@@ -173,3 +172,24 @@ Style/FrozenStringLiteralComment:
 # 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