coverband 4.2.0 → 4.2.1

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,79 @@ 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.ignore            = ['notsomething.rb']
+      config.root              = fixtures_root
+      config.ignore            = ['notsomething.rb', 'lib/*']
     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
-    Coverband.configure do |config|
-      config.reporter          = 'scov'
-      config.store             = @store
-      config.s3_bucket         = nil
-      config.ignore            = ['notsomething.rb']
-    end
-    mock_file_hash
+  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 '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

data/test/coverband/reporters/web_test.rb

@@ -37,16 +37,6 @@ if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.0')
         post '/clear'
         assert_equal 301, last_response.status
       end
-
-      test 'collect_coverage' do
-        post '/collect_coverage'
-        assert_equal 301, last_response.status
-      end
-
-      test 'reload_files' do
-        post '/reload_files'
-        assert_equal 301, last_response.status
-      end
     end
   end
 end

data/test/coverband/utils/file_groups_test.rb

@@ -3,16 +3,18 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
 describe Coverband::Utils::FileGroups do
-  FAKE_GEM_PATH = 'fake/gem/path'
+  FAKE_GEM_PATH = '/Users/danmayer/.rvm/gems/ruby-2.6.2/gems'
+  SECONDAY_GEM_PATH = '/Users/danmayer/.rvm/rubies/ruby-2.6.2/lib/ruby/gems/2.6.0/gems'
   subject do
     controller_lines = [nil, 2, 2, 0, nil, nil, 0, nil, nil, nil]
     files = [
       Coverband::Utils::SourceFile.new(source_fixture('sample.rb'), [nil, 1, 1, 1, nil, nil, 1, 1, nil, nil]),
       Coverband::Utils::SourceFile.new(source_fixture('app/models/user.rb'), [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil]),
       Coverband::Utils::SourceFile.new(source_fixture('app/controllers/sample_controller.rb'), controller_lines),
-      Coverband::Utils::SourceFile.new("#{FAKE_GEM_PATH}/gem_name.rb", controller_lines)
+      Coverband::Utils::SourceFile.new("#{FAKE_GEM_PATH}/gem_name-1.0.0/gem_name.rb", controller_lines),
+      Coverband::Utils::SourceFile.new("#{SECONDAY_GEM_PATH}/gem_two_name-1.1.1/gem_two.rb", controller_lines)
     ]
-    Coverband.configuration.expects(:gem_paths).at_least_once.returns([FAKE_GEM_PATH])
+    Coverband.configuration.expects(:gem_paths).at_least_once.returns([FAKE_GEM_PATH, SECONDAY_GEM_PATH])
     Coverband.configuration.track_gems = true
     Coverband::Utils::FileGroups.new(files)
   end
@@ -22,7 +24,11 @@ describe Coverband::Utils::FileGroups do
   end
 
   it 'has gem files' do
-    assert_equal "#{FAKE_GEM_PATH}/gem_name.rb", subject.grouped_results['Gems'].first.first.short_name
+    assert_equal "gem_name-1.0.0", subject.grouped_results['Gems'].first.first.gem_name
+  end
+
+  it 'has gem files from secondary gem paths' do
+    assert_equal "gem_two_name-1.1.1", subject.grouped_results['Gems'][1].first.gem_name
   end
 end
 
@@ -50,6 +56,6 @@ describe Coverband::Utils::FileGroups, :vendored_gems do
   end
 
   it 'does has gem files' do
-    assert_equal 'gem_name.rb', subject.grouped_results['Gems'].first.first.short_name
+    assert_equal '.gem_name.rb', subject.grouped_results['Gems'].first.first.short_name
   end
 end

data/test/coverband/utils/file_list_test.rb

@@ -9,7 +9,7 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
 describe Coverband::Utils::FileList do
   subject do
     original_result = {
-      source_fixture('sample.rb') => [nil, 1, 1, 1, nil, nil, 1, 1, nil, nil],
+      source_fixture('sample.rb') => {'first_updated_at' => Time.at(0), 'data' => [nil, 1, 1, 1, nil, nil, 1, 1, nil, nil]},
       source_fixture('app/models/user.rb') => [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil],
       source_fixture('app/controllers/sample_controller.rb') => [nil, 2, 2, 0, nil, nil, 0, nil, nil, nil]
     }
@@ -44,11 +44,11 @@ describe Coverband::Utils::FileList do
     assert_equal [50.0, 80.0, 100.0], subject.covered_percentages
   end
 
-  it 'has the correct least covered file' do
-    assert subject.least_covered_file.match(/sample_controller.rb/)
-  end
-
   it 'has the correct covered strength' do
     assert_equal 0.9285714285714286, subject.covered_strength
   end
+
+  it 'has correct first_seen_at' do
+    assert_equal Time.at(0), subject.first_seen_at
+  end
 end

data/test/coverband/utils/html_formatter_test.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class HTMLFormatterTest < Minitest::Test
+  def setup
+    super
+    @redis = Redis.new
+    @store = Coverband::Adapters::RedisStore.new(@redis, redis_namespace: 'coverband_test')
+    @store.clear!
+  end
+
+  test 'generate dynamic content hosted html report' do
+    Coverband.configure do |config|
+      config.store             = @store
+      config.ignore            = ['notsomething.rb']
+    end
+    mock_file_hash
+    @store.send(:save_report, basic_coverage_full_path)
+
+    notice = nil
+    base_path = '/coverage'
+    filtered_report_files = Coverband::Reporters::Base.report(@store, {})
+    html = Coverband::Utils::HTMLFormatter.new(filtered_report_files,
+                                               base_path: base_path,
+                                               notice: notice).format_dynamic_html!
+    assert_match 'loading source data', html
+  end
+
+  test 'generate static HTML report file' do
+    Coverband.configure do |config|
+      config.store             = @store
+      config.ignore            = ['notsomething.rb']
+    end
+    mock_file_hash
+    @store.send(:save_report, basic_coverage_full_path)
+
+    filtered_report_files = Coverband::Reporters::Base.report(@store, {})
+    Coverband::Utils::HTMLFormatter.new(filtered_report_files).format_static_html!
+    html = File.read("#{Coverband.configuration.root}/coverage/index.html")
+    assert_match 'Coverage first seen', html
+  end
+end

data/test/coverband/utils/result_test.rb

@@ -48,57 +48,16 @@ describe 'result' do
         assert_equal [80.0, 80.0, 100.0], subject.covered_percentages
       end
 
-      it 'has accurate least covered file' do
-        assert subject.least_covered_file.match(/sample_controller.rb/)
-      end
-
-      [:covered_percent,
-       :covered_percentages,
-       :least_covered_file,
-       :covered_strength,
-       :covered_lines,
-       :missed_lines,
-       :total_lines].each do |msg|
+      %i[covered_percent
+         covered_percentages
+         covered_strength
+         covered_lines
+         missed_lines
+         total_lines].each do |msg|
         it "responds to #{msg}" do
           assert(subject.respond_to?(msg))
         end
       end
-
-      describe 'dumped with to_hash' do
-        it 'is a hash' do
-          assert subject.to_hash.is_a?(Hash)
-        end
-
-        describe 'loaded back with from_hash' do
-          let(:dumped_result) do
-            Coverband::Utils::Result.from_hash(subject.to_hash)
-          end
-
-          it 'has 3 source files' do
-            assert_equal subject.source_files.count, dumped_result.source_files.count
-          end
-
-          it 'has the same covered_percent' do
-            assert_equal subject.covered_percent, dumped_result.covered_percent
-          end
-
-          it 'has the same covered_percentages' do
-            assert_equal subject.covered_percentages, dumped_result.covered_percentages
-          end
-
-          it 'has the same timestamp' do
-            assert_equal subject.created_at.to_i, dumped_result.created_at.to_i
-          end
-
-          it 'has the same command_name' do
-            assert_equal subject.command_name, dumped_result.command_name
-          end
-
-          it 'has the same original_result' do
-            assert_equal subject.original_result, dumped_result.original_result
-          end
-        end
-      end
     end
   end
 end

data/test/coverband/utils/results_test.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+describe 'results' do
+  describe 'with a (mocked) Coverage.result' do
+    let(:source_file) { Coverband::Utils::SourceFile.new(source_fixture('app/models/user.rb'), run_lines) }
+    let(:eager_lines) { [nil, 1, 1, 0, nil, nil, 1, 0, nil, nil] }
+    let(:run_lines) { [nil, nil, nil, 1, nil, nil, nil,nil, nil, nil] }
+    let(:original_result) do
+      orig = {
+        Coverband::MERGED_TYPE => {source_fixture('app/models/user.rb') => eager_lines},
+      }
+      orig.merge!({Coverband::EAGER_TYPE => {source_fixture('app/models/user.rb') => eager_lines}}) if eager_lines
+      orig.merge!({Coverband::RUNTIME_TYPE => {source_fixture('app/models/user.rb') => run_lines}}) if run_lines
+      orig
+    end
+    subject { Coverband::Utils::Results.new(original_result) }
+
+    describe 'runtime relevant lines is supported' do
+      it 'has correct runtime relevant coverage' do
+        assert_equal 50.0, subject.runtime_relevant_coverage(source_file)
+      end
+
+      it 'has correct runtime relevant lines' do
+        assert_equal 2, subject.runtime_relavent_lines(source_file)
+      end
+    end
+
+    describe 'runtime relevant lines when no runtime coverage exists' do
+      let(:run_lines) { nil }
+
+      it 'has correct runtime relevant lines' do
+        assert_equal 0.0, subject.runtime_relevant_coverage(source_file)
+      end
+
+      it 'has correct runtime relevant lines' do
+        assert_equal 2, subject.runtime_relavent_lines(source_file)
+      end
+    end
+
+    describe 'runtime relevant lines when no eager coverage exists' do
+      let(:eager_lines) { nil }
+
+      it 'has correct runtime relevant lines' do
+        assert_equal 100.0, subject.runtime_relevant_coverage(source_file)
+      end
+
+      it 'has correct runtime relevant lines' do
+        assert_equal 1, subject.runtime_relavent_lines(source_file)
+      end
+    end
+  end
+end

data/test/coverband/utils/s3_report_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
 module Coverband

data/test/coverband/utils/source_file_test.rb

@@ -146,4 +146,54 @@ describe Coverband::Utils::SourceFile do
       assert_equal 0.0, subject.covered_percent
     end
   end
+
+  describe 'correctly identifies gems' do
+    COVERAGE_FOR_SKIPPED_AND_EXECUTED_RB = [nil, nil, 1, 1, 0, 1, 1, nil].freeze
+
+    describe 'the word gem in a path' do
+      subject do
+        Coverband::Utils::SourceFile.new('lib/rubocop/cop/gemspec/required_ruby_version.rb', COVERAGE_FOR_SKIPPED_AND_EXECUTED_RB)
+      end
+
+      it 'allows the word gem in path' do
+        assert_equal nil, subject.gem?
+      end
+    end
+
+    describe 'a folder gem in the path' do
+      subject do
+        Coverband::Utils::SourceFile.new('/var/gems/rubocop-0.67.0/lib/rubocop/cop/gemspec/required_ruby_version.rb', COVERAGE_FOR_SKIPPED_AND_EXECUTED_RB)
+      end
+
+      it 'allows the word gem in path' do
+        assert subject.gem?
+      end
+    end
+  end
+
+  describe 'correctly reports gem name' do
+    COVERAGE_FOR_SKIPPED_AND_EXECUTED_RB = [nil, nil, 1, 1, 0, 1, 1, nil].freeze
+
+    describe 'the word gem in a path' do
+      subject do
+        Coverband::Utils::SourceFile.new('lib/rubocop/cop/gemspec/required_ruby_version.rb', COVERAGE_FOR_SKIPPED_AND_EXECUTED_RB)
+      end
+
+      it 'allows the word gem in path' do
+        assert_equal nil, subject.gem_name
+      end
+    end
+
+    describe 'a folder gem in the path' do
+      subject do
+        Coverband::Utils::SourceFile.new('/var/gems/rubocop-0.67.0/lib/rubocop/cop/gemspec/required_ruby_version.rb', COVERAGE_FOR_SKIPPED_AND_EXECUTED_RB)
+      end
+
+      it 'allows the word gem in path' do
+        assert_equal 'rubocop-0.67.0', subject.gem_name
+      end
+    end
+  end
+
+
 end

data/test/dog.rb.erb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class Dog<%=dog_number%>
+
+  def self.bark
+    new.bark
+  end
+
+  def bark
+    'woof'
+  end
+end