coverband 6.1.2.rc.1 → 6.1.3

data/test/coverband/configuration_test.rb

@@ -18,7 +18,7 @@ class BaseTest < Minitest::Test
 
   test "ignore works with equal" do
     Coverband::Collectors::Coverage.instance.reset_instance
-    expected = ["vendor/", ".erb$", ".slim$", "/tmp", "internal:prelude", "db/schema.rb", "config/environments"]
+    expected = ["vendor/", ".erb$", ".slim$", "/tmp", "internal:prelude", "db/schema.rb", "config/environments"].map { |str| Regexp.new(str) }
     assert_equal expected, Coverband.configuration.ignore
   end
 
@@ -34,7 +34,7 @@ class BaseTest < Minitest::Test
       "internal:prelude",
       "db/schema.rb",
       "config/environments",
-      "config/initializers"]
+      "config/initializers"].map { |str| Regexp.new(str) }
     assert_equal expected, Coverband.configuration.ignore
   end
 
@@ -44,7 +44,7 @@ class BaseTest < Minitest::Test
       config.ignore = ["*invalidRegex*"]
     end
     Coverband::Collectors::Coverage.instance.reset_instance
-    expected = Coverband::Configuration::IGNORE_DEFAULTS << "config/environments"
+    expected = (Coverband::Configuration::IGNORE_DEFAULTS << "config/environments").map { |str| Regexp.new(str) }
     assert_equal expected, Coverband.configuration.ignore
   end
 
@@ -121,22 +121,4 @@ class BaseTest < Minitest::Test
       config.redis_url = "redis://localhost:3333"
     end
   end
-
-  test "use_oneshot_lines_coverage" do
-    refute Coverband.configuration.use_oneshot_lines_coverage
-
-    Coverband.configuration.stubs(:one_shot_coverage_implemented_in_ruby_version?).returns(true)
-    Coverband.configuration.use_oneshot_lines_coverage = true
-    assert Coverband.configuration.use_oneshot_lines_coverage
-
-    Coverband.configuration.use_oneshot_lines_coverage = false
-    refute Coverband.configuration.use_oneshot_lines_coverage
-
-    Coverband.configuration.stubs(:one_shot_coverage_implemented_in_ruby_version?).returns(false)
-    exception = assert_raises Exception do
-      Coverband.configuration.use_oneshot_lines_coverage = true
-    end
-    assert_equal "One shot line coverage is only available in ruby >= 2.6", exception.message
-    refute Coverband.configuration.use_oneshot_lines_coverage
-  end
 end

data/test/coverband/integrations/resque_worker_test.rb

@@ -45,7 +45,9 @@ class ResqueWorkerTest < Minitest::Test
         assert_equal 1, report[Coverband::EAGER_TYPE][relative_job_file]["data"][6]
       else
         assert_equal 0, report[Coverband::EAGER_TYPE][relative_job_file]["data"][6]
-        assert_equal 1, report[Coverband::RUNTIME_TYPE][relative_job_file]["data"][6]
+        if report[Coverband::RUNTIME_TYPE] && report[Coverband::RUNTIME_TYPE][relative_job_file]
+          assert_equal 1, report[Coverband::RUNTIME_TYPE][relative_job_file]["data"][6]
+        end
       end
     end
   end

data/test/coverband/reporters/base_test.rb

@@ -75,7 +75,6 @@ class ReportsBaseTest < Minitest::Test
     roots = ['/base/[0-9]*/', '/base/78/app/']
 
     Coverband.configuration.stubs(:all_root_paths).returns(roots)
-    lines_hit = [1, 3, 6]
     store.stubs(:merged_coverage).returns(coverage)
     File.expects(:exist?).at_least_once
       .with('/base/[0-9]*/app/controllers/dashboard_controller.rb')

data/test/coverband/reporters/json_test.rb

@@ -45,4 +45,15 @@ class ReportJSONTest < Minitest::Test
       assert_equal parsed["files"][file].keys, expected_keys
     end
   end
+
+  test "supports merging" do
+    @store.send(:save_report, basic_coverage)
+    first_report = JSON.parse(Coverband::Reporters::JSONReport.new(@store, for_merged_report: true).report)
+
+    @store.send(:save_report, increased_basic_coverage)
+    second_report = JSON.parse(Coverband::Reporters::JSONReport.new(@store, for_merged_report: true).report)
+    data = Coverband::Reporters::JSONReport.new(@store).merge_reports(first_report, second_report)
+    assert_equal data[Coverband::RUNTIME_TYPE.to_s]["app_path/dog.rb"]["data"], [0, 4, 10]
+    assert_equal data[Coverband::MERGED_TYPE.to_s]["app_path/dog.rb"]["data"], [0, 4, 10]
+  end
 end

data/test/coverband/reporters/web_test.rb

@@ -6,75 +6,73 @@ require "rack/test"
 
 ENV["RACK_ENV"] = "test"
 
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.2.0")
-  module Coverband
-    class WebTest < Minitest::Test
-      include Rack::Test::Methods
+module Coverband
+  class WebTest < Minitest::Test
+    include Rack::Test::Methods
 
-      def app
-        Coverband::Reporters::Web.new
-      end
+    def app
+      Coverband::Reporters::Web.new
+    end
 
-      def teardown
-        super
-      end
+    def teardown
+      super
+    end
 
-      test "renders index content" do
-        get "/"
-        assert last_response.ok?
-        assert_match "Coverband Home", last_response.body
-      end
+    test "renders index content" do
+      get "/"
+      assert last_response.ok?
+      assert_match "Coverband Home", last_response.body
+    end
 
-      test "renders index content for empty path" do
-        get ""
-        assert last_response.ok?
-        assert_match "Coverband Home", last_response.body
-      end
+    test "renders index content for empty path" do
+      get ""
+      assert last_response.ok?
+      assert_match "Coverband Home", last_response.body
+    end
 
-      test "renders 404" do
-        get "/show"
-        assert last_response.not_found?
-        assert_equal "404 error!", last_response.body
-      end
+    test "renders 404" do
+      get "/show"
+      assert last_response.not_found?
+      assert_equal "404 error!", last_response.body
+    end
 
-      test "clears coverband" do
-        post "/clear"
-        assert_equal 302, last_response.status
-      end
+    test "clears coverband" do
+      post "/clear"
+      assert_equal 302, last_response.status
     end
   end
+end
 
-  module Coverband
-    class AuthWebTest < Minitest::Test
-      include Rack::Test::Methods
+module Coverband
+  class AuthWebTest < Minitest::Test
+    include Rack::Test::Methods
 
-      def setup
-        super
-        @store = Coverband.configuration.store
-        Coverband.configure do |config|
-          config.password = "test_pass"
-        end
+    def setup
+      super
+      @store = Coverband.configuration.store
+      Coverband.configure do |config|
+        config.password = "test_pass"
       end
+    end
 
-      def app
-        Coverband::Reporters::Web.new
-      end
+    def app
+      Coverband::Reporters::Web.new
+    end
 
-      def teardown
-        super
-      end
+    def teardown
+      super
+    end
 
-      test "renders index with basic auth" do
-        basic_authorize "anything", "test_pass"
-        get "/"
-        assert last_response.ok?
-        assert_match "Coverband Home", last_response.body
-      end
+    test "renders index with basic auth" do
+      basic_authorize "anything", "test_pass"
+      get "/"
+      assert last_response.ok?
+      assert_match "Coverband Home", last_response.body
+    end
 
-      test "renders 401 auth error when not provided" do
-        get "/"
-        assert_equal 401, last_response.status
-      end
+    test "renders 401 auth error when not provided" do
+      get "/"
+      assert_equal 401, last_response.status
     end
   end
 end

data/test/rails5_dummy/config/coverband.rb

@@ -12,5 +12,4 @@ Coverband.configure do |config|
   config.background_reporting_enabled = true
   config.track_routes = true
   config.use_oneshot_lines_coverage = true if ENV["ONESHOT"]
-  config.simulate_oneshot_lines_coverage = true if ENV["SIMULATE_ONESHOT"]
 end

data/test/rails5_dummy/config/coverband_missing_redis.rb

@@ -11,5 +11,4 @@ Coverband.configure do |config|
   config.track_gems = true
   config.gem_details = true
   config.use_oneshot_lines_coverage = true if ENV["ONESHOT"]
-  config.simulate_oneshot_lines_coverage = true if ENV["SIMULATE_ONESHOT"]
 end

data/test/test_helper.rb

@@ -40,7 +40,7 @@ require "spy/integration"
 require_relative "unique_files"
 $VERBOSE = original_verbosity
 
-unless ENV["ONESHOT"] || ENV["SIMULATE_ONESHOT"] || $SKIP_SIMPLECOV
+unless ENV["ONESHOT"] || $SKIP_SIMPLECOV
   SimpleCov.formatter = Coveralls::SimpleCov::Formatter
   SimpleCov.start do
     add_filter "test/forked"
@@ -89,8 +89,11 @@ TEST_COVERAGE_FILE = "/tmp/fake_file.json"
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-Mocha::Configuration.prevent(:stubbing_method_unnecessarily)
-Mocha::Configuration.prevent(:stubbing_non_existent_method)
+Mocha.configure do |c|
+  c.stubbing_method_unnecessarily = :prevent
+  c.stubbing_method_on_non_mock_object = :allow
+  c.stubbing_method_on_nil = :prevent
+end
 
 def test(name, &block)
   test_name = :"test_#{name.gsub(/\s+/, "_")}"
@@ -122,6 +125,10 @@ def basic_coverage
   {"app_path/dog.rb" => example_line}
 end
 
+def increased_basic_coverage
+  {"app_path/dog.rb" => [0, 2, 6]}
+end
+
 def basic_coverage_full_path
   {basic_coverage_file_full_path => example_line}
 end

data/views/source_file.erb

@@ -27,7 +27,7 @@
       <b><%= source_file.lines_of_code %></b> relevant lines.
       <b><%= result.runtime_relavent_lines(source_file) %></b> runtime relevant lines.
       <span class="green"><b><%= source_file.covered_lines.count %></b> lines covered</span> and
-      <span class="red"><b><%= source_file.missed_lines.count %></b> lines missed.</span>
+      <span class="<%= missed_lines_css_class(source_file.missed_lines.count) %>"><b><%= source_file.missed_lines.count %></b> lines missed.</span>
     </div>
     <div>
       Coverage first seen: <%= source_file.first_updated_at %>, last activity recorded:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 6.1.2.rc.1
+  version: 6.1.3
 platform: ruby
 authors:
 - Dan Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-27 00:00:00.000000000 Z
+date: 2024-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -85,16 +85,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.18.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.18.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-fork_executor
   requirement: !ruby/object:Gem::Requirement
@@ -127,16 +127,16 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -197,30 +197,30 @@ dependencies:
   name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.34.0
+        version: 1.35.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.34.0
+        version: 1.35.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.60.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.60.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -249,6 +249,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dalli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -277,6 +291,7 @@ files:
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".jrubyrc"
+- ".rubocop.yml"
 - ".standard.yml"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -317,6 +332,7 @@ files:
 - lib/coverband/integrations/rack_server_check.rb
 - lib/coverband/integrations/report_middleware.rb
 - lib/coverband/integrations/resque.rb
+- lib/coverband/integrations/sidekiq_swarm.rb
 - lib/coverband/reporters/base.rb
 - lib/coverband/reporters/console_report.rb
 - lib/coverband/reporters/html_report.rb
@@ -382,6 +398,7 @@ files:
 - test/coverband/adapters/base_test.rb
 - test/coverband/adapters/file_store_test.rb
 - test/coverband/adapters/hash_redis_store_test.rb
+- test/coverband/adapters/memecached_store_test.rb
 - test/coverband/adapters/null_store_test.rb
 - test/coverband/adapters/redis_store_test.rb
 - test/coverband/adapters/web_service_store_test.rb
@@ -524,9 +541,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.10
 signing_key: