diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 32514771c..0a7edc2a5 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2021-06-29 17:25:37 UTC using RuboCop version 1.18.0. +# on 2021-09-14 19:29:59 UTC using RuboCop version 1.21.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 @@ -14,13 +14,26 @@ require: - rubocop-rails - rubocop-rake -# Offense count: 510 +# Offense count: 524 # Cop supports --auto-correct. -# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. +# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. # URISchemes: http, https Layout/LineLength: Max: 270 +# Offense count: 62 +# Cop supports --auto-correct. +Lint/AmbiguousOperatorPrecedence: + Exclude: + - 'app/controllers/geocoder_controller.rb' + - 'app/models/user.rb' + - 'lib/bounding_box.rb' + - 'lib/osm.rb' + - 'lib/rich_text.rb' + - 'lib/short_link.rb' + - 'test/controllers/api/old_nodes_controller_test.rb' + - 'test/lib/short_link_test.rb' + # Offense count: 34 # Configuration parameters: AllowSafeAssignment. Lint/AssignmentInCondition: @@ -50,12 +63,12 @@ Lint/DuplicateBranch: - 'app/helpers/browse_tags_helper.rb' - 'lib/password_hash.rb' -# Offense count: 631 +# Offense count: 643 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes. Metrics/AbcSize: - Max: 235 + Max: 189 -# Offense count: 68 +# Offense count: 69 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods. # IgnoredMethods: refine Metrics/BlockLength: @@ -69,14 +82,14 @@ Metrics/BlockNesting: # Offense count: 25 # Configuration parameters: CountComments, CountAsOne. Metrics/ClassLength: - Max: 361 + Max: 337 -# Offense count: 56 +# Offense count: 58 # Configuration parameters: IgnoredMethods. Metrics/CyclomaticComplexity: Max: 25 -# Offense count: 703 +# Offense count: 716 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods. Metrics/MethodLength: Max: 179 @@ -86,37 +99,22 @@ Metrics/MethodLength: Metrics/ParameterLists: Max: 6 -# Offense count: 60 +# Offense count: 62 # Configuration parameters: IgnoredMethods. Metrics/PerceivedComplexity: Max: 26 -# Offense count: 519 +# Offense count: 528 Minitest/MultipleAssertions: - Max: 88 + Max: 54 -# Offense count: 4 +# Offense count: 3 Naming/AccessorMethodName: Exclude: - 'app/controllers/application_controller.rb' - 'app/helpers/title_helper.rb' - 'lib/osm.rb' -# Offense count: 21 -# Configuration parameters: CheckIdentifiers, CheckConstants, CheckVariables, CheckStrings, CheckSymbols, CheckComments, CheckFilepaths, FlaggedTerms. -Naming/InclusiveLanguage: - Exclude: - - 'app/controllers/sessions_controller.rb' - - 'app/controllers/users_controller.rb' - - 'app/helpers/browse_tags_helper.rb' - - 'app/views/api/capabilities/show.builder' - - 'app/views/confirmations/_resend_success_flash.html.erb' - - 'app/views/users/suspended.html.erb' - - 'config/environments/production.rb' - - 'config/initializers/canonical_rails.rb' - - 'config/initializers/config.rb' - - 'config/initializers/doorkeeper.rb' - # Offense count: 8 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros. # NamePrefix: is_, has_, have_ @@ -142,6 +140,12 @@ Rails/BulkChangeTable: - 'db/migrate/20120208194454_add_domain_to_acl.rb' - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb' +# Offense count: 43 +# Cop supports --auto-correct. +Rails/ContentTag: + Exclude: + - 'test/lib/locale_test.rb' + # Offense count: 2 # Configuration parameters: Include. # Include: app/models/**/*.rb @@ -200,7 +204,7 @@ Rake/Desc: - 'lib/tasks/subscribe_diary_authors.rake' - 'lib/tasks/subscribe_old_changesets.rake' -# Offense count: 597 +# Offense count: 602 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. # SupportedStyles: always, always_true, never diff --git a/app/helpers/open_graph_helper.rb b/app/helpers/open_graph_helper.rb index 99b8d00a3..a91457645 100644 --- a/app/helpers/open_graph_helper.rb +++ b/app/helpers/open_graph_helper.rb @@ -11,7 +11,7 @@ module OpenGraphHelper } safe_join(tags.map do |property, content| - tag(:meta, :property => property, :content => content) + tag.meta(:property => property, :content => content) end, "\n") end end diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb index 15231f4d0..c7516a51c 100644 --- a/app/helpers/user_roles_helper.rb +++ b/app/helpers/user_roles_helper.rb @@ -25,7 +25,7 @@ module UserRolesHelper end if image - svg_icon = tag("source", :srcset => image_path("#{image}.svg"), :type => "image/svg+xml") + svg_icon = tag.source(:srcset => image_path("#{image}.svg"), :type => "image/svg+xml") png_icon = image_tag("#{image}.png", :srcset => image_path("#{image}.svg"), :size => "20x20", :border => 0, :alt => alt, :title => title) icon = tag.picture(svg_icon + png_icon) icon = link_to(icon, url, :method => :post, :confirm => confirm) if url diff --git a/test/helpers/user_roles_helper_test.rb b/test/helpers/user_roles_helper_test.rb index dfd790a0b..9c9d31e60 100644 --- a/test/helpers/user_roles_helper_test.rb +++ b/test/helpers/user_roles_helper_test.rb @@ -12,7 +12,7 @@ class UserRolesHelperTest < ActionView::TestCase icon = role_icon(create(:moderator_user), "moderator") expected = <<~HTML.delete("\n") - + This user is a moderator HTML @@ -27,7 +27,7 @@ class UserRolesHelperTest < ActionView::TestCase expected = <<~HTML.delete("\n") - + Grant moderator access @@ -39,7 +39,7 @@ class UserRolesHelperTest < ActionView::TestCase expected = <<~HTML.delete("\n") - + Revoke moderator access @@ -56,7 +56,7 @@ class UserRolesHelperTest < ActionView::TestCase icons = role_icons(create(:moderator_user)) expected = <<~HTML.delete("\n") - + This user is a moderator HTML @@ -65,11 +65,11 @@ class UserRolesHelperTest < ActionView::TestCase icons = role_icons(create(:super_user)) expected = <<~HTML.delete("\n") - + This user is an administrator - + This user is a moderator HTML @@ -84,13 +84,13 @@ class UserRolesHelperTest < ActionView::TestCase expected = <<~HTML.delete("\n") - + Grant administrator access - + Grant moderator access @@ -102,13 +102,13 @@ class UserRolesHelperTest < ActionView::TestCase expected = <<~HTML.delete("\n") - + Grant administrator access - + Revoke moderator access @@ -120,13 +120,13 @@ class UserRolesHelperTest < ActionView::TestCase expected = <<~HTML.delete("\n") - + Revoke administrator access - + Revoke moderator access