simplecov 0.9.2 → 0.10.0

data/test/faked_project/features/support/env.rb

@@ -1,12 +1,12 @@
-require 'bundler/setup'
+require "bundler/setup"
 
 # We're injecting simplecov_config via aruba in cucumber here
 # depending on what the test case is...
 begin
-  require File.join(File.dirname(__FILE__), 'simplecov_config')
-rescue LoadError => err
+  require File.join(File.dirname(__FILE__), "simplecov_config")
+rescue LoadError
   $stderr.puts "No SimpleCov config file found!"
 end
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/../../lib'))
-require 'faked_project'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "/../../lib"))
+require "faked_project"

data/test/faked_project/lib/faked_project.rb

@@ -4,7 +4,7 @@ class FakedProject
   end
 end
 
-Dir[File.join(File.dirname(__FILE__), 'faked_project/*.rb')].each do |file|
+Dir[File.join(File.dirname(__FILE__), "faked_project/*.rb")].each do |file|
   require file # Require all source files in project dynamically so we can inject some stuff depending on test situation
 end
 

data/test/faked_project/lib/faked_project/some_class.rb

@@ -14,14 +14,13 @@ class SomeClass
     if item == label
       return true
     else
-      raise "Item does not match label"
+      fail "Item does not match label"
     end
-
-  rescue => err
+  rescue
     false
   end
 
-  private
+private
 
   def uncovered
     "private method"

data/test/faked_project/spec/faked_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe FakedProject do
   it "should return proper foo" do
-    expect(FakedProject.foo).to eq('bar')
+    expect(FakedProject.foo).to eq("bar")
   end
 
   it "should test it's framework specific method" do

data/test/faked_project/spec/forking_spec.rb

@@ -0,0 +1,7 @@
+require "spec_helper"
+
+describe "forking" do
+  it do
+    Process.waitpid(Kernel.fork {})
+  end
+end

data/test/faked_project/spec/meta_magic_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe FakedProject do
   it "should have added a class method to FakedProject" do

data/test/faked_project/spec/some_class_spec.rb

@@ -1,13 +1,13 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe SomeClass do
   subject { SomeClass.new("foo") }
 
   it "should be reversible" do
-    expect(subject.reverse).to eq('oof')
+    expect(subject.reverse).to eq("oof")
   end
 
   it "should compare with 'foo'" do
-    expect(subject.compare_with('foo')).to be true
+    expect(subject.compare_with("foo")).to be true
   end
 end

data/test/faked_project/spec/spec_helper.rb

@@ -1,15 +1,11 @@
-require 'bundler/setup'
+require "bundler/setup"
 
 # We're injecting simplecov_config via aruba in cucumber here
 # depending on what the test case is...
 begin
-  require File.join(File.dirname(__FILE__), 'simplecov_config')
-rescue LoadError => err
+  require File.join(File.dirname(__FILE__), "simplecov_config")
+rescue LoadError
   $stderr.puts "No SimpleCov config file found!"
 end
 
-require 'faked_project'
-
-RSpec.configure do |config|
-  # some (optional) config here
-end
+require "faked_project"

data/test/faked_project/test/faked_test.rb

@@ -1,8 +1,8 @@
-require 'test_helper'
+require "test_helper"
 
 class FakedTest < Test::Unit::TestCase
   def test_something
-    assert_equal 'bar', FakedProject.foo
+    assert_equal "bar", FakedProject.foo
   end
 
   def test_framework_specific

data/test/faked_project/test/meta_magic_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class MetaMagicTest < Test::Unit::TestCase
   def test_class_methods

data/test/faked_project/test/some_class_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class SomeClassTest < Test::Unit::TestCase
   def setup
@@ -6,10 +6,10 @@ class SomeClassTest < Test::Unit::TestCase
   end
 
   def test_reverse
-    assert_equal 'oof', @instance.reverse
+    assert_equal "oof", @instance.reverse
   end
 
   def test_comparison
-    assert @instance.compare_with('foo')
+    assert @instance.compare_with("foo")
   end
 end

data/test/faked_project/test/test_helper.rb

@@ -1,16 +1,12 @@
-require 'bundler/setup'
+require "bundler/setup"
 
 # We're injecting simplecov_config via aruba in cucumber here
 # depending on what the test case is...
 begin
-  require File.join(File.dirname(__FILE__), 'simplecov_config')
-rescue LoadError => err
+  require File.join(File.dirname(__FILE__), "simplecov_config")
+rescue LoadError
   $stderr.puts "No SimpleCov config file found!"
 end
 
-require 'faked_project'
-
-require 'test/unit'
-
-class Test::Unit::TestCase
-end
+require "faked_project"
+require "test/unit"

data/test/fixtures/app/controllers/sample_controller.rb

@@ -1,7 +1,7 @@
 # Foo class
 class Foo
   def initialize
-    @foo = 'baz'
+    @foo = "baz"
   end
 
   def bar

data/test/fixtures/app/models/user.rb

@@ -1,7 +1,7 @@
 # Foo class
 class Foo
   def initialize
-    @foo = 'baz'
+    @foo = "baz"
   end
 
   def bar

data/test/fixtures/deleted_source_sample.rb

@@ -1,5 +1,5 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..'))
-require 'lib/simplecov'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", ".."))
+require "lib/simplecov"
 SimpleCov.start { command_name "Test" }
 
 dir = File.expand_path(File.dirname(__FILE__))
@@ -12,4 +12,4 @@ code = %{
 File.open(file, "w") { |f| f.print code }
 load file
 File.unlink file
-raise unless kill_the_buddha(3) == 27
+fail unless kill_the_buddha(3) == 27

data/test/fixtures/frameworks/rspec_bad.rb

@@ -1,8 +1,8 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
-require 'lib/simplecov'
-require 'rspec'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "..", ".."))
+require "lib/simplecov"
+require "rspec"
 SimpleCov.start
-describe 'exit status' do
+describe "exit status" do
   it "should exit with a non-zero exit status when assertion fails" do
     expect(1).to eq(2)
   end

data/test/fixtures/frameworks/rspec_good.rb

@@ -1,8 +1,8 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
-require 'lib/simplecov'
-require 'rspec'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "..", ".."))
+require "lib/simplecov"
+require "rspec"
 SimpleCov.start
-describe 'exit status' do
+describe "exit status" do
   it "should exit with a zero exit status when assertion fails" do
     expect(1).to eq(1)
   end

data/test/fixtures/frameworks/testunit_bad.rb

@@ -1,7 +1,7 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
-require 'lib/simplecov'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "..", ".."))
+require "lib/simplecov"
 SimpleCov.start
-require 'test/unit'
+require "test/unit"
 class FooTest < Test::Unit::TestCase
   def test_foo
     assert false

data/test/fixtures/frameworks/testunit_good.rb

@@ -1,7 +1,7 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
-require 'lib/simplecov'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "..", ".."))
+require "lib/simplecov"
 SimpleCov.start
-require 'test/unit'
+require "test/unit"
 class FooTest < Test::Unit::TestCase
   def test_foo
     assert true

data/test/fixtures/resultset2.rb

@@ -2,4 +2,3 @@
 class Resultset
   VERSION = 2
 end
-

data/test/fixtures/sample.rb

@@ -1,7 +1,7 @@
 # Foo class
 class Foo
   def initialize
-    @foo = 'baz'
+    @foo = "baz"
   end
 
   def bar

data/test/fixtures/utf-8.rb

@@ -1,3 +1,3 @@
 # encoding: utf-8
 
-puts '135°C'
+puts "135°C"

data/test/helper.rb

@@ -1,19 +1,19 @@
-require 'bundler/setup'
-require 'simplecov'
-require 'minitest/autorun'
-require 'shoulda'
+require "bundler/setup"
+require "simplecov"
+require "minitest/autorun"
+require "shoulda"
 
-SimpleCov.coverage_dir('tmp/coverage')
+SimpleCov.coverage_dir("tmp/coverage")
 
 def source_fixture(filename)
-  File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', filename))
+  File.expand_path(File.join(File.dirname(__FILE__), "fixtures", filename))
 end
 
-require 'shoulda_macros'
+require "shoulda_macros"
 Minitest::Test.send :extend, ShouldaMacros
 
 # Taken from http://stackoverflow.com/questions/4459330/how-do-i-temporarily-redirect-stderr-in-ruby
-require 'stringio'
+require "stringio"
 
 def capture_stderr
   # The output stream must be an IO-like object. In this case we capture it in

data/test/test_1_8_fallbacks.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require "helper"
 
 # Tests that verify that on 1.8 versions of ruby, simplecov simply
 # does not launch and does not cause errors on the way
@@ -12,20 +12,20 @@ class Test18FallBacks < Minitest::Test
   end
 
   should "return false when calling SimpleCov.start with a block" do
-    assert_equal false, SimpleCov.start { raise "Shouldn't reach this!?" }
+    assert_equal false, SimpleCov.start { fail "Shouldn't reach this!?" }
   end
 
   should "return false when calling SimpleCov.configure with a block" do
-    assert_equal false, SimpleCov.configure { raise "Shouldn't reach this!?" }
+    assert_equal false, SimpleCov.configure { fail "Shouldn't reach this!?" }
   end
 
   should "allow to define a profile" do
     begin
-      SimpleCov.profiles.define 'testprofile' do
-        add_filter '/config/'
+      SimpleCov.profiles.define "testprofile" do
+        add_filter "/config/"
       end
     rescue => err
       assert false, "Profile definition should have been fine, but raised #{err}"
     end
   end
-end if RUBY_VERSION.start_with? '1.8'
+end if RUBY_VERSION.start_with? "1.8"

data/test/test_command_guesser.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require "helper"
 
 class TestCommandGuesser < Minitest::Test
   def self.should_guess_command_name(expectation, *argv)
@@ -10,10 +10,10 @@ class TestCommandGuesser < Minitest::Test
     end
   end
 
-  should_guess_command_name "Unit Tests", '/some/path/test/units/foo_bar_test.rb', 'test/units/foo.rb', 'test/foo.rb', 'test/{models,helpers,unit}/**/*_test.rb'
-  should_guess_command_name "Functional Tests", '/some/path/test/functional/foo_bar_controller_test.rb', 'test/{controllers,mailers,functional}/**/*_test.rb'
-  should_guess_command_name "Integration Tests", '/some/path/test/integration/foo_bar_controller_test.rb', 'test/integration/**/*_test.rb'
-  should_guess_command_name "Cucumber Features", 'features', 'cucumber', 'cucumber features'
-  should_guess_command_name "RSpec", '/some/path/spec/foo.rb'
-  should_guess_command_name "Unit Tests", 'some_arbitrary_command with arguments' # Because Test::Unit const is defined!
+  should_guess_command_name "Unit Tests", "/some/path/test/units/foo_bar_test.rb", "test/units/foo.rb", "test/foo.rb", "test/{models,helpers,unit}/**/*_test.rb"
+  should_guess_command_name "Functional Tests", "/some/path/test/functional/foo_bar_controller_test.rb", "test/{controllers,mailers,functional}/**/*_test.rb"
+  should_guess_command_name "Integration Tests", "/some/path/test/integration/foo_bar_controller_test.rb", "test/integration/**/*_test.rb"
+  should_guess_command_name "Cucumber Features", "features", "cucumber", "cucumber features"
+  should_guess_command_name "RSpec", "/some/path/spec/foo.rb"
+  should_guess_command_name "Unit Tests", "some_arbitrary_command with arguments" # Because Test::Unit const is defined!
 end if SimpleCov.usable?

data/test/test_deleted_source.rb

@@ -1,11 +1,11 @@
-require 'helper'
+require "helper"
 
 # Test to verify correct handling of deleted files,
 # see issue #9 on github
 class TestDeletedSource < Minitest::Test
   context "A source file which is subsequently deleted" do
     should "not cause an error" do
-      Dir.chdir(File.join(File.dirname(__FILE__), 'fixtures')) do
+      Dir.chdir(File.join(File.dirname(__FILE__), "fixtures")) do
         `ruby deleted_source_sample.rb`
         assert_equal 0, $?.exitstatus
       end

data/test/test_file_list.rb

@@ -1,11 +1,13 @@
-require 'helper'
+require "helper"
 
 class TestFileList < Minitest::Test
   context "With a file list from a result" do
     setup do
-      original_result = {source_fixture('sample.rb') => [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]}
+      original_result = {
+        source_fixture("sample.rb") => [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],
+      }
       @file_list = SimpleCov::Result.new(original_result).files
     end
 
@@ -15,7 +17,7 @@ class TestFileList < Minitest::Test
     should("have 14 lines_of_code") { assert_equal 14, @file_list.lines_of_code }
     should("have 3 skipped_lines")  { assert_equal 3, @file_list.skipped_lines }
 
-    should("have correct covered_percent") { assert_equal 100.0*11/14, @file_list.covered_percent }
-    should("have correct covered_strength") { assert_equal 13.to_f/14, @file_list.covered_strength }
+    should("have correct covered_percent") { assert_equal 100.0 * 11 / 14, @file_list.covered_percent }
+    should("have correct covered_strength") { assert_equal 13.to_f / 14, @file_list.covered_strength }
   end
 end if SimpleCov.usable?

data/test/test_filters.rb

@@ -1,44 +1,60 @@
-require 'helper'
+require "helper"
 
 class TestFilters < Minitest::Test
   context "A source file initialized with some coverage data" do
     setup do
-      @source_file = SimpleCov::SourceFile.new(source_fixture('sample.rb'), [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil])
+      @source_file = SimpleCov::SourceFile.new(source_fixture("sample.rb"), [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil])
     end
 
     should "not match a new SimpleCov::StringFilter 'foobar'" do
-      assert !SimpleCov::StringFilter.new('foobar').matches?(@source_file)
+      assert !SimpleCov::StringFilter.new("foobar").matches?(@source_file)
     end
 
     should "not match a new SimpleCov::StringFilter 'some/path'" do
-      assert !SimpleCov::StringFilter.new('some/path').matches?(@source_file)
+      assert !SimpleCov::StringFilter.new("some/path").matches?(@source_file)
     end
 
     should "match a new SimpleCov::StringFilter 'test/fixtures'" do
-      assert SimpleCov::StringFilter.new('test/fixtures').matches?(@source_file)
+      assert SimpleCov::StringFilter.new("test/fixtures").matches?(@source_file)
     end
 
     should "match a new SimpleCov::StringFilter 'test/fixtures/sample.rb'" do
-      assert SimpleCov::StringFilter.new('test/fixtures/sample.rb').matches?(@source_file)
+      assert SimpleCov::StringFilter.new("test/fixtures/sample.rb").matches?(@source_file)
     end
 
     should "match a new SimpleCov::StringFilter 'sample.rb'" do
-      assert SimpleCov::StringFilter.new('sample.rb').matches?(@source_file)
+      assert SimpleCov::StringFilter.new("sample.rb").matches?(@source_file)
     end
 
     should "not match a new SimpleCov::BlockFilter that is not applicable" do
-      assert !SimpleCov::BlockFilter.new(Proc.new {|s| File.basename(s.filename) == 'foo.rb'}).matches?(@source_file)
+      assert !SimpleCov::BlockFilter.new(proc { |s| File.basename(s.filename) == "foo.rb" }).matches?(@source_file)
     end
 
     should "match a new SimpleCov::BlockFilter that is applicable" do
-      assert SimpleCov::BlockFilter.new(Proc.new {|s| File.basename(s.filename) == 'sample.rb'}).matches?(@source_file)
+      assert SimpleCov::BlockFilter.new(proc { |s| File.basename(s.filename) == "sample.rb" }).matches?(@source_file)
+    end
+
+    should "match a new SimpleCov::ArrayFilter when 'sample.rb' is passed as array" do
+      assert SimpleCov::ArrayFilter.new(["sample.rb"]).matches?(@source_file)
+    end
+
+    should "not match a new SimpleCov::ArrayFilter when a file path different than 'sample.rb' is passed as array" do
+      assert !SimpleCov::ArrayFilter.new(["other_file.rb"]).matches?(@source_file)
+    end
+
+    should "match a new SimpleCov::ArrayFilter when two file paths including 'sample.rb' are passed as array" do
+      assert SimpleCov::ArrayFilter.new(["sample.rb", "other_file.rb"]).matches?(@source_file)
     end
   end
 
   context "with no filters set up and a basic source file in an array" do
     setup do
-      SimpleCov.filters = []
-      @files = [SimpleCov::SourceFile.new(source_fixture('sample.rb'), [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil])]
+      @prev_filters, SimpleCov.filters = SimpleCov.filters, []
+      @files = [SimpleCov::SourceFile.new(source_fixture("sample.rb"), [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil])]
+    end
+
+    teardown do
+      SimpleCov.filters = @prev_filters
     end
 
     should "return 0 items after executing SimpleCov.filtered on files when using a 'sample' string filter" do
@@ -57,14 +73,14 @@ class TestFilters < Minitest::Test
     end
 
     should "return 0 items after executing SimpleCov.filtered on files when using a block filter that returns true" do
-      SimpleCov.add_filter do |src_file|
+      SimpleCov.add_filter do
         true
       end
       assert_equal 0, SimpleCov.filtered(@files).count
     end
 
     should "return 1 item after executing SimpleCov.filtered on files when using an always-false block filter" do
-      SimpleCov.add_filter do |src_file|
+      SimpleCov.add_filter do
         false
       end
       assert_equal 1, SimpleCov.filtered(@files).count