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 f989d393d21b145266974809a700885a9834f15e..cfff8c43e2cd9459cb02f157d9bf5adf2f633db6 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,79 +1,88 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # This configuration was generated by
 # `rubocop --auto-gen-config`

-# on 2018-09-19 14:24:02 +0100 using RuboCop version 0.58.2.
+# 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: 32
+# 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: 250
+
+# Offense count: 36

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

+    - 'app/controllers/api/traces_controller.rb'
+    - 'app/controllers/api/user_preferences_controller.rb'

     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'

-    - 'app/controllers/api/traces_controller.rb'

     - 'app/controllers/traces_controller.rb'
     - 'app/controllers/users_controller.rb'
     - 'app/controllers/traces_controller.rb'
     - 'app/controllers/users_controller.rb'

-    - 'app/controllers/api/user_preferences_controller.rb'

     - 'app/helpers/application_helper.rb'
     - 'app/helpers/application_helper.rb'

-    - 'app/helpers/browse_helper.rb'

     - 'app/helpers/browse_tags_helper.rb'
     - 'app/helpers/browse_tags_helper.rb'

+    - 'app/mailers/user_mailer.rb'

     - 'app/models/client_application.rb'
     - 'app/models/client_application.rb'

-    - 'app/mailers/notifier.rb'

     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'
 

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

 Metrics/AbcSize:
 Metrics/AbcSize:

-  Max: 283
+  Max: 194

 
 

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

 # ExcludedMethods: refine
 Metrics/BlockLength:
 # ExcludedMethods: refine
 Metrics/BlockLength:

-  Max: 262
+  Max: 71

 
 

-# Offense count: 11
+# Offense count: 15

 # Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
   Max: 5
 
 # Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
   Max: 5
 

-# Offense count: 63
-# Configuration parameters: CountComments.
+# Offense count: 25
+# Configuration parameters: CountComments, CountAsOne.

 Metrics/ClassLength:
 Metrics/ClassLength:

-  Max: 1627
+  Max: 643

 
 

-# Offense count: 72
+# Offense count: 68
+# Configuration parameters: IgnoredMethods.

 Metrics/CyclomaticComplexity:
 Metrics/CyclomaticComplexity:

-  Max: 23
+  Max: 26

 
 

-# Offense count: 691
-# Configuration parameters: CountComments.
+# 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: 135
-

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

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

 Metrics/PerceivedComplexity:
 Metrics/PerceivedComplexity:

-  Max: 25
+  Max: 26
+
+# Offense count: 540
+Minitest/MultipleAssertions:
+  Max: 81

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


@@ -85,10 +94,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:


@@ -100,30 +109,16 @@ Naming/PredicateName:
     - 'app/models/user.rb'
     - 'lib/classic_pagination/pagination.rb'
 
     - 'app/models/user.rb'
     - 'lib/classic_pagination/pagination.rb'
 

-# Disabled pending merge of fix for:
-# https://github.com/rubocop-hq/rubocop/issues/6943
-Rails/ActiveRecordOverride:
-  Enabled: false
-
-# Offense count: 6
+# Offense count: 5

 # 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'
 

-# Offense count: 2
-# Configuration parameters: Include.
-# Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb
-Rails/Exit:
-  Exclude:
-    - 'lib/**/*.rake'
-    - 'lib/daemons/gpx_import.rb'
-

 # Offense count: 2
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 # Offense count: 2
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb


@@ -132,6 +127,13 @@ Rails/HasAndBelongsToMany:
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 

+# Offense count: 4
+# Configuration parameters: Include.
+# Include: app/helpers/**/*.rb
+Rails/HelperInstanceVariable:
+  Exclude:
+    - 'app/helpers/title_helper.rb'
+

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


@@ -143,57 +145,51 @@ 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: 20
+# Offense count: 19

 Rails/OutputSafety:
   Exclude:
     - 'app/controllers/users_controller.rb'
     - 'app/helpers/application_helper.rb'
 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'
-    - 'app/helpers/user_roles_helper.rb'

     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 

-# Offense count: 86
+# Offense count: 95
+# Cop supports --auto-correct.

 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 
 # 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: 230
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 462
+# Offense count: 572

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

-# SupportedStyles: when_needed, 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: 3080
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 1073
+# 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