Fix rubocop Style/CombinableLoops warnings

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 57f876bd9cd53924d75faebf1f29c58d98002f52..2d638e1e144c35e27393fdf5e30873c1da1c5308 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,12 +1,26 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # This configuration was generated by
 # `rubocop --auto-gen-config`

-# on 2019-10-07 20:37:25 +0100 using RuboCop version 0.75.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
 # versions of RuboCop, may require this file to be generated again.
 
 # 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
 # versions of RuboCop, may require this file to be generated again.
 

-# Offense count: 34
+# Work around erblint issues.
+# https://github.com/openstreetmap/openstreetmap-website/issues/2472
+require:
+  - rubocop-minitest
+  - rubocop-performance
+  - rubocop-rails
+
+# Offense count: 568
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 370
+
+# Offense count: 36

 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:


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

-# Offense count: 4
-# Configuration parameters: AllowComments.
-Lint/HandleExceptions:
-  Exclude:
-    - 'app/controllers/api/amf_controller.rb'
-    - 'app/controllers/users_controller.rb'
-
-# Offense count: 700
+# Offense count: 682
+# Configuration parameters: IgnoredMethods.

 Metrics/AbcSize:
 Metrics/AbcSize:

-  Max: 189
+  Max: 194

 
 

-# Offense count: 39
-# Configuration parameters: CountComments, ExcludedMethods.
+# Offense count: 72
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.

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


@@ -48,32 +56,48 @@ 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: 73
+# Offense count: 68
+# Configuration parameters: IgnoredMethods.

 Metrics/CyclomaticComplexity:
 Metrics/CyclomaticComplexity:

-  Max: 22
+  Max: 26

 
 

-# Offense count: 721
-# Configuration parameters: CountComments, ExcludedMethods.
+# Offense count: 735
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.

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

-# Offense count: 2
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 107
-

 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 9
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 9
 

-# Offense count: 71
+# Offense count: 69
+# Configuration parameters: IgnoredMethods.

 Metrics/PerceivedComplexity:
 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:


@@ -85,10 +109,10 @@ Naming/AccessorMethodName:
     - 'lib/potlatch.rb'
 
 # Offense count: 8
     - 'lib/potlatch.rb'
 
 # Offense count: 8

-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.

 # NamePrefix: is_, has_, have_
 # NamePrefix: is_, has_, have_

-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
+# ForbiddenPrefixes: is_, has_, have_
+# AllowedMethods: is_a?

 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:
 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:


@@ -101,21 +125,12 @@ Naming/PredicateName:
     - 'lib/classic_pagination/pagination.rb'
 
 # Offense count: 5
     - 'lib/classic_pagination/pagination.rb'
 
 # Offense count: 5

-# Cop supports --auto-correct.
-Performance/RegexpMatch:
-  Exclude:
-    - 'app/helpers/browse_tags_helper.rb'
-    - 'app/validators/characters_validator.rb'
-    - 'app/validators/whitespace_validator.rb'
-
-# Offense count: 6

 # Configuration parameters: Database, Include.
 # SupportedDatabases: mysql, postgresql
 # Include: db/migrate/*.rb
 Rails/BulkChangeTable:
   Exclude:
     - 'db/migrate/20111116184519_update_oauth.rb'
 # Configuration parameters: Database, Include.
 # SupportedDatabases: mysql, postgresql
 # Include: db/migrate/*.rb
 Rails/BulkChangeTable:
   Exclude:
     - 'db/migrate/20111116184519_update_oauth.rb'

-    - 'db/migrate/20120208122334_merge_acl_address_and_mask.rb'

     - 'db/migrate/20120208194454_add_domain_to_acl.rb'
     - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
 
     - 'db/migrate/20120208194454_add_domain_to_acl.rb'
     - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
 


@@ -127,14 +142,20 @@ Rails/HasAndBelongsToMany:
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 

-# Offense count: 11
+# Offense count: 4

 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
   Exclude:
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
   Exclude:

-    - 'app/helpers/application_helper.rb'

     - 'app/helpers/title_helper.rb'
     - 'app/helpers/title_helper.rb'

-    - 'app/helpers/trace_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.
 
 # Offense count: 5
 # Configuration parameters: Include.


@@ -147,7 +168,7 @@ Rails/NotNullColumn:
     - 'db/migrate/025_add_end_time_to_changesets.rb'
     - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
 
     - 'db/migrate/025_add_end_time_to_changesets.rb'
     - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
 

-# Offense count: 18
+# Offense count: 19

 Rails/OutputSafety:
   Exclude:
     - 'app/controllers/users_controller.rb'
 Rails/OutputSafety:
   Exclude:
     - 'app/controllers/users_controller.rb'


@@ -160,58 +181,53 @@ Rails/OutputSafety:
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 

-# Offense count: 94
+# Offense count: 95

 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 

-# Offense count: 1
-# Configuration parameters: AllowedChars.
-Style/AsciiComments:
-  Exclude:
-    - 'test/models/message_test.rb'
-
-# Offense count: 263
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 27
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: annotated, template, unannotated
-Style/FormatStringToken:
-  Exclude:
-    - 'app/models/concerns/geo_record.rb'
-    - 'app/views/api/map/_bounds.xml.builder'
-    - 'lib/bounding_box.rb'
-    - 'test/controllers/api/map_controller_test.rb'
-    - 'test/controllers/api/relations_controller_test.rb'
-    - 'test/controllers/api/ways_controller_test.rb'
-    - 'test/lib/bounding_box_test.rb'
-
-# Offense count: 539
+# Offense count: 572

 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.

-# SupportedStyles: always, never
+# SupportedStyles: always, always_true, never

 Style/FrozenStringLiteralComment:
   Enabled: false
 
 Style/FrozenStringLiteralComment:
   Enabled: false
 

-# Offense count: 2
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'app/controllers/api/ways_controller.rb'
-
-# Offense count: 70
+# Offense count: 78

 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:
   MinDigits: 11
 
 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:
   MinDigits: 11
 

-# Offense count: 3330
+# 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: 6
+# Configuration parameters: AllowModifier.
+Style/SoleNestedConditional:
+  Exclude:
+    - 'app/controllers/user_blocks_controller.rb'
+    - 'app/models/old_way.rb'
+    - 'app/validators/characters_validator.rb'
+    - 'app/validators/whitespace_validator.rb'
+    - 'lib/classic_pagination/pagination.rb'
+
+# Offense count: 28

 # Cop supports --auto-correct.
 # Cop supports --auto-correct.

-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 307
+Style/StringConcatenation:
+  Enabled: false