Merge remote-tracking branch 'upstream/main' into add-method-coverage-support

Author: tycooon

.github/workflows/stable.yml

@@ -3,26 +3,31 @@ name: stable
 on: [push, pull_request]
 
 jobs:
-  test:
+  tests:
     runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        ruby: [2.7, '3.0', 3.1, 3.2, ruby-head, jruby-9.4]
-
     env:
       BUNDLE_WITHOUT: "benchmark"
       JRUBY_OPTS: "--debug"
       SIMPLECOV_HTML_MODE: "methods" # TODO: remove after simplecov-html release
+    strategy:
+      fail-fast: false
+
+      matrix:
+        ruby-version:
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+          - jruby-9.4
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup ruby
-        uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true # 'bundle install' and cache
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
 
-      - name: Run tests
-        run: bundle exec rake
+      - run: |
+          bundle exec rake

.github/workflows/unstable.yml

@@ -5,25 +5,28 @@ on:
     - cron: '0 0 * * *'
 
 jobs:
-  test:
+  tests:
     runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        ruby: [ruby-head, jruby-head]
-
     env:
       BUNDLE_WITHOUT: "benchmark"
       JRUBY_OPTS: "--debug"
+    strategy:
+      fail-fast: false
+
+      matrix:
+        ruby-version:
+          - ruby-head
+          - jruby-head
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup ruby
-        uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true # 'bundle install' and cache
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+        continue-on-error: ${{ (matrix.ruby-version == 'ruby-head') || (matrix.ruby-version == 'jruby-head') }}
 
-      - name: Run tests
-        run: bundle exec rake
+      - run: |
+          bundle exec rake
+        continue-on-error: ${{ (matrix.ruby-version == 'ruby-head') || (matrix.ruby-version == 'jruby-head') }}

.rubocop.yml

@@ -10,7 +10,8 @@ AllCops:
     - "tmp/**/*"
     - "vendor/bundle/**/*"
     - "vendor/bundle/**/.*"
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
+  NewCops: enable
   # we might wanna adopt rspec and rake but it's a bit annoying for now
   SuggestExtensions: false
 

Gemfile

@@ -17,13 +17,14 @@ gem "matrix"
 
 group :development do
   gem "apparition", github: "twalpole/apparition" # LOCKED: When this is released, use a released version https://github.com/twalpole/apparition/pull/79
+  gem "activesupport", "~> 6.1"
   gem "aruba", "~> 1.0"
-  gem "capybara", "~> 3.31"
+  gem "capybara"
   gem "rackup"
-  gem "cucumber", "~> 4.0"
+  gem "cucumber", "~> 6.0"
   gem "minitest"
-  gem "rake", "~> 13.0"
-  gem "rspec", "~> 3.2"
+  gem "rake"
+  gem "rspec"
   gem "pry"
   gem "rubocop"
   gem "test-unit"

Gemfile.lock

@@ -6,13 +6,6 @@ GIT
       capybara (~> 3.13, < 4)
       websocket-driver (>= 0.6.5)
 
-GIT
-  remote: https://github.com/umbrellio/simplecov-html.git
-  revision: 54879bd1080865cf8013bcda12e0c03ac687d7a9
-  branch: add-method-coverage-support
-  specs:
-    simplecov-html (0.12.3)
-
 PATH
   remote: .
   specs:
@@ -55,38 +48,39 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     contracts (0.16.1)
-    cucumber (4.1.0)
-      builder (~> 3.2, >= 3.2.3)
-      cucumber-core (~> 7.1, >= 7.1.0)
-      cucumber-create-meta (~> 1.0.0, >= 1.0.0)
-      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
-      cucumber-gherkin (~> 14.0, >= 14.0.1)
-      cucumber-html-formatter (~> 7.0, >= 7.0.0)
-      cucumber-messages (~> 12.2, >= 12.2.0)
-      cucumber-wire (~> 3.1, >= 3.1.0)
-      diff-lcs (~> 1.3, >= 1.3, < 1.4)
+    cucumber (6.1.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-core (~> 9.0, >= 9.0.1)
+      cucumber-create-meta (~> 4.0, >= 4.0.0)
+      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
+      cucumber-gherkin (~> 18.1, >= 18.1.0)
+      cucumber-html-formatter (~> 13.0, >= 13.0.0)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+      cucumber-wire (~> 5.0, >= 5.0.1)
+      diff-lcs (~> 1.4, >= 1.4.4)
+      mime-types (~> 3.3, >= 3.3.1)
       multi_test (~> 0.1, >= 0.1.2)
-      sys-uname (~> 1.0, >= 1.0.2)
-    cucumber-core (7.1.0)
-      cucumber-gherkin (~> 14.0, >= 14.0.1)
-      cucumber-messages (~> 12.2, >= 12.2.0)
-      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
-    cucumber-create-meta (1.0.0)
-      cucumber-messages (~> 12.2, >= 12.2.0)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-cucumber-expressions (10.3.0)
-    cucumber-gherkin (14.2.0)
-      cucumber-messages (~> 12.4, >= 12.4.0)
-    cucumber-html-formatter (7.2.0)
-      cucumber-messages (~> 12.4, >= 12.4.0)
-    cucumber-messages (12.4.0)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-core (9.0.1)
+      cucumber-gherkin (~> 18.1, >= 18.1.0)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+      cucumber-tag-expressions (~> 3.0, >= 3.0.1)
+    cucumber-create-meta (4.0.0)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-cucumber-expressions (12.1.3)
+    cucumber-gherkin (18.1.1)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+    cucumber-html-formatter (13.0.0)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+    cucumber-messages (15.0.0)
       protobuf-cucumber (~> 3.10, >= 3.10.8)
-    cucumber-tag-expressions (2.0.4)
-    cucumber-wire (3.1.0)
-      cucumber-core (~> 7.1, >= 7.1.0)
-      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
-      cucumber-messages (~> 12.2, >= 12.2.0)
-    diff-lcs (1.3)
+    cucumber-tag-expressions (3.0.1)
+    cucumber-wire (5.0.1)
+      cucumber-core (~> 9.0, >= 9.0.1)
+      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
     ffi (1.15.5)
     ffi (1.15.5-java)
@@ -97,6 +91,9 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     middleware (0.1.0)
+    mime-types (3.5.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2024.0305)
     mini_mime (1.1.5)
     mini_portile2 (2.8.4)
     minitest (5.15.0)
@@ -161,10 +158,11 @@ GEM
     rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
+    simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
     spoon (0.0.6)
       ffi
-    sys-uname (1.2.2)
+    sys-uname (1.2.3)
       ffi (~> 1.1)
     test-unit (3.5.3)
       power_assert
@@ -190,20 +188,20 @@ PLATFORMS
   universal-java-1.8
 
 DEPENDENCIES
+  activesupport (~> 6.1)
   apparition!
   aruba (~> 1.0)
   benchmark-ips
-  capybara (~> 3.31)
-  cucumber (~> 4.0)
+  capybara
+  cucumber (~> 6.0)
   matrix
   minitest
   pry
   rackup
-  rake (~> 13.0)
-  rspec (~> 3.2)
+  rake
+  rspec
   rubocop
   simplecov!
-  simplecov-html!
   test-unit
   webrick
 

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

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
 
@@ -293,7 +293,7 @@ def write_last_run(result)
 
     def initial_setup(profile, &block)
       load_profile(profile) if profile
-      configure(&block) if block_given?
+      configure(&block) if block
       self.running = true
     end
 
@@ -339,9 +339,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?
 
@@ -425,7 +425,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

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

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
 
     #

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