Enable all new cops and autocorrect

sferik · sferik · commit 4480718bb9d9 · 2023-12-26T08:10:40.000-08:00
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -11,6 +11,7 @@ AllCops:
     - "vendor/bundle/**/*"
     - "vendor/bundle/**/.*"
   TargetRubyVersion: 2.5
+  NewCops: enable
   # we might wanna adopt rspec and rake but it's a bit annoying for now
   SuggestExtensions: false
 
diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb
@@ -46,14 +46,14 @@ def with_scope(locator)
 
 Then /^(?:|I )should not see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
   with_scope(selector) do
-    expect(page).to have_no_content(text)
+    expect(page).not_to have_content(text)
   end
 end
 
 Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
   regexp = Regexp.new(regexp)
   with_scope(selector) do
-    expect(page).to have_no_xpath("//*", text: regexp)
+    expect(page).not_to have_xpath("//*", text: regexp)
   end
 end
 
@@ -65,7 +65,7 @@ def with_scope(locator)
 end
 
 Then "{string} should not be visible" do |text|
-  expect(page).to have_no_content(:visible, text)
+  expect(page).not_to have_content(:visible, text)
 end
 
 Then /^show me the page$/ do
diff --git a/lib/simplecov.rb b/lib/simplecov.rb
@@ -11,9 +11,9 @@
   # @see https://github.com/simplecov-ruby/simplecov/issues/86
   # @see https://jira.codehaus.org/browse/JRUBY-6106
 
-  warn 'Coverage may be inaccurate; set the "--debug" command line option,' \
-    ' or do JRUBY_OPTS="--debug"' \
-    ' or set the "debug.fullTrace=true" option in your .jrubyrc'
+  warn 'Coverage may be inaccurate; set the "--debug" command line option, ' \
+       'or do JRUBY_OPTS="--debug" ' \
+       'or set the "debug.fullTrace=true" option in your .jrubyrc'
 end
 
 #
@@ -48,8 +48,8 @@ class << self
     def start(profile = nil, &block)
       require "coverage"
       initial_setup(profile, &block)
-      require_relative "./simplecov/process" if SimpleCov.enabled_for_subprocesses? &&
-                                                ::Process.respond_to?(:fork)
+      require_relative "simplecov/process" if SimpleCov.enabled_for_subprocesses? &&
+                                              ::Process.respond_to?(:fork)
 
       make_parallel_tests_available
 
@@ -301,7 +301,7 @@ def round_coverage(coverage)
 
     def initial_setup(profile, &block)
       load_profile(profile) if profile
-      configure(&block) if block_given?
+      configure(&block) if block
       self.running = true
     end
 
@@ -347,9 +347,9 @@ def start_coverage_measurement
     end
 
     def start_coverage_with_criteria
-      start_arguments = coverage_criteria.map do |criterion|
+      start_arguments = coverage_criteria.to_h do |criterion|
         [lookup_corresponding_ruby_coverage_name(criterion), true]
-      end.to_h
+      end
 
       start_arguments[:eval] = true if coverage_for_eval_enabled?
 
@@ -432,7 +432,7 @@ def make_parallel_tests_available
     end
 
     def probably_running_parallel_tests?
-      ENV["TEST_ENV_NUMBER"] && ENV["PARALLEL_TEST_GROUPS"]
+      ENV.fetch("TEST_ENV_NUMBER", nil) && ENV.fetch("PARALLEL_TEST_GROUPS", nil)
     end
   end
 end
diff --git a/lib/simplecov/command_guesser.rb b/lib/simplecov/command_guesser.rb
@@ -23,9 +23,9 @@ def from_env
         # If being run from inside parallel_tests set the command name according to the process number
         return unless ENV["PARALLEL_TEST_GROUPS"] && ENV["TEST_ENV_NUMBER"]
 
-        number = ENV["TEST_ENV_NUMBER"]
+        number = ENV.fetch("TEST_ENV_NUMBER", nil)
         number = "1" if number.empty?
-        "(#{number}/#{ENV['PARALLEL_TEST_GROUPS']})"
+        "(#{number}/#{ENV.fetch('PARALLEL_TEST_GROUPS', nil)})"
       end
 
       def from_command_line_options
diff --git a/lib/simplecov/configuration.rb b/lib/simplecov/configuration.rb
@@ -35,7 +35,7 @@ def coverage_dir(dir = nil)
       return @coverage_dir if defined?(@coverage_dir) && dir.nil?
 
       @coverage_path = nil # invalidate cache
-      @coverage_dir = (dir || "coverage")
+      @coverage_dir = dir || "coverage"
     end
 
     #
@@ -140,7 +140,7 @@ def print_error_status
     def nocov_token(nocov_token = nil)
       return @nocov_token if defined?(@nocov_token) && nocov_token.nil?
 
-      @nocov_token = (nocov_token || "nocov")
+      @nocov_token = nocov_token || "nocov"
     end
     alias skip_token nocov_token
 
@@ -191,9 +191,9 @@ def configure(&block)
     #     end
     #
     def at_exit(&block)
-      return Proc.new unless running || block_given?
+      return Proc.new unless running || block
 
-      @at_exit = block if block_given?
+      @at_exit = block if block
       @at_exit ||= proc { SimpleCov.result.format! }
     end
 
@@ -231,7 +231,7 @@ def enabled_for_subprocesses?
     #     end
     #
     def at_fork(&block)
-      @at_fork = block if block_given?
+      @at_fork = block if block
       @at_fork ||= lambda { |pid|
         # This needs a unique name so it won't be ovewritten
         SimpleCov.command_name "#{SimpleCov.command_name} (subprocess: #{pid})"
@@ -344,7 +344,7 @@ def minimum_coverage_by_file(coverage = nil)
     def refuse_coverage_drop(*criteria)
       criteria = coverage_criteria if criteria.empty?
 
-      maximum_coverage_drop(criteria.map { |c| [c, 0] }.to_h)
+      maximum_coverage_drop(criteria.to_h { |c| [c, 0] })
     end
 
     #
diff --git a/lib/simplecov/defaults.rb b/lib/simplecov/defaults.rb
@@ -44,7 +44,7 @@
       load filename
     rescue LoadError, StandardError
       warn "Warning: Error occurred while trying to load #{filename}. " \
-        "Error message: #{$!.message}"
+           "Error message: #{$!.message}"
     end
     break
   end
diff --git a/lib/simplecov/formatter/simple_formatter.rb b/lib/simplecov/formatter/simple_formatter.rb
@@ -11,7 +11,7 @@ def format(result)
         output = +""
         result.groups.each do |name, files|
           output << "Group: #{name}\n"
-          output << "=" * 40
+          output << ("=" * 40)
           output << "\n"
           files.each do |file|
             output << "#{file.filename} (coverage: #{file.covered_percent.round(2)}%)\n"
diff --git a/lib/simplecov/load_global_config.rb b/lib/simplecov/load_global_config.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "etc"
-home_dir = (ENV["HOME"] && File.expand_path("~")) || Etc.getpwuid.dir || (ENV["USER"] && File.expand_path("~#{ENV['USER']}"))
+home_dir = (Dir.home && File.expand_path("~")) || Etc.getpwuid.dir || (ENV.fetch("USER", nil) && File.expand_path("~#{ENV.fetch('USER', nil)}"))
 if home_dir
   global_config_path = File.join(home_dir, ".simplecov")
   load global_config_path if File.exist?(global_config_path)
diff --git a/lib/simplecov/process.rb b/lib/simplecov/process.rb
@@ -6,7 +6,7 @@ def fork_with_simplecov(&block)
       if defined?(SimpleCov) && SimpleCov.running
         fork_without_simplecov do
           SimpleCov.at_fork.call(Process.pid)
-          block.call if block_given?
+          yield if block
         end
       else
         fork_without_simplecov(&block)
diff --git a/lib/simplecov/result.rb b/lib/simplecov/result.rb
@@ -83,7 +83,7 @@ def self.from_hash(hash)
 
     def coverage
       keys = original_result.keys & filenames
-      Hash[keys.zip(original_result.values_at(*keys))]
+      keys.zip(original_result.values_at(*keys)).to_h
     end
 
     # Applies all configured SimpleCov filters on this result's source files
diff --git a/lib/simplecov/source_file.rb b/lib/simplecov/source_file.rb
@@ -151,7 +151,7 @@ def branches_for_line(line_number)
     # @return [Boolean]
     #
     def line_with_missed_branch?(line_number)
-      branches_for_line(line_number).select { |_type, count| count.zero? }.any?
+      branches_for_line(line_number).any? { |_type, count| count.zero? }
     end
 
   private
diff --git a/lib/simplecov/source_file/line.rb b/lib/simplecov/source_file/line.rb
@@ -65,7 +65,8 @@ def status
         return "skipped" if skipped?
         return "never" if never?
         return "missed" if missed?
-        return "covered" if covered?
+
+        "covered" if covered?
       end
     end
   end
diff --git a/simplecov.gemspec b/simplecov.gemspec
@@ -29,7 +29,8 @@ Gem::Specification.new do |gem|
     "changelog_uri"     => "https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md",
     "documentation_uri" => "https://www.rubydoc.info/gems/simplecov/#{gem.version}",
     "mailing_list_uri"  => "https://groups.google.com/forum/#!forum/simplecov",
-    "source_code_uri"   => "https://github.com/simplecov-ruby/simplecov/tree/v#{gem.version}"
+    "source_code_uri"   => "https://github.com/simplecov-ruby/simplecov/tree/v#{gem.version}",
+"rubygems_mfa_required" => "true"
   }
 
   gem.required_ruby_version = ">= 2.5.0"
diff --git a/spec/command_guesser_spec.rb b/spec/command_guesser_spec.rb
@@ -4,6 +4,7 @@
 
 describe SimpleCov::CommandGuesser do
   subject { SimpleCov::CommandGuesser }
+
   it 'correctly guesses "Unit Tests" for unit tests' do
     subject.original_run_command = "/some/path/test/units/foo_bar_test.rb"
     expect(subject.guess).to eq("Unit Tests")
diff --git a/spec/config_loader_spec.rb b/spec/config_loader_spec.rb
@@ -4,7 +4,7 @@
 
 describe "loading config" do
   context "without ENV[HOME]" do
-    it "shouldn't raise any errors" do
+    it "does not raise any errors" do
       home = ENV.delete("HOME")
       begin
         expect { load "simplecov/load_global_config.rb" }.not_to raise_error
diff --git a/spec/configuration_spec.rb b/spec/configuration_spec.rb
@@ -19,13 +19,15 @@
 
     context "when manually set" do
       before { config.print_error_status = false }
+
       it { is_expected.to be false }
     end
   end
 
   describe "#tracked_files" do
     context "when configured" do
       let(:glob) { "{app,lib}/**/*.rb" }
+
       before { config.track_files(glob) }
 
       it "returns the configured glob" do
@@ -48,7 +50,7 @@
     end
 
     shared_examples "setting coverage expectations" do |coverage_setting|
-      after :each do
+      after do
         config.clear_coverage_criteria
       end
 
@@ -101,7 +103,7 @@
       end
 
       context "when primary coverage is set" do
-        before(:each) do
+        before do
           config.enable_coverage :branch
           config.primary_coverage :branch
         end
@@ -127,7 +129,7 @@
     end
 
     describe "#refuse_coverage_drop" do
-      after :each do
+      after do
         config.clear_coverage_criteria
       end
 
@@ -250,7 +252,7 @@
 
     describe "#primary_coverage" do
       context "when branch coverage is enabled" do
-        before(:each) { config.enable_coverage :branch }
+        before { config.enable_coverage :branch }
 
         it "can set primary coverage to branch" do
           config.primary_coverage :branch
@@ -261,7 +263,7 @@
       end
 
       context "when branch coverage is not enabled" do
-        it "cannot set primary coverage to branch " do
+        it "cannot set primary coverage to branch" do
           expect do
             config.primary_coverage :branch
           end.to raise_error(/branch.*disabled/i)
diff --git a/spec/exit_codes/maximum_coverage_drop_check_spec.rb b/spec/exit_codes/maximum_coverage_drop_check_spec.rb
@@ -3,6 +3,8 @@
 require "helper"
 
 RSpec.describe SimpleCov::ExitCodes::MaximumCoverageDropCheck do
+  subject { described_class.new(result, maximum_coverage_drop) }
+
   let(:result) do
     instance_double(SimpleCov::Result, coverage_statistics: stats)
   end
@@ -19,9 +21,8 @@
   end
   let(:last_coverage) { {line: 80.0, branch: 80.0} }
   let(:maximum_coverage_drop) { {line: 0, branch: 0} }
-  subject { described_class.new(result, maximum_coverage_drop) }
 
-  before :each do
+  before do
     expect(SimpleCov::LastRun).to receive(:read).and_return(last_run)
   end
 
diff --git a/spec/exit_codes/minimum_coverage_by_file_check_spec.rb b/spec/exit_codes/minimum_coverage_by_file_check_spec.rb
@@ -3,6 +3,8 @@
 require "helper"
 
 RSpec.describe SimpleCov::ExitCodes::MinimumCoverageByFileCheck do
+  subject { described_class.new(result, minimum_coverage_by_file) }
+
   let(:result) do
     instance_double(SimpleCov::Result, coverage_statistics_by_file: stats)
   end
@@ -12,8 +14,6 @@
     }
   end
 
-  subject { described_class.new(result, minimum_coverage_by_file) }
-
   context "all files passing requirements" do
     let(:minimum_coverage_by_file) { {line: 80} }
 
diff --git a/spec/exit_codes/minimum_overall_coverage_check_spec.rb b/spec/exit_codes/minimum_overall_coverage_check_spec.rb
@@ -3,6 +3,8 @@
 require "helper"
 
 RSpec.describe SimpleCov::ExitCodes::MinimumOverallCoverageCheck do
+  subject { described_class.new(result, minimum_coverage) }
+
   let(:result) do
     instance_double(SimpleCov::Result, coverage_statistics: stats)
   end
@@ -13,8 +15,6 @@
     }
   end
 
-  subject { described_class.new(result, minimum_coverage) }
-
   context "everything exactly ok" do
     let(:minimum_coverage) { {line: 80.0} }
 
diff --git a/spec/filters_spec.rb b/spec/filters_spec.rb
@@ -36,15 +36,15 @@
     expect(SimpleCov::StringFilter.new(parent_dir_name)).not_to be_matches subject
   end
 
-  it "matches a new SimpleCov::RegexFilter /\/fixtures\//" do
+  it "matches a new SimpleCov::RegexFilter //fixtures//" do
     expect(SimpleCov::RegexFilter.new(/\/fixtures\//)).to be_matches subject
   end
 
-  it "doesn't match a new SimpleCov::RegexFilter /^\/fixtures\//" do
+  it "doesn't match a new SimpleCov::RegexFilter /^/fixtures//" do
     expect(SimpleCov::RegexFilter.new(/^\/fixtures\//)).not_to be_matches subject
   end
 
-  it "matches a new SimpleCov::RegexFilter /^\/spec\//" do
+  it "matches a new SimpleCov::RegexFilter /^/spec//" do
     expect(SimpleCov::RegexFilter.new(/^\/spec\//)).to be_matches subject
   end
 
@@ -108,15 +108,15 @@ def matches?(_source_file)
   end
 
   context "with no filters set up and a basic source file in an array" do
+    subject do
+      [SimpleCov::SourceFile.new(source_fixture("sample.rb"), [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil])]
+    end
+
     before do
       @prev_filters = SimpleCov.filters
       SimpleCov.filters = []
     end
 
-    subject do
-      [SimpleCov::SourceFile.new(source_fixture("sample.rb"), [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil])]
-    end
-
     after do
       SimpleCov.filters = @prev_filters
     end
diff --git a/spec/fixtures/frameworks/rspec_bad.rb b/spec/fixtures/frameworks/rspec_bad.rb
diff --git a/spec/fixtures/frameworks/rspec_good.rb b/spec/fixtures/frameworks/rspec_good.rb
diff --git a/spec/last_run_spec.rb b/spec/last_run_spec.rb
diff --git a/spec/result_merger_spec.rb b/spec/result_merger_spec.rb
diff --git a/spec/result_spec.rb b/spec/result_spec.rb
diff --git a/spec/return_codes_spec.rb b/spec/return_codes_spec.rb
diff --git a/spec/simplecov_spec.rb b/spec/simplecov_spec.rb
diff --git a/spec/source_file/line_spec.rb b/spec/source_file/line_spec.rb
diff --git a/spec/support/fail_rspec_on_ruby_warning.rb b/spec/support/fail_rspec_on_ruby_warning.rb
diff --git a/spec/useless_results_remover_spec.rb b/spec/useless_results_remover_spec.rb
