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

tycooon · tycooon · commit 03d11803fb41 · 2020-10-27T13:29:08.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+0.19.1 (2020-10-25)
+==========
+
+## Bugfixes
+
+* No more warnings triggered by `enable_for_subprocesses`. Thanks to [@mame](https://github.com/mame)
+* Avoid trying to patch `Process.fork` when it isn't available. Thanks to [@MSP-Greg](https://github.com/MSP-Greg)
+
 0.19.0 (2020-08-16)
 ==========
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simplecov (0.19.0)
+    simplecov (0.19.1)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
 
@@ -136,7 +136,7 @@ GEM
     rubocop-ast (0.3.0)
       parser (>= 2.7.1.4)
     ruby-progressbar (1.10.1)
-    simplecov-html (0.12.2)
+    simplecov-html (0.12.3)
     spoon (0.0.6)
       ffi
     sys-uname (1.2.1)
diff --git a/Rakefile b/Rakefile
@@ -25,6 +25,8 @@ rescue LoadError
 end
 
 require "cucumber/rake/task"
-Cucumber::Rake::Task.new
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = %w[--retry 3 --no-strict-flaky]
+end
 
 task default: %i[rubocop spec cucumber]
diff --git a/benchmarks/result.rb b/benchmarks/result.rb
@@ -6,7 +6,7 @@
 Coverage.start
 # such meta, many wow
 require_relative "../lib/simplecov"
-require_relative "../spec/faked_project/lib/faked_project"
+require_relative "../test_projects/faked_project/lib/faked_project"
 result = Coverage.result
 
 class MyFormatter
diff --git a/doc/alternate-formatters.md b/doc/alternate-formatters.md
@@ -60,6 +60,11 @@ A formatter that prints the coverage of the file under test when you run a singl
 
 t_wada AA formatter for SimpleCov
 
+#### [simplecov-tailwindcss](https://github.com/chiefpansancolt/simplecov-tailwindcss)
+*by [Chiefpansancolt](https://github.com/chiefpansancolt)*
+
+A TailwindCSS & TailwindUI Designed HTML formatter with clean and easy search of files with a tabular left Navigation.
+
 #### [simplecov-material](https://github.com/chiefpansancolt/simplecov-material)
 *by [Chiefpansancolt](https://github.com/chiefpansancolt)*
 
diff --git a/features/skipping_code_blocks_manually.feature b/features/skipping_code_blocks_manually.feature
@@ -57,15 +57,15 @@ Feature:
 
     When I open the coverage report generated with `bundle exec rake test`
 
-    Then I should see the source files:
+    Then the report should be based upon:
+      | Unit Tests |
+
+    And there should be 7 skipped lines in the source files
+
+    And I should see the source files:
       | name                                    | coverage |
       | lib/faked_project.rb                    | 100.00 %  |
       | lib/faked_project/some_class.rb         | 80.00 %   |
       | lib/faked_project/framework_specific.rb | 75.00 %   |
       | lib/faked_project/meta_magic.rb         | 100.00 %  |
       | lib/faked_project/nocov.rb              | 100.00 %  |
-
-    And there should be 7 skipped lines in the source files
-
-    And the report should be based upon:
-      | Unit Tests |
diff --git a/features/step_definitions/html_steps.rb b/features/step_definitions/html_steps.rb
@@ -2,9 +2,8 @@
 
 Then /^I should see the groups:$/ do |table|
   expected_groups = table.hashes
-  available_groups = all("#content .file_list_container")
   # Given group names should be the same number than those rendered in report
-  expect(expected_groups.count).to eq(available_groups.count)
+  expect(page).to have_css("#content .file_list_container", count: expected_groups.count)
 
   # Verify each of the expected groups has a file list container and corresponding title and coverage number
   # as well as the correct number of links to files.
@@ -23,9 +22,8 @@
 
 Then /^I should see the source files:$/ do |table|
   expected_files = table.hashes
-  available_source_files = all(".t-file", visible: true)
+  available_source_files = all(".t-file", visible: true, count: expected_files.count)
 
-  expect(available_source_files.count).to eq(expected_files.length)
   include_branch_coverage = table.column_names.include?("branch coverage")
 
   # Find all filenames and their coverage present in coverage report
diff --git a/features/warnings.feature b/features/warnings.feature
@@ -0,0 +1,18 @@
+@rspec
+Feature:
+
+  Running SimpleCov with verbosity enabled does not yield warnings.
+
+  Background:
+    Given I'm working on the project "faked_project"
+
+  Scenario:
+    Given SimpleCov for RSpec is configured with:
+      """
+      require 'simplecov'
+      SimpleCov.start
+      """
+
+    When I successfully run `bundle exec rspec --warnings spec`
+    Then a coverage report should have been generated
+    And the output should not contain "warning"
diff --git a/lib/simplecov.rb b/lib/simplecov.rb
@@ -50,7 +50,9 @@ class << self
     def start(profile = nil, &block)
       require "coverage"
       initial_setup(profile, &block)
-      require_relative "./simplecov/process" if SimpleCov.enabled_for_subprocesses?
+      require_relative "./simplecov/process" if SimpleCov.enabled_for_subprocesses? &&
+                                                ::Process.respond_to?(:fork)
+
       make_parallel_tests_available
 
       @result = nil
diff --git a/lib/simplecov/configuration.rb b/lib/simplecov/configuration.rb
@@ -199,8 +199,9 @@ def at_exit(&block)
     # gets or sets the enabled_for_subprocess configuration
     # when true, this will inject SimpleCov code into Process.fork
     def enable_for_subprocesses(value = nil)
-      @enable_for_subprocesses = value unless value.nil?
-      @enable_for_subprocesses || false
+      return @enable_for_subprocesses if defined?(@enable_for_subprocesses) && value.nil?
+
+      @enable_for_subprocesses = value || false
     end
 
     # gets the enabled_for_subprocess configuration
diff --git a/lib/simplecov/version.rb b/lib/simplecov/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleCov
-  VERSION = "0.19.0"
+  VERSION = "0.19.1"
 end
diff --git a/spec/configuration_spec.rb b/spec/configuration_spec.rb
@@ -211,5 +211,24 @@
         expect(config).not_to be_method_coverage
       end
     end
+
+    describe "#enable_for_subprocesses" do
+      it "returns false by default" do
+        expect(config.enable_for_subprocesses).to eq false
+      end
+
+      it "can be set to true" do
+        config.enable_for_subprocesses true
+
+        expect(config.enable_for_subprocesses).to eq true
+      end
+
+      it "can be enabled and then disabled again" do
+        config.enable_for_subprocesses true
+        config.enable_for_subprocesses false
+
+        expect(config.enable_for_subprocesses).to eq false
+      end
+    end
   end
 end
