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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 32a067c19da09d793f723e0511abd191ed08cbff..2e7bc2f5957977b7faf4c9801f439d1e4f6803dc 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,11 +1,10 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # This configuration was generated by
 # `rubocop --auto-gen-config`

-# on 2020-08-06 20:53:30 UTC using RuboCop version 0.89.0.
+# on 2022-02-23 19:11:04 UTC using RuboCop version 1.25.1.

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

-# versions of RuboCop, may require this file to be generated again.

 
 # Work around erblint issues.
 # https://github.com/openstreetmap/openstreetmap-website/issues/2472
 
 # Work around erblint issues.
 # https://github.com/openstreetmap/openstreetmap-website/issues/2472


@@ -13,18 +12,20 @@ require:
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails

+  - rubocop-rake

 
 

-# Offense count: 568
+# Offense count: 550

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

-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.

 # URISchemes: http, https
 Layout/LineLength:
 # URISchemes: http, https
 Layout/LineLength:

-  Max: 370
+  Max: 270

 
 

-# Offense count: 36
+# Offense count: 34

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

+    - 'app/controllers/accounts_controller.rb'

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


@@ -34,27 +35,20 @@ Lint/AssignmentInCondition:
     - 'app/controllers/users_controller.rb'
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_tags_helper.rb'
     - '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'
 
     - 'app/models/client_application.rb'
     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'
 

-# Offense count: 20
-Lint/MissingSuper:
-  Exclude:
-    - 'config/initializers/oauth.rb'
-    - 'lib/osm.rb'
-    - 'lib/session_persistence.rb'
-
-# Offense count: 682
-# Configuration parameters: IgnoredMethods.
+# Offense count: 665
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.

 Metrics/AbcSize:
 Metrics/AbcSize:

-  Max: 194
+  Max: 189

 
 

-# Offense count: 72
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
-# ExcludedMethods: refine
+# Offense count: 73
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# IgnoredMethods: refine

 Metrics/BlockLength:
   Max: 71
 
 Metrics/BlockLength:
   Max: 71
 


@@ -66,55 +60,36 @@ Metrics/BlockNesting:
 # Offense count: 25
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
 # Offense count: 25
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:

-  Max: 645
+  Max: 313

 
 

-# Offense count: 68
+# Offense count: 58

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

-  Max: 26
+  Max: 25

 
 

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

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

-# Offense count: 4
-# Configuration parameters: CountKeywordArgs.
+# Offense count: 1
+# Configuration parameters: CountKeywordArgs, MaxOptionalParameters.

 Metrics/ParameterLists:
 Metrics/ParameterLists:

-  Max: 9
+  Max: 6

 
 

-# Offense count: 69
+# Offense count: 59

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

-# Offense count: 540
+# Offense count: 550

 Minitest/MultipleAssertions:
 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'
+  Max: 52

 
 

-# Offense count: 6
+# Offense count: 1

 Naming/AccessorMethodName:
   Exclude:
 Naming/AccessorMethodName:
   Exclude:

-    - 'app/controllers/application_controller.rb'

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

-    - 'app/models/old_way.rb'
-    - 'lib/osm.rb'
-    - 'lib/potlatch.rb'

 
 # Offense count: 8
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 
 # Offense count: 8
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.


@@ -124,13 +99,7 @@ Naming/AccessorMethodName:
 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:
 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:

-    - 'spec/**/*'
-    - 'app/models/changeset.rb'
-    - 'app/models/old_node.rb'
-    - 'app/models/old_relation.rb'
-    - 'app/models/old_way.rb'

     - 'app/models/user.rb'
     - 'app/models/user.rb'

-    - 'lib/classic_pagination/pagination.rb'

 
 # Offense count: 5
 # Configuration parameters: Database, Include.
 
 # Offense count: 5
 # Configuration parameters: Database, Include.


@@ -150,20 +119,33 @@ Rails/HasAndBelongsToMany:
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 

-# Offense count: 4
+# Offense count: 3

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

-# Offense count: 1
-# Cop supports --auto-correct.
+# Offense count: 16
+# Configuration parameters: IgnoreScopes, Include.
+# Include: app/models/**/*.rb
+Rails/InverseOf:
+  Exclude:
+    - 'app/models/changeset.rb'
+    - 'app/models/diary_entry.rb'
+    - 'app/models/friendship.rb'
+    - 'app/models/issue.rb'
+    - 'app/models/message.rb'
+    - 'app/models/note.rb'
+    - 'app/models/user.rb'
+
+# Offense count: 2

 # Configuration parameters: Include.
 # Configuration parameters: Include.

-# Include: app/mailers/**/*.rb
-Rails/MailerName:
+# Include: app/controllers/**/*.rb
+Rails/LexicallyScopedActionFilter:

   Exclude:
   Exclude:

-    - 'app/mailers/notifier.rb'
+    - 'app/controllers/oauth2_applications_controller.rb'
+    - 'app/controllers/oauth2_authorizations_controller.rb'

 
 # Offense count: 5
 # Configuration parameters: Include.
 
 # Offense count: 5
 # Configuration parameters: Include.


@@ -176,65 +158,33 @@ 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: 19
+# Offense count: 9

 Rails/OutputSafety:
   Exclude:
 Rails/OutputSafety:
   Exclude:

+    - 'app/controllers/sessions_controller.rb'

     - 'app/controllers/users_controller.rb'
     - 'app/helpers/application_helper.rb'
     - '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'
 
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 

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

 # Offense count: 6
 # Cop supports --auto-correct.
 # Offense count: 6
 # Cop supports --auto-correct.

-Style/ExplicitBlockArgument:
+Rake/Desc:

   Exclude:
   Exclude:

-    - 'app/controllers/api/amf_controller.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/mailers/notifier.rb'
-    - 'test/integration/client_applications_test.rb'
+    - 'lib/tasks/auto_annotate_models.rake'
+    - 'lib/tasks/eslint.rake'
+    - 'lib/tasks/subscribe_diary_authors.rake'
+    - 'lib/tasks/subscribe_old_changesets.rake'

 
 

-# Offense count: 572
+# Offense count: 617

 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 

-# Offense count: 78
+# Offense count: 72

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

-# Configuration parameters: Strict.
+# Configuration parameters: Strict, AllowedNumbers.

 Style/NumericLiterals:
 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: 44
-# Cop supports --auto-correct.
-Style/StringConcatenation:
-  Enabled: false
+  MinDigits: 15