coverband 4.2.0 → 4.2.1.rc1

data/test/coverband/collectors/delta_test.rb

@@ -17,7 +17,7 @@ class CollectorsDeltaTest < Minitest::Test
 
   test 'No previous results' do
     current_coverage = {
-      'car.rb' => [0,5,1]
+      'car.rb' => [0, 5, 1]
     }
     results = Coverband::Collectors::Delta.results(mock_coverage(current_coverage))
     assert_equal(current_coverage, results)
@@ -25,16 +25,16 @@ class CollectorsDeltaTest < Minitest::Test
 
   test 'Coverage has gone up' do
     current_coverage = {
-      'car.rb' => [nil,1,5,1]
+      'car.rb' => [nil, 1, 5, 1]
     }
     results = Coverband::Collectors::Delta.results(mock_coverage(current_coverage))
     assert_equal(current_coverage, results)
 
     current_coverage = {
-      'car.rb' => [nil,1,7,1]
+      'car.rb' => [nil, 1, 7, 1]
     }
     results = Coverband::Collectors::Delta.results(mock_coverage(current_coverage))
-    assert_equal({'car.rb' => [nil, 0, 2, 0]}, results)
+    assert_equal({ 'car.rb' => [nil, 0, 2, 0] }, results)
   end
 
   test 'New file added to coverage' do
@@ -43,10 +43,31 @@ class CollectorsDeltaTest < Minitest::Test
     assert_equal(current_coverage, results)
 
     current_coverage = {
-      'dealership.rb' => [nil,1,1,nil]
+      'dealership.rb' => [nil, 1, 1, nil]
     }
     results = Coverband::Collectors::Delta.results(mock_coverage(current_coverage))
     assert_equal(current_coverage, results)
   end
-end
 
+  if Coverband.configuration.one_shot_coverage_implemented_in_ruby_version?
+    test 'one shot lines results' do
+
+      Coverband.configuration.stubs(:use_oneshot_lines_coverage).returns(true)
+      current_coverage = {}
+      results = Coverband::Collectors::Delta.results(mock_coverage(current_coverage))
+      assert_equal(current_coverage, results)
+
+      current_coverage = {
+        'dealership.rb' => {
+          :oneshot_lines => [2,3]
+        }
+      }
+      ::Coverage.expects(:line_stub).with('dealership.rb').returns([nil, 0, 0, nil])
+      results = Coverband::Collectors::Delta.results(mock_coverage(current_coverage))
+      expected = {
+        'dealership.rb' => [nil, 1, 1, nil]
+      }
+      assert_equal(expected, results)
+    end
+  end
+end

data/test/coverband/configuration_test.rb

@@ -5,31 +5,53 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 class BaseTest < Minitest::Test
   def setup
     super
+    Coverband.configuration.reset
     Coverband.configure do |config|
       config.root                = Dir.pwd
       config.s3_bucket           = nil
       config.root_paths          = ['/app_path/']
-      config.ignore              = ['vendor']
-      config.reporting_frequency = 100.0
+      config.ignore              = ['config/envionments']
       config.reporter            = 'std_out'
-      config.store               = Coverband::Adapters::RedisStore.new(Redis.new)
+      config.store               = Coverband::Adapters::RedisStore.new(Redis.new, redis_namespace: 'coverband_test')
     end
   end
 
-  test 'defaults' do
+  test 'ignore works with equal' do
     coverband = Coverband::Collectors::Coverage.instance.reset_instance
-    assert_equal ['vendor', 'internal:prelude', 'schema.rb'], coverband.instance_variable_get('@ignore_patterns')
+    expected = ["vendor", ".erb$", ".slim$", "/tmp", "internal:prelude", "schema.rb", "config/envionments"]
+    assert_equal expected, Coverband.configuration.ignore
+  end
+
+  test 'ignore works with plus equal' do
+    Coverband.configure do |config|
+      config.ignore += ['config/initializers']
+    end
+    coverband = Coverband::Collectors::Coverage.instance.reset_instance
+    expected = ["vendor",
+      ".erb$",
+      ".slim$",
+      "/tmp",
+      "internal:prelude",
+      "schema.rb",
+      "config/envionments",
+      "config/initializers"]
+    assert_equal expected, Coverband.configuration.ignore
+  end
+
+  test 'ignore' do
+    Coverband::Collectors::Coverage.instance.reset_instance
+    assert !Coverband.configuration.gem_paths.first.nil?
   end
 
   test 'gem_paths' do
     Coverband::Collectors::Coverage.instance.reset_instance
-    assert Coverband.configuration.gem_paths.first != nil
+    assert !Coverband.configuration.gem_paths.first.nil?
   end
 
   test 'groups' do
     Coverband::Collectors::Coverage.instance.reset_instance
     Coverband.configuration.track_gems = true
-    assert_equal %w(App Gems), Coverband.configuration.groups.keys
+    assert_equal %w[App Gems], Coverband.configuration.groups.keys
   end
 
   test 'all_root_paths' do
@@ -64,4 +86,22 @@ class BaseTest < Minitest::Test
       end
     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/coverband_test.rb

@@ -3,7 +3,6 @@
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class CoverbandTest < Minitest::Test
-
   test 'Coverband#start kicks off background reporting if enabled and not in rack server' do
     Coverband.configuration.stubs(:background_reporting_enabled).returns(:true)
     Coverband::RackServerCheck.expects(:running?).returns(false)

data/test/coverband/integrations/background_middleware_test.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+require 'rack'
+
+class BackgroundMiddlewareTest < Minitest::Test
+  def setup
+    super
+    Coverband.configure do |config|
+      config.background_reporting_enabled = false
+    end
+  end
+
+  test 'call app' do
+    request = Rack::MockRequest.env_for('/anything.json')
+    Coverband::Collectors::Coverage.instance.reset_instance
+    middleware = Coverband::BackgroundMiddleware.new(fake_app)
+    results = middleware.call(request)
+    assert_equal '/anything.json', results.last
+  end
+
+  test 'pass all rack lint checks' do
+    Coverband::Collectors::Coverage.instance.reset_instance
+    app = Rack::Lint.new(Coverband::BackgroundMiddleware.new(fake_app))
+    env = Rack::MockRequest.env_for('/hello')
+    app.call(env)
+  end
+
+  test 'starts background reporter when configured' do
+    request = Rack::MockRequest.env_for('/anything.json')
+    Coverband.configuration.stubs(:background_reporting_enabled).returns(true)
+    Coverband::Background.expects(:start)
+    middleware = Coverband::BackgroundMiddleware.new(fake_app)
+    middleware.call(request)
+  end
+
+  private
+
+  def fake_app
+    @fake_app ||= lambda do |env|
+      [200, { 'Content-Type' => 'text/plain' }, env['PATH_INFO']]
+    end
+  end
+end

data/test/coverband/integrations/background_test.rb

@@ -4,8 +4,7 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
 class BackgroundTest < Minitest::Test
   class ThreadDouble < Struct.new(:alive)
-    def exit
-    end
+    def exit; end
 
     def alive?
       alive
@@ -27,5 +26,4 @@ class BackgroundTest < Minitest::Test
     Coverband::Collectors::Coverage.instance.expects(:report_coverage).twice
     2.times { Coverband::Background.start }
   end
-
 end

data/test/coverband/integrations/report_middleware_test.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+require 'coverband/integrations/report_middleware'
+
+class ReportMiddlewareTest < Minitest::Test
+  def setup
+    super
+    Coverband.configure do |config|
+      config.background_reporting_enabled = false
+    end
+  end
+
+  test 'reports coverage' do
+    request = Rack::MockRequest.env_for('/anything.json')
+    Coverband::Collectors::Coverage.instance.expects(:report_coverage)
+    middleware = Coverband::ReportMiddleware.new(fake_app)
+    middleware.call(request)
+  end
+
+  test 'reports coverage when an error is raised' do
+    request = Rack::MockRequest.env_for('/anything.json')
+    Coverband::Collectors::Coverage.instance.reset_instance
+    Coverband::Collectors::Coverage.instance.expects(:report_coverage).once
+    middleware = Coverband::ReportMiddleware.new(fake_app_raise_error)
+    begin
+      middleware.call(request)
+    rescue StandardError
+      nil
+    end
+  end
+
+  private
+
+  def fake_app
+    @fake_app ||= lambda do |env|
+      [200, { 'Content-Type' => 'text/plain' }, env['PATH_INFO']]
+    end
+  end
+
+  def fake_app_raise_error
+    @fake_app_raise_error ||= -> { raise 'hell' }
+  end
+end

data/test/coverband/integrations/resque_worker_test.rb

@@ -5,7 +5,7 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
 class ResqueWorkerTest < Minitest::Test
   def enqueue_and_run_job
     Resque.enqueue(TestResqueJob)
-    queue = ENV['QUEUE'] ='resque_coverband'
+    queue = ENV['QUEUE'] = 'resque_coverband'
     worker = Resque::Worker.new
     worker.startup
     worker.work_one_job
@@ -17,6 +17,7 @@ class ResqueWorkerTest < Minitest::Test
       config.background_reporting_enabled = false
       config.root_paths = ["#{File.expand_path('../', File.dirname(__FILE__))}/"]
     end
+    Coverband.configuration.store.instance_variable_set(:@redis_namespace, 'coverband_test')
     Coverband.start
     redis = Coverband.configuration.store.send(:redis)
     Resque.redis = redis
@@ -36,7 +37,7 @@ class ResqueWorkerTest < Minitest::Test
     Coverband.runtime_coverage!
     report = Coverband.configuration.store.get_coverage_report
 
-    assert_equal 0, report[Coverband::EAGER_TYPE][relative_job_file]['data'][4]
-    assert_equal 1, report[Coverband::RUNTIME_TYPE][relative_job_file]['data'][4]
+    assert_equal 0, report[Coverband::EAGER_TYPE][relative_job_file]['data'][6]
+    assert_equal 1, report[Coverband::RUNTIME_TYPE][relative_job_file]['data'][6]
   end
 end

data/test/coverband/integrations/test_resque_job.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class TestResqueJob
   @queue = :resque_coverband
 
   def self.perform
-    "resque job perform"
+    'resque job perform'
   end
 end

data/test/coverband/reporters/base_test.rb

@@ -27,7 +27,7 @@ class ReportsBaseTest < Minitest::Test
 
     expected_path = '/full/remote_app/path/app/models/user.rb'
     key = '/box/apps/app_name/releases/20140725203539/app/models/user.rb'
-    roots = ["/box/apps/app_name/releases/\\d+/", '/full/remote_app/path/']
+    roots = ['/box/apps/app_name/releases/\\d+/', '/full/remote_app/path/']
     File.expects(:exist?).with('/box/apps/app_name/releases/\\d+/app/models/user.rb').returns(false)
     File.expects(:exist?).with(expected_path).returns(true)
     assert_equal expected_path, Coverband::Reporters::Base.send(:relative_path_to_full, key, roots)
@@ -53,7 +53,7 @@ class ReportsBaseTest < Minitest::Test
     assert_equal expected_path, Coverband::Reporters::Base.send(:relative_path_to_full, key, roots)
     File.expects(:exist?).with('/var/local/company/company.d/[0-9]*/app/controllers/dashboard_controller.rb').returns(false)
     File.expects(:exist?).with(expected_path).returns(true)
-    roots = ["/var/local/company/company.d/[0-9]*/", "#{current_app_root}/"]
+    roots = ['/var/local/company/company.d/[0-9]*/', "#{current_app_root}/"]
     assert_equal expected_path, Coverband::Reporters::Base.send(:relative_path_to_full, key, roots)
   end
 
@@ -97,7 +97,7 @@ class ReportsBaseTest < Minitest::Test
 
   test "#get_current_scov_data_imp doesn't ignore folders with default ignore keys" do
     @redis = Redis.new
-    store = Coverband::Adapters::RedisStore.new(@redis)
+    store = Coverband::Adapters::RedisStore.new(@redis, redis_namespace: 'coverband_test')
     store.clear!
 
     Coverband.configure do |config|
@@ -140,7 +140,7 @@ class ReportsBaseTest < Minitest::Test
         "data"=>[16, 16, 16, nil, 16, 16, nil, nil, 16, nil, 16, 32, 32, nil, 32, 32, 32, 32, 32, 32, 32, nil, nil, 16, nil, 16, 32, 23, 0, 0, 0, 0, nil, nil, nil, nil, 0, 0, nil, nil, 16, 32, 32, 32, nil, nil, nil, nil, nil, 16, 32, nil, nil, 16, 32, nil, nil]}
       }
     @redis = Redis.new
-    store = Coverband::Adapters::RedisStore.new(@redis)
+    store = Coverband::Adapters::RedisStore.new(@redis, redis_namespace: 'coverband_test')
     store.clear!
 
     Coverband.configure do |config|

data/test/coverband/reporters/console_test.rb

@@ -8,7 +8,7 @@ class HTMLReportTest < Minitest::Test
   def setup
     super
     @redis = Redis.new
-    @store = Coverband::Adapters::RedisStore.new(@redis)
+    @store = Coverband::Adapters::RedisStore.new(@redis, redis_namespace: 'coverband_test')
     @store.clear!
   end
 
@@ -16,7 +16,6 @@ class HTMLReportTest < Minitest::Test
     Coverband.configure do |config|
       config.reporter            = 'std_out'
       config.store               = @store
-      config.reporting_frequency = 100.0
     end
     Coverband.configuration.logger.stubs('info')
     mock_file_hash

data/test/coverband/reporters/html_test.rb

@@ -6,40 +6,103 @@ class ReportHTMLTest < Minitest::Test
   def setup
     super
     @redis = Redis.new
-    @store = Coverband::Adapters::RedisStore.new(@redis)
+    @store = Coverband::Adapters::RedisStore.new(@redis, redis_namespace: 'coverband_test')
     @store.clear!
-  end
-
-  test 'generate scov html report' do
     Coverband.configure do |config|
-      config.reporter          = 'scov'
       config.store             = @store
-      config.s3_bucket         = nil
+      config.root              = fixtures_root
       config.ignore            = ['notsomething.rb']
     end
     mock_file_hash
+  end
+
+  test 'generate dynamic content hosted html report' do
     @store.send(:save_report, basic_coverage)
 
     html = Coverband::Reporters::HTMLReport.new(@store,
-                                                   html: true,
-                                                   open_report: false).report
+                                                static: false,
+                                                open_report: false).report
     assert_match 'Generated by', html
   end
 
-  test 'generate scov report file' do
+  test 'files with no Coverage but in project are shown in reports' do
+    @store.send(:save_report, basic_source_fixture_coverage)
+
+    html = Coverband::Reporters::HTMLReport.new(@store,
+                                                static: false,
+                                                open_report: false).report
+    assert_match 'sample.rb', html
+    # in project, but not in coverage data
+    assert_match 'app/models/user.rb', html
+  end
+
+  test 'Gem files with no coverage are shown in report' do
     Coverband.configure do |config|
-      config.reporter          = 'scov'
-      config.store             = @store
-      config.s3_bucket         = nil
-      config.ignore            = ['notsomething.rb']
+      config.track_gems = true
     end
-    mock_file_hash
+    @store.send(:save_report, basic_source_fixture_coverage)
+
+    html = Coverband::Reporters::HTMLReport.new(@store,
+                                                static: false,
+                                                open_report: false).report
+    assert_match 'rainbow', html
+  end
+
+  test 'Gem files are not shown in report when not configured' do
+    Coverband.configure do |config|
+      config.track_gems = false
+    end
+    @store.send(:save_report, basic_source_fixture_coverage)
+
+    html = Coverband::Reporters::HTMLReport.new(@store,
+                                                static: false,
+                                                open_report: false).report
+    refute_match 'rainbow', html
+  end
+
+  test 'generate static HTML report file' do
     @store.send(:save_report, basic_coverage)
 
     reporter = Coverband::Reporters::HTMLReport.new(@store,
-                                                    html: false,
+                                                    static: true,
                                                     open_report: false)
-    Coverband::Utils::HTMLFormatter.any_instance.expects(:format!).once
+    Coverband::Utils::HTMLFormatter.any_instance.expects(:format_static_html!).once
     reporter.report
   end
+
+  test 'generate dynamic content detailed file report' do
+    @store.send(:save_report, basic_coverage_full_path)
+
+    filename = basic_coverage_file_full_path
+    base_path = '/coverage'
+    html = Coverband::Reporters::HTMLReport.new(Coverband.configuration.store,
+                                                filename: filename,
+                                                base_path: base_path,
+                                                open_report: false).file_details
+    assert_match 'Coverage first seen', html
+  end
+
+  test 'generate dynamic content detailed file report handles missing file' do
+    @store.send(:save_report, basic_coverage_full_path)
+
+    filename = 'missing_path'
+    base_path = '/coverage'
+    html = Coverband::Reporters::HTMLReport.new(Coverband.configuration.store,
+                                                filename: filename,
+                                                base_path: base_path,
+                                                open_report: false).file_details
+    assert_match 'File No Longer Available', html
+  end
+
+  test 'generate dynamic content detailed file report does not allow loading real non project files' do
+    @store.send(:save_report, basic_coverage_full_path)
+
+    filename = "#{test_root}/test_helper.rb"
+    base_path = '/coverage'
+    html = Coverband::Reporters::HTMLReport.new(Coverband.configuration.store,
+                                                filename: filename,
+                                                base_path: base_path,
+                                                open_report: false).file_details
+    assert_match 'File No Longer Available', html
+  end
 end