diff --git a/.rubocop.yml b/.rubocop.yml index 14ca2e2a..77fa7fa1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -6,6 +6,7 @@ AllCops: Exclude: - test/dummy/db/schema.rb - vendor/**/* + SuggestExtensions: false Bundler/OrderedGems: Enabled: true @@ -23,9 +24,6 @@ Style/DocumentationMethod: - app/**/*.rb - lib/**/*.rb -Style/StringLiterals: - EnforcedStyle: double_quotes - Style/SymbolArray: EnforcedStyle: brackets diff --git a/Gemfile.lock b/Gemfile.lock index 9c54817e..92651f4f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,7 +72,7 @@ GEM zeitwerk (~> 2.3) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - ast (2.4.1) + ast (2.4.2) builder (3.2.4) byebug (11.1.3) capybara (3.35.3) @@ -110,7 +110,7 @@ GEM mini_portile2 (~> 2.5.0) racc (~> 1.4) parallel (1.20.1) - parser (2.7.2.0) + parser (3.0.0.0) ast (~> 2.4.1) pry (0.13.1) coderay (~> 1.1) @@ -153,22 +153,22 @@ GEM thor (~> 1.0) rainbow (3.0.0) rake (13.0.3) - regexp_parser (2.0.3) + regexp_parser (2.1.1) rexml (3.2.4) - rubocop (1.4.2) + rubocop (1.12.0) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) + regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.1.1) + rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.2.0) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.4.1) parser (>= 2.7.1.5) - rubocop-shopify (1.0.7) - rubocop (~> 1.4) - ruby-progressbar (1.10.1) + rubocop-shopify (2.0.1) + rubocop (~> 1.11) + ruby-progressbar (1.11.0) rubyzip (2.3.0) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) @@ -184,7 +184,7 @@ GEM thor (1.1.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) - unicode-display_width (1.7.0) + unicode-display_width (2.0.0) webdrivers (4.6.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) diff --git a/app/models/maintenance_tasks/progress.rb b/app/models/maintenance_tasks/progress.rb index 11d7c6d1..20879db9 100644 --- a/app/models/maintenance_tasks/progress.rb +++ b/app/models/maintenance_tasks/progress.rb @@ -51,13 +51,13 @@ def text count = @run.tick_count total = @run.tick_total if !total? - "Processed #{pluralize(count, 'item')}." + "Processed #{pluralize(count, "item")}." elsif over_total? - "Processed #{pluralize(count, 'item')} (expected #{total})." + "Processed #{pluralize(count, "item")} (expected #{total})." else percentage = 100.0 * count / total - "Processed #{count} out of #{pluralize(total, 'item')} "\ + "Processed #{count} out of #{pluralize(total, "item")} "\ "(#{number_to_percentage(percentage, precision: 0)})." end end