coverband 4.2.1.rc3 → 4.2.1.rc4

data/test/forked/rails_rake_full_stack_test.rb

@@ -4,6 +4,8 @@ require 'rails'
 class RailsRakeFullStackTest < Minitest::Test
 
   test 'rake tasks shows coverage properly within eager_loading' do
+    store.instance_variable_set(:@redis_namespace, 'coverband_test')
+    store.clear!
     system("COVERBAND_CONFIG=./test/rails#{Rails::VERSION::MAJOR}_dummy/config/coverband.rb bundle exec rake -f test/rails#{Rails::VERSION::MAJOR}_dummy/Rakefile middleware")
     store.instance_variable_set(:@redis_namespace, 'coverband_test')
     store.type = :eager_loading
@@ -13,19 +15,25 @@ class RailsRakeFullStackTest < Minitest::Test
     refute_nil pundit_coverage
     assert_includes pundit_coverage['data'], 1
 
-    store.type = nil
-    pundit_coverage = store.coverage[pundit_file]
-    assert_nil pundit_coverage
+    store.type = Coverband::RUNTIME_TYPE
+    if ENV['SIMULATE_ONESHOT']
+      pundit_coverage = store.get_coverage_report[Coverband::RUNTIME_TYPE][pundit_file]
+      assert pundit_coverage['data'].compact.all? { |el| el == 0}
+    else
+      pundit_coverage = store.coverage[pundit_file]
+      assert_nil pundit_coverage
+    end
   end
 
   test "ignored rake tasks don't add coverage" do
+    store.clear!
     store.instance_variable_set(:@redis_namespace, 'coverband_test')
     store.send(:save_report, basic_coverage_full_path)
     output = `COVERBAND_CONFIG=./test/rails#{Rails::VERSION::MAJOR}_dummy/config/coverband.rb bundle exec rake -f test/rails#{Rails::VERSION::MAJOR}_dummy/Rakefile coverband:clear`
     assert_nil output.match(/Coverband: Reported coverage via thread/)
     coverage_report = store.get_coverage_report
     empty_hash = {}
-    assert_equal empty_hash, coverage_report[nil]
+    assert_equal empty_hash, coverage_report[Coverband::RUNTIME_TYPE]
     assert_equal empty_hash, coverage_report[:eager_loading]
     assert_equal empty_hash, coverage_report[:merged]
   end

data/test/rails4_dummy/config/coverband.rb

@@ -8,4 +8,6 @@ Coverband.configure do |config|
   config.background_reporting_enabled = true
   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/rails5_dummy/config/coverband.rb

@@ -8,4 +8,6 @@ Coverband.configure do |config|
   config.background_reporting_enabled = true
   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/rails_test_helper.rb

@@ -22,8 +22,9 @@ def rails_setup
   ENV['RAILS_ENV'] = 'test'
   require 'rails'
   # coverband must be required after rails
-  load 'coverband/utils/railtie.rb'
   Coverband.configure("./test/rails#{Rails::VERSION::MAJOR}_dummy/config/coverband.rb")
+  load 'coverband/utils/railtie.rb'
+
   require_relative "../test/rails#{Rails::VERSION::MAJOR}_dummy/config/environment"
   require 'capybara/rails'
   # Our coverage report is wrapped in display:none as of now

data/test/test_helper.rb

@@ -19,19 +19,23 @@ require 'pry-byebug'
 require_relative 'unique_files'
 $VERBOSE = original_verbosity
 
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-SimpleCov.start do
-  add_filter 'test/forked'
+unless ENV['ONESHOT'] || ENV['SIMULATE_ONESHOT']
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.start do
+    add_filter 'test/forked'
+  end
+
+  Coveralls.wear!
 end
 
-Coveralls.wear!
 
 module Coverband
   module Test
     def self.reset
       Coverband.configuration.redis_namespace = 'coverband_test'
       Coverband.configuration.store.instance_variable_set(:@redis_namespace, 'coverband_test')
-      [:eager_loading, nil].each do |type|
+      Coverband.configuration.store.class.class_variable_set(:@@path_cache, {})
+      [:eager_loading, :runtime].each do |type|
         Coverband.configuration.store.type = type
         Coverband.configuration.store.clear!
       end
@@ -116,8 +120,17 @@ def test_root
   File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
+###
+# This handles an issue where the store is setup in tests prior to being able to set the namespace
+###
 def store
-  Coverband.configuration.store
+  if Coverband.configuration.store.redis_namespace=='coverband_test'
+    Coverband.configuration.store
+  else
+    Coverband.configuration.redis_namespace = 'coverband_test'
+    Coverband.configuration.instance_variable_set(:@store, nil)
+    Coverband.configuration.store
+  end
 end
 
 # Taken from http://stackoverflow.com/questions/4459330/how-do-i-temporarily-redirect-stderr-in-ruby

data/test/unique_files.rb

@@ -2,15 +2,20 @@
 
 require 'securerandom'
 require 'fileutils'
+require 'erb'
+require 'ostruct'
 
 UNIQUE_FILES_DIR = './test/unique_files'
 
-def require_unique_file(file = 'dog.rb')
+def require_unique_file(file = 'dog.rb', variables = {})
   uuid = SecureRandom.uuid
   dir = "#{UNIQUE_FILES_DIR}/#{uuid}"
-  temp_file = "#{dir}/#{file}"
+  file_name = file.sub('.erb', '')
+  temp_file = "#{dir}/#{file_name}"
   FileUtils.mkdir_p(Pathname.new(temp_file).dirname.to_s)
-  File.open(temp_file, 'w') { |w| w.write(File.read("./test/#{file}")) }
+  file_contents = File.read("./test/#{file}")
+  file_contents = ERB.new(file_contents).result(OpenStruct.new(variables).instance_eval { binding }) if variables.any?
+  File.open(temp_file, 'w') { |w| w.write(file_contents) }
   require temp_file
   Coverband::Utils::FilePathHelper.full_path_to_relative(File.expand_path(temp_file))
 end
@@ -19,6 +24,8 @@ def remove_unique_files
   FileUtils.rm_r(UNIQUE_FILES_DIR) if File.exist?(UNIQUE_FILES_DIR)
 end
 
-Minitest.after_run do
-  remove_unique_files
+if defined?(Minitest)
+  Minitest.after_run do
+    remove_unique_files
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 4.2.1.rc3
+  version: 4.2.1.rc4
 platform: ruby
 authors:
 - Dan Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -387,6 +387,7 @@ files:
 - test/coverband/utils/source_file_line_test.rb
 - test/coverband/utils/source_file_test.rb
 - test/dog.rb
+- test/dog.rb.erb
 - test/fake_app/basic_rack.rb
 - test/fixtures/app/controllers/sample_controller.rb
 - test/fixtures/app/models/user.rb
@@ -444,8 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rack middleware to help measure production code usage (LOC runtime usage)
@@ -484,6 +484,7 @@ test_files:
 - test/coverband/utils/source_file_line_test.rb
 - test/coverband/utils/source_file_test.rb
 - test/dog.rb
+- test/dog.rb.erb
 - test/fake_app/basic_rack.rb
 - test/fixtures/app/controllers/sample_controller.rb
 - test/fixtures/app/models/user.rb