Resolve some extra-long lines

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6bff1b0983e5ce98b6e025814a2c6c1b5f3ad2b9..e983c51c64fed85fe13a3ed4c69bd605da32e884 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,114 +1,105 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # This configuration was generated by
 # `rubocop --auto-gen-config`

-# on 2017-10-05 10:04:24 +0100 using RuboCop version 0.50.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: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: aligned, indented
-Layout/MultilineOperationIndentation:
-  Exclude:
-    - 'lib/bounding_box.rb'
-
-# 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: 124
-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: 32
+# 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/traces_controller.rb'
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'
     - 'app/controllers/traces_controller.rb'

-    - 'app/controllers/user_controller.rb'
-    - 'app/controllers/user_preferences_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: 4
-Lint/HandleExceptions:
-  Exclude:
-    - 'app/controllers/amf_controller.rb'
-    - 'app/controllers/user_controller.rb'
-
-# Offense count: 3
-Lint/InterpolationCheck:
-  Exclude:
-    - 'test/controllers/node_controller_test.rb'
-
-# Offense count: 2
-Lint/ShadowingOuterLocalVariable:
-  Exclude:
-    - 'app/views/changeset/list.atom.builder'
-
-# Offense count: 666
+# Offense count: 682
+# Configuration parameters: IgnoredMethods.

 Metrics/AbcSize:
 Metrics/AbcSize:

-  Max: 280
+  Max: 194

 
 

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

 Metrics/BlockLength:
 Metrics/BlockLength:

-  Max: 240
+  Max: 71

 
 

-# Offense count: 12
+# 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: 1797
+  Max: 643

 
 

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

 Metrics/CyclomaticComplexity:
 Metrics/CyclomaticComplexity:

-  Max: 20
-
-# Offense count: 3004
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 1073
+  Max: 26

 
 

-# Offense count: 675
-# 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: 147
-

 # 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: 23
+  Max: 26

 
 

-# Offense count: 5
+# 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:
   Exclude:
     - 'app/controllers/application_controller.rb'
 Naming/AccessorMethodName:
   Exclude:
     - 'app/controllers/application_controller.rb'


@@ -118,10 +109,11 @@ Naming/AccessorMethodName:
     - 'lib/potlatch.rb'
 
 # Offense count: 8
     - 'lib/potlatch.rb'
 
 # 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?
+# ForbiddenPrefixes: is_, has_, have_
+# AllowedMethods: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method

 Naming/PredicateName:
   Exclude:
     - 'spec/**/*'
 Naming/PredicateName:
   Exclude:
     - 'spec/**/*'


@@ -132,13 +124,15 @@ Naming/PredicateName:
     - 'app/models/user.rb'
     - 'lib/classic_pagination/pagination.rb'
 
     - 'app/models/user.rb'
     - 'lib/classic_pagination/pagination.rb'
 

-# Offense count: 2
-# Configuration parameters: Include.
-# Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb
-Rails/Exit:
+# Offense count: 5
+# Configuration parameters: Database, Include.
+# SupportedDatabases: mysql, postgresql
+# Include: db/migrate/*.rb
+Rails/BulkChangeTable:

   Exclude:
   Exclude:

-    - 'lib/**/*.rake'
-    - 'lib/daemons/gpx_import.rb'
+    - '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.
 
 # Offense count: 2
 # Configuration parameters: Include.


@@ -148,6 +142,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


@@ -159,71 +160,54 @@ 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:
 Rails/OutputSafety:
   Exclude:

-    - 'app/controllers/user_controller.rb'
+    - 'app/controllers/users_controller.rb'

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

-    - 'app/helpers/changeset_helper.rb'
+    - 'app/helpers/changesets_helper.rb'

     - 'app/helpers/geocoder_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_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
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Offense count: 95
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.

 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 

-# Offense count: 1
-Style/AsciiComments:
-  Exclude:
-    - 'test/models/message_test.rb'
-
-# Offense count: 219
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: MaxLineLength.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'app/controllers/way_controller.rb'
-
-# Offense count: 60
+# Offense count: 572

 # Cop supports --auto-correct.
 # 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'
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Enabled: false

 
 

-# Offense count: 75
+# 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: 95
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: compact, exploded
-Style/RaiseArgs:
-  Enabled: false
-
-# Offense count: 2
-Style/RescueStandardError:
+# Offense count: 20
+Style/OptionalBooleanParameter:

   Exclude:
   Exclude:

+    - 'app/controllers/api/notes_controller.rb'
+    - 'app/controllers/application_controller.rb'

     - 'app/helpers/browse_helper.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