Merge branch 'pull/3164'

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 66942d6a47c1c01168ab854b187dea49eb2c2caf..5833a6e359fdc5745aa710e87ef3007ed95d9e52 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # This configuration was generated by
 # `rubocop --auto-gen-config`

-# on 2020-08-02 18:37:55 UTC using RuboCop version 0.86.0.
+# on 2021-01-11 19:00:54 UTC using RuboCop version 1.8.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
 # 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


@@ -13,12 +13,12 @@ require:
   - rubocop-performance
   - rubocop-rails
 
   - rubocop-performance
   - rubocop-rails
 

-# Offense count: 568
+# Offense count: 544

 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:

-  Max: 370
+  Max: 254

 
 # Offense count: 36
 # Configuration parameters: AllowSafeAssignment.
 
 # Offense count: 36
 # Configuration parameters: AllowSafeAssignment.


@@ -33,20 +33,30 @@ 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: 739
-# Configuration parameters: IgnoredMethods.
+# Offense count: 8
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
+Lint/DuplicateBranch:
+  Exclude:
+    - 'app/controllers/api_controller.rb'
+    - 'app/controllers/diary_entries_controller.rb'
+    - 'app/controllers/geocoder_controller.rb'
+    - 'app/helpers/browse_tags_helper.rb'
+    - 'lib/password_hash.rb'
+
+# Offense count: 487
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.

 Metrics/AbcSize:
 Metrics/AbcSize:

-  Max: 189
+  Max: 235

 
 

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

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


@@ -55,39 +65,41 @@ Metrics/BlockLength:
 Metrics/BlockNesting:
   Max: 5
 
 Metrics/BlockNesting:
   Max: 5
 

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

 Metrics/ClassLength:
 Metrics/ClassLength:

-  Max: 645
+  Max: 587

 
 

-# Offense count: 68
+# Offense count: 52

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

-  Max: 28
+  Max: 26

 
 

-# Offense count: 735
-# Configuration parameters: CountComments, ExcludedMethods.
+# Offense count: 553
+# 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: 73
+# Offense count: 56

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

-  Max: 25
+  Max: 26
+
+# Offense count: 365
+Minitest/MultipleAssertions:
+  Max: 97

 
 

-# Offense count: 6
+# Offense count: 4

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

-    - 'app/models/old_way.rb'

     - 'lib/osm.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.


@@ -97,7 +109,6 @@ 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/changeset.rb'
     - 'app/models/old_node.rb'
     - 'app/models/old_relation.rb'


@@ -123,7 +134,7 @@ 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:
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:


@@ -141,35 +152,31 @@ 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: 8

 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
+# Offense count: 80

 # 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: 572
+# Offense count: 558

 # 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: 54

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

-  MinDigits: 11
+  MinDigits: 15