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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 1b63d25f2e56382a1e823ffebbf92871345b6f44..c1060cbe2338b3c6c95a2344417a527e0c67c465 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,128 +1,91 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # This configuration was generated by
 # `rubocop --auto-gen-config`

-# on 2016-07-13 09:47:52 +0100 using RuboCop version 0.41.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: 34
-Lint/AmbiguousOperator:
-  Exclude:
-    - 'test/controllers/amf_controller_test.rb'
-    - 'test/controllers/changeset_controller_test.rb'
-    - 'test/lib/bounding_box_test.rb'
-    - 'test/lib/country_test.rb'
+# Work around erblint issues.
+# https://github.com/openstreetmap/openstreetmap-website/issues/2472
+require:
+  - rubocop-minitest
+  - rubocop-performance
+  - rubocop-rails

 
 

-# Offense count: 115
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
+# Offense count: 568
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 250

 
 

-# Offense count: 29
+# 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/trace_controller.rb'
-    - 'app/controllers/user_controller.rb'
-    - 'app/controllers/user_preference_controller.rb'
+    - 'app/controllers/traces_controller.rb'
+    - 'app/controllers/users_controller.rb'

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

-    - 'app/helpers/browse_helper.rb'
+    - 'app/helpers/browse_tags_helper.rb'
+    - 'app/mailers/user_mailer.rb'

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

-    - 'app/models/notifier.rb'

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

-# Offense count: 5
-Lint/HandleExceptions:
-  Exclude:
-    - 'app/controllers/amf_controller.rb'
-    - 'app/controllers/user_controller.rb'
-    - 'config/initializers/session.rb'
-
-# Offense count: 616
+# Offense count: 682
+# Configuration parameters: IgnoredMethods.

 Metrics/AbcSize:
 Metrics/AbcSize:

-  Max: 277
+  Max: 194
+
+# Offense count: 72
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 71

 
 

-# Offense count: 11
+# Offense count: 15
+# Configuration parameters: CountBlocks.

 Metrics/BlockNesting:
   Max: 5
 
 Metrics/BlockNesting:
   Max: 5
 

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

 Metrics/ClassLength:
 Metrics/ClassLength:

-  Max: 1650
+  Max: 643

 
 

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

 Metrics/CyclomaticComplexity:
 Metrics/CyclomaticComplexity:

-  Max: 20
+  Max: 26

 
 

-# Offense count: 2485
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 962
-
-# Offense count: 596
-# Configuration parameters: CountComments.
+# Offense count: 735
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.

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

-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 131
-

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

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

 Metrics/PerceivedComplexity:
 Metrics/PerceivedComplexity:

-  Max: 23
-
-# 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
-Rails/HasAndBelongsToMany:
-  Exclude:
-    - 'app/models/changeset.rb'
-    - 'app/models/user.rb'
+  Max: 26

 
 

-# Offense count: 17
-Rails/OutputSafety:
-  Exclude:
-    - 'app/controllers/user_controller.rb'
-    - 'app/helpers/application_helper.rb'
-    - 'app/helpers/changeset_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'
-
-# Offense count: 65
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: strict, flexible
-Rails/TimeZone:
-  Enabled: false
+# Offense count: 540
+Minitest/MultipleAssertions:
+  Max: 81

 
 

-# Offense count: 5
-Style/AccessorMethodName:
+# Offense count: 6
+Naming/AccessorMethodName:

   Exclude:
     - 'app/controllers/application_controller.rb'
     - 'app/helpers/title_helper.rb'
   Exclude:
     - 'app/controllers/application_controller.rb'
     - 'app/helpers/title_helper.rb'


@@ -130,52 +93,13 @@ Style/AccessorMethodName:
     - 'lib/osm.rb'
     - 'lib/potlatch.rb'
 
     - 'lib/osm.rb'
     - 'lib/potlatch.rb'
 

-# Offense count: 1
-Style/AsciiComments:
-  Exclude:
-    - 'test/models/message_test.rb'
-
-# Offense count: 217
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 60
-# Cop supports --auto-correct.
-Style/LineEndConcatenation:
-  Exclude:
-    - 'db/migrate/008_remove_segments.rb'
-    - 'db/migrate/020_populate_node_tags_and_remove.rb'
-    - 'db/migrate/023_add_changesets.rb'
-    - 'lib/bounding_box.rb'
-    - 'lib/diff_reader.rb'
-    - 'lib/osm.rb'
-    - 'test/controllers/changeset_controller_test.rb'
-    - 'test/controllers/node_controller_test.rb'
-    - 'test/controllers/relation_controller_test.rb'
-    - 'test/controllers/way_controller_test.rb'
-
-# Offense count: 69
-# Cop supports --auto-correct.
-Style/NumericLiterals:
-  MinDigits: 11
-
-# Offense count: 38
-# Cop supports --auto-correct.
-Style/PerlBackrefs:
-  Exclude:
-    - 'app/controllers/amf_controller.rb'
-    - 'app/helpers/browse_helper.rb'
-    - 'config/initializers/paperclip.rb'
-    - 'lib/id.rb'
-    - 'lib/potlatch.rb'
-    - 'test/lib/i18n_test.rb'
-

 # Offense count: 8
 # Offense count: 8

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

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

-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-Style/PredicateName:
+# ForbiddenPrefixes: is_, has_, have_
+# AllowedMethods: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicateName:

   Exclude:
     - 'spec/**/*'
     - 'app/models/changeset.rb'
   Exclude:
     - 'spec/**/*'
     - 'app/models/changeset.rb'


@@ -185,27 +109,66 @@ Style/PredicateName:
     - 'app/models/user.rb'
     - 'lib/classic_pagination/pagination.rb'
 
     - 'app/models/user.rb'
     - 'lib/classic_pagination/pagination.rb'
 

-# Offense count: 97
+# Offense count: 5
+# Configuration parameters: Database, Include.
+# SupportedDatabases: mysql, postgresql
+# Include: db/migrate/*.rb
+Rails/BulkChangeTable:
+  Exclude:
+    - 'db/migrate/20111116184519_update_oauth.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/models/**/*.rb
+Rails/HasAndBelongsToMany:
+  Exclude:
+    - '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
+Rails/NotNullColumn:
+  Exclude:
+    - 'db/migrate/002_cleanup_osm_db.rb'
+    - 'db/migrate/020_populate_node_tags_and_remove.rb'
+    - 'db/migrate/021_move_to_innodb.rb'
+    - 'db/migrate/025_add_end_time_to_changesets.rb'
+    - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
+
+# Offense count: 19
+Rails/OutputSafety:
+  Exclude:
+    - 'app/controllers/users_controller.rb'
+    - 'app/helpers/application_helper.rb'
+    - 'lib/rich_text.rb'
+    - 'test/helpers/application_helper_test.rb'
+
+# Offense count: 95

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

-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: compact, exploded
-Style/RaiseArgs:
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: strict, flexible
+Rails/TimeZone:

   Enabled: false
 
   Enabled: false
 

-# Offense count: 2
+# Offense count: 572

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

-Style/RescueModifier:
-  Exclude:
-    - 'app/helpers/browse_helper.rb'
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Enabled: false

 
 

-# Offense count: 8
+# Offense count: 78

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

-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiteralsInInterpolation:
-  Exclude:
-    - 'app/controllers/amf_controller.rb'
-    - 'app/models/node.rb'
-    - 'app/models/way.rb'
-    - 'lib/migrate.rb'
-    - 'test/controllers/changeset_controller_test.rb'
+# Configuration parameters: Strict.
+Style/NumericLiterals:
+  MinDigits: 11