diff --git a/.rubocop.yml b/.rubocop.yml index 0c683dbb8..d1fee47c3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -56,13 +56,11 @@ Style/WordArray: { EnforcedStyle: brackets } # want to enable these, but they don't work right when using `.rubocop_todo.yml` Style/DocumentationMethod: { Enabled: false } Style/Documentation: { Enabled: false } - -I18n/GetText/DecorateString: - Exclude: - - linters/**/*.rb I18n/RailsI18n/DecorateString: Exclude: + - Rakefile - linters/**/*.rb + - spec/**/*.rb ################################################################################ # @@ -73,6 +71,7 @@ I18n/RailsI18n/DecorateString: Bundler/GemComment: { Enabled: false } Bundler/GemVersion: { Enabled: false } Capybara/AmbiguousClick: { Enabled: false } +I18n/GetText: { Enabled: false } Layout/SingleLineBlockChain: { Enabled: false } Lint/ConstantResolution: { Enabled: false } Rails/BulkChangeTable: { Enabled: false } diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index ba54c83aa..2cda5e987 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -12,31 +12,6 @@ Capybara/RSpec/NegationMatcherAfterVisit: - 'spec/system/account_setup_spec.rb' - 'spec/system/stories_index_spec.rb' -# Offense count: 5 -# This cop supports safe autocorrection (--autocorrect). -I18n/GetText/DecorateFunctionMessage: - Exclude: - - 'app/commands/cast_boolean.rb' - - 'app/models/user.rb' - - 'spec/support/matchers/change_all_records.rb' - - 'spec/support/matchers/change_record.rb' - - 'spec/support/matchers/invoke.rb' - -# Offense count: 4 -# This cop supports safe autocorrection (--autocorrect). -I18n/GetText/DecorateString: - Exclude: - - 'Rakefile' - - 'spec/rails_helper.rb' - - 'spec/system/login_spec.rb' - -# Offense count: 4 -I18n/RailsI18n/DecorateString: - Exclude: - - 'Rakefile' - - 'spec/rails_helper.rb' - - 'spec/system/login_spec.rb' - # Offense count: 6 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.