simplecov 0.7.1 → 0.8.0.pre

data/lib/simplecov/no_defaults.rb

@@ -0,0 +1,2 @@
+ENV['SIMPLECOV_NO_DEFAULTS'] = 'yes, no defaults'
+require 'simplecov'

data/lib/simplecov/{adapters.rb → profiles.rb}

@@ -1,29 +1,29 @@
 #
-# Adapters are glorified SimpleCov configuration procs that can be easily
+# Profiles are SimpleCov configuration procs that can be easily
 # loaded using SimpleCov.start :rails and defined using
-#   SimpleCov.adapters.define :foo do
+#   SimpleCov.profiles.define :foo do
 #     # SimpleCov configuration here, same as in  SimpleCov.configure
 #   end
 #
-class SimpleCov::Adapters < Hash
+class SimpleCov::Profiles < Hash
   #
-  # Define a SimpleCov adapter:
-  #   SimpleCov.adapters.define 'rails' do
+  # Define a SimpleCov profile:
+  #   SimpleCov.profiles.define 'rails' do
   #     # Same as SimpleCov.configure do .. here
   #   end
   #
   def define(name, &blk)
     name = name.to_sym
-    raise "SimpleCov Adapter '#{name}' is already defined" unless self[name].nil?
+    raise "SimpleCov Profile '#{name}' is already defined" unless self[name].nil?
     self[name] = blk
   end
 
   #
-  # Applies the adapter of given name on SimpleCov.configure
+  # Applies the profile of given name on SimpleCov.configure
   #
   def load(name)
     name = name.to_sym
-    raise "Could not find SimpleCov Adapter called '#{name}'" unless has_key?(name)
+    raise "Could not find SimpleCov Profile called '#{name}'" unless has_key?(name)
     SimpleCov.configure(&self[name])
   end
 end

data/lib/simplecov/result.rb

@@ -19,10 +19,18 @@ module SimpleCov
     # Initialize a new SimpleCov::Result from given Coverage.result (a Hash of filenames each containing an array of
     # coverage data)
     def initialize(original_result)
-      @original_result = original_result.freeze
-      @files = SimpleCov::FileList.new(original_result.map do |filename, coverage|
+      @original_result = original_result.dup
+
+      # Squeeze filepaths (i.e. "/a/b/../c" becomes "/a/c")
+      @original_result.keys.each do |filename|
+        expanded_filename = File.expand_path filename
+        @original_result[expanded_filename] = @original_result.delete filename
+      end
+
+      @files = SimpleCov::FileList.new(@original_result.map do |filename, coverage|
         SimpleCov::SourceFile.new(filename, coverage) if File.file?(filename)
       end.compact.sort_by(&:filename))
+
       filter!
     end
 

data/lib/simplecov/source_file.rb

@@ -30,7 +30,6 @@ module SimpleCov
         raise ArgumentError, "Only Fixnum and nil accepted for coverage" unless coverage.kind_of?(Fixnum) or coverage.nil?
         @src, @line_number, @coverage = src, line_number, coverage
         @skipped = false
-        @src.encode!('UTF-8', 'UTF-8', :invalid => :replace) if @src.respond_to?(:encode!)
       end
 
       # Returns true if this is a line that should have been covered, but was not
@@ -79,7 +78,7 @@ module SimpleCov
 
     def initialize(filename, coverage)
       @filename, @coverage = filename, coverage
-      File.open(filename, "r:UTF-8") {|f| @src = f.readlines }
+      File.open(filename, "rb") {|f| @src = f.readlines }
     end
 
     # Returns all source lines for this file as instances of SimpleCov::SourceFile::Line,
@@ -114,7 +113,7 @@ module SimpleCov
       if relevant_lines == 0
         0
       else
-        (covered_lines.count) * 100 / relevant_lines.to_f
+        (covered_lines.count) * 100.0 / relevant_lines.to_f
       end
     end
 

data/lib/simplecov/version.rb

@@ -1,3 +1,3 @@
 module SimpleCov
-  VERSION = "0.7.1"
+  VERSION = "0.8.0.pre"
 end

data/simplecov.gemspec

@@ -9,18 +9,17 @@ Gem::Specification.new do |gem|
   gem.authors     = ["Christoph Olszowka"]
   gem.email       = ['christoph at olszowka de']
   gem.homepage    = 'http://github.com/colszowka/simplecov'
-  gem.description = %Q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
+  gem.description = %Q{Code coverage for Ruby 1.9+ with a powerful configuration library and automatic merging of coverage across test suites}
   gem.summary     = gem.description
+  gem.license     = "MIT"
 
-  gem.add_dependency 'multi_json', '~> 1.0'
+  gem.add_dependency 'multi_json'
   gem.add_dependency 'simplecov-html', '~> 0.7.1'
-  gem.add_development_dependency 'aruba'
-  gem.add_development_dependency 'capybara'
-  gem.add_development_dependency 'appraisal'
-  gem.add_development_dependency 'cucumber', '>= 1.1.4'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'shoulda'
+
+  gem.add_development_dependency 'appraisal', '~> 0.5.1'
+  gem.add_development_dependency 'rake', '~> 10.0.3'
+  gem.add_development_dependency 'rspec', '~> 2.13.0'
+  gem.add_development_dependency 'shoulda', '~> 3.4.0'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/faked_project/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'simplecov', :path => '../../../'
 gem 'rake'

data/test/helper.rb

@@ -13,7 +13,6 @@ class Test::Unit::TestCase
   # Keep 1.8-rubies from complaining about missing tests in each file that covers only 1.9 functionality
   def default_test
   end
-
 end
 
 require 'shoulda_macros'

data/test/shoulda_macros.rb

@@ -1,14 +1,4 @@
 module ShouldaMacros
-  #
-  # Simple block helper for running certain tests only on specific ruby versions.
-  # The given strings will be regexp-matched against RUBY_VERSION
-  #
-  def on_ruby(*ruby_versions)
-    context "On Ruby #{RUBY_VERSION}" do
-      yield
-    end if ruby_versions.any? {|v| RUBY_VERSION =~ /#{v}/ }
-  end
-
   def should_be(boolean_flag)
     should "be #{boolean_flag}" do
       assert_equal true, subject.send(boolean_flag)

data/test/test_1_8_fallbacks.rb

@@ -7,27 +7,25 @@ require 'helper'
 # be called in a test/spec-helper simplecov config block
 #
 class Test18FallBacks < Test::Unit::TestCase
-  on_ruby '1.8' do
-    should "return false when calling SimpleCov.start" do
-      assert_equal false, SimpleCov.start
-    end
+  should "return false when calling SimpleCov.start" do
+    assert_equal false, SimpleCov.start
+  end
 
-    should "return false when calling SimpleCov.start with a block" do
-      assert_equal false, SimpleCov.start { raise "Shouldn't reach this!?" }
-    end
+  should "return false when calling SimpleCov.start with a block" do
+    assert_equal false, SimpleCov.start { raise "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!?" }
-    end
+  should "return false when calling SimpleCov.configure with a block" do
+    assert_equal false, SimpleCov.configure { raise "Shouldn't reach this!?" }
+  end
 
-    should "allow to define an adapter" do
-      begin
-        SimpleCov.adapters.define 'testadapter' do
-          add_filter '/config/'
-        end
-      rescue => err
-        assert false, "Adapter definition should have been fine, but raised #{err}"
+  should "allow to define a profile" do
+    begin
+      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
+end if RUBY_VERSION.start_with? '1.8'

data/test/test_command_guesser.rb

@@ -1,21 +1,19 @@
 require 'helper'
 
 class TestCommandGuesser < Test::Unit::TestCase
-  on_ruby '1.9' do
-    def self.should_guess_command_name(expectation, *argv)
-      argv.each do |args|
-        should "return '#{expectation}' for '#{args}'" do
-          SimpleCov::CommandGuesser.original_run_command = args
-          assert_equal expectation, SimpleCov::CommandGuesser.guess
-        end
+  def self.should_guess_command_name(expectation, *argv)
+    argv.each do |args|
+      should "return '#{expectation}' for '#{args}'" do
+        SimpleCov::CommandGuesser.original_run_command = args
+        assert_equal expectation, SimpleCov::CommandGuesser.guess
       end
     end
-
-    should_guess_command_name "Unit Tests", '/some/path/test/units/foo_bar_test.rb', 'test/units/foo.rb', 'test/foo.rb'
-    should_guess_command_name "Functional Tests", '/some/path/test/functional/foo_bar_controller_test.rb'
-    should_guess_command_name "Integration Tests", '/some/path/test/integration/foo_bar_controller_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
-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!
+end if SimpleCov.usable?

data/test/test_deleted_source.rb

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

data/test/test_file_list.rb

@@ -1,24 +1,22 @@
 require 'helper'
 
 class TestFileList < Test::Unit::TestCase
-  on_ruby "1.9" do
-    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, 1, 1, 1, nil, nil, 1, 0, nil, nil]}
-        @file_list = SimpleCov::Result.new(original_result).files
-      end
+  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, 1, 1, 1, nil, nil, 1, 0, nil, nil]}
+      @file_list = SimpleCov::Result.new(original_result).files
+    end
 
-      should("have 13 covered_lines") { assert_equal 13, @file_list.covered_lines }
-      should("have 2 missed_lines")   { assert_equal 2, @file_list.missed_lines }
-      should("have 18 never_lines")   { assert_equal 18, @file_list.never_lines }
-      should("have 15 lines_of_code") { assert_equal 15, @file_list.lines_of_code }
-      should("have 3 skipped_lines")  { assert_equal 3, @file_list.skipped_lines }
+    should("have 13 covered_lines") { assert_equal 13, @file_list.covered_lines }
+    should("have 2 missed_lines")   { assert_equal 2, @file_list.missed_lines }
+    should("have 18 never_lines")   { assert_equal 18, @file_list.never_lines }
+    should("have 15 lines_of_code") { assert_equal 15, @file_list.lines_of_code }
+    should("have 3 skipped_lines")  { assert_equal 3, @file_list.skipped_lines }
 
-      should "have correct covered_percent" do
-        assert_equal 100.0*13/15, @file_list.covered_percent
-      end
+    should "have correct covered_percent" do
+      assert_equal 100.0*13/15, @file_list.covered_percent
     end
   end
-end
+end if SimpleCov.usable?

data/test/test_filters.rb

@@ -1,80 +1,78 @@
 require 'helper'
 
 class TestFilters < Test::Unit::TestCase
-  on_ruby '1.9' do
-    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])
-      end
+  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])
+    end
 
-      should "not match a new SimpleCov::StringFilter 'foobar'" do
-        assert !SimpleCov::StringFilter.new('foobar').matches?(@source_file)
-      end
+    should "not match a new SimpleCov::StringFilter 'foobar'" do
+      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)
-      end
+    should "not match a new SimpleCov::StringFilter 'some/path'" do
+      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)
-      end
+    should "match a new SimpleCov::StringFilter 'test/fixtures'" do
+      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)
-      end
+    should "match a new SimpleCov::StringFilter 'test/fixtures/sample.rb'" do
+      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)
-      end
+    should "match a new SimpleCov::StringFilter 'sample.rb'" do
+      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)
-      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)
+    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)
-      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)
     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])]
-      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])]
+    end
 
-      should "return 0 items after executing SimpleCov.filtered on files when using a 'sample' string filter" do
-        SimpleCov.add_filter "sample"
-        assert_equal 0, SimpleCov.filtered(@files).count
-      end
+    should "return 0 items after executing SimpleCov.filtered on files when using a 'sample' string filter" do
+      SimpleCov.add_filter "sample"
+      assert_equal 0, SimpleCov.filtered(@files).count
+    end
 
-      should "return 0 items after executing SimpleCov.filtered on files when using a 'test/fixtures/' string filter" do
-        SimpleCov.add_filter "test/fixtures"
-        assert_equal 0, SimpleCov.filtered(@files).count
-      end
+    should "return 0 items after executing SimpleCov.filtered on files when using a 'test/fixtures/' string filter" do
+      SimpleCov.add_filter "test/fixtures"
+      assert_equal 0, SimpleCov.filtered(@files).count
+    end
 
-      should "return 1 item after executing SimpleCov.filtered on files when using a 'fooo' string filter" do
-        SimpleCov.add_filter "fooo"
-        assert_equal 1, SimpleCov.filtered(@files).count
-      end
+    should "return 1 item after executing SimpleCov.filtered on files when using a 'fooo' string filter" do
+      SimpleCov.add_filter "fooo"
+      assert_equal 1, SimpleCov.filtered(@files).count
+    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|
-          true
-        end
-        assert_equal 0, SimpleCov.filtered(@files).count
+    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|
+        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|
-          false
-        end
-        assert_equal 1, SimpleCov.filtered(@files).count
+    should "return 1 item after executing SimpleCov.filtered on files when using an always-false block filter" do
+      SimpleCov.add_filter do |src_file|
+        false
       end
+      assert_equal 1, SimpleCov.filtered(@files).count
+    end
 
-      should "return a FileList after filtering" do
-        SimpleCov.add_filter "fooo"
-        assert_equal SimpleCov::FileList, SimpleCov.filtered(@files).class
-      end
+    should "return a FileList after filtering" do
+      SimpleCov.add_filter "fooo"
+      assert_equal SimpleCov::FileList, SimpleCov.filtered(@files).class
     end
   end
-end
+end if SimpleCov.usable?

data/test/test_merge_helpers.rb

@@ -1,107 +1,105 @@
 require 'helper'
 
 class TestMergeHelpers < Test::Unit::TestCase
-  on_ruby '1.9' do
-    context "With two faked coverage resultsets" do
+  context "With two faked coverage resultsets" do
+    setup do
+      SimpleCov.use_merging true
+      @resultset1 = {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, 1, 1, 1, nil, nil, 1, 0, nil, nil],
+          source_fixture('resultset1.rb') => [1, 1, 1, 1]}
+
+      @resultset2 = {source_fixture('sample.rb') => [1, nil, 1, 1, nil, nil, 1, 1, nil, nil],
+          source_fixture('app/models/user.rb') => [nil, 1, 5, 1, nil, nil, 1, 0, nil, nil],
+          source_fixture('app/controllers/sample_controller.rb') => [nil, 3, 1, nil, nil, nil, 1, 0, nil, nil],
+          source_fixture('resultset2.rb') => [nil, 1, 1, nil]}
+    end
+
+    context "a merge" do
       setup do
-        SimpleCov.use_merging true
-        @resultset1 = {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, 1, 1, 1, nil, nil, 1, 0, nil, nil],
-            source_fixture('resultset1.rb') => [1, 1, 1, 1]}
-
-        @resultset2 = {source_fixture('sample.rb') => [1, nil, 1, 1, nil, nil, 1, 1, nil, nil],
-            source_fixture('app/models/user.rb') => [nil, 1, 5, 1, nil, nil, 1, 0, nil, nil],
-            source_fixture('app/controllers/sample_controller.rb') => [nil, 3, 1, nil, nil, nil, 1, 0, nil, nil],
-            source_fixture('resultset2.rb') => [nil, 1, 1, nil]}
+        assert @merged = @resultset1.merge_resultset(@resultset2)
       end
 
-      context "a merge" do
-        setup do
-          assert @merged = @resultset1.merge_resultset(@resultset2)
-        end
-
-        should "have proper results for sample.rb" do
-          assert_equal [1, 1, 2, 2, nil, nil, 2, 2, nil, nil], @merged[source_fixture('sample.rb')]
-        end
-
-        should "have proper results for user.rb" do
-          assert_equal [nil, 2, 6, 2, nil, nil, 2, 0, nil, nil], @merged[source_fixture('app/models/user.rb')]
-        end
+      should "have proper results for sample.rb" do
+        assert_equal [1, 1, 2, 2, nil, nil, 2, 2, nil, nil], @merged[source_fixture('sample.rb')]
+      end
 
-        should "have proper results for sample_controller.rb" do
-          assert_equal [nil, 4, 2, 1, nil, nil, 2, 0, nil, nil], @merged[source_fixture('app/controllers/sample_controller.rb')]
-        end
+      should "have proper results for user.rb" do
+        assert_equal [nil, 2, 6, 2, nil, nil, 2, 0, nil, nil], @merged[source_fixture('app/models/user.rb')]
+      end
 
-        should "have proper results for resultset1.rb" do
-          assert_equal [1, 1, 1, 1], @merged[source_fixture('resultset1.rb')]
-        end
+      should "have proper results for sample_controller.rb" do
+        assert_equal [nil, 4, 2, 1, nil, nil, 2, 0, nil, nil], @merged[source_fixture('app/controllers/sample_controller.rb')]
+      end
 
-        should "have proper results for resultset2.rb" do
-          assert_equal [nil, 1, 1, nil], @merged[source_fixture('resultset2.rb')]
-        end
+      should "have proper results for resultset1.rb" do
+        assert_equal [1, 1, 1, 1], @merged[source_fixture('resultset1.rb')]
       end
 
-      # See Github issue #6
-      should "return an empty hash when the resultset cache file is empty" do
-        File.open(SimpleCov::ResultMerger.resultset_path, "w+") {|f| f.puts ""}
-        assert_equal Hash.new, SimpleCov::ResultMerger.resultset
+      should "have proper results for resultset2.rb" do
+        assert_equal [nil, 1, 1, nil], @merged[source_fixture('resultset2.rb')]
       end
+    end
+
+    # See Github issue #6
+    should "return an empty hash when the resultset cache file is empty" do
+      File.open(SimpleCov::ResultMerger.resultset_path, "w+") {|f| f.puts ""}
+      assert_equal Hash.new, SimpleCov::ResultMerger.resultset
+    end
 
-      # See Github issue #6
-      should "return an empty hash when the resultset cache file is not present" do
+    # See Github issue #6
+    should "return an empty hash when the resultset cache file is not present" do
+      system "rm #{SimpleCov::ResultMerger.resultset_path}" if File.exist?(SimpleCov::ResultMerger.resultset_path)
+      assert_equal Hash.new, SimpleCov::ResultMerger.resultset
+    end
+
+    context "and results generated from those" do
+      setup do
         system "rm #{SimpleCov::ResultMerger.resultset_path}" if File.exist?(SimpleCov::ResultMerger.resultset_path)
-        assert_equal Hash.new, SimpleCov::ResultMerger.resultset
+        @result1 = SimpleCov::Result.new(@resultset1)
+        @result1.command_name = "result1"
+        @result2 = SimpleCov::Result.new(@resultset2)
+        @result2.command_name = "result2"
       end
 
-      context "and results generated from those" do
+      context "with stored results" do
         setup do
-          system "rm #{SimpleCov::ResultMerger.resultset_path}" if File.exist?(SimpleCov::ResultMerger.resultset_path)
-          @result1 = SimpleCov::Result.new(@resultset1)
-          @result1.command_name = "result1"
-          @result2 = SimpleCov::Result.new(@resultset2)
-          @result2.command_name = "result2"
+          assert SimpleCov::ResultMerger.store_result(@result1)
+          assert SimpleCov::ResultMerger.store_result(@result2)
         end
 
-        context "with stored results" do
-          setup do
-            assert SimpleCov::ResultMerger.store_result(@result1)
-            assert SimpleCov::ResultMerger.store_result(@result2)
-          end
+        should "have stored data in resultset_path yaml file" do
+          assert File.readlines(SimpleCov::ResultMerger.resultset_path).length > 50
+        end
 
-          should "have stored data in resultset_path yaml file" do
-            assert File.readlines(SimpleCov::ResultMerger.resultset_path).length > 50
-          end
+        should "return a hash containing keys ['result1' and 'result2'] for resultset" do
+          assert_equal ['result1', 'result2'], SimpleCov::ResultMerger.resultset.keys.sort
+        end
 
-          should "return a hash containing keys ['result1' and 'result2'] for resultset" do
-            assert_equal ['result1', 'result2'], SimpleCov::ResultMerger.resultset.keys.sort
-          end
+        should "return proper values for merged_result" do
+          assert_equal [nil, 2, 6, 2, nil, nil, 2, 0, nil, nil], SimpleCov::ResultMerger.merged_result.source_files.find {|s| s.filename =~ /user/}.lines.map(&:coverage)
+        end
 
-          should "return proper values for merged_result" do
-            assert_equal [nil, 2, 6, 2, nil, nil, 2, 0, nil, nil], SimpleCov::ResultMerger.merged_result.source_files.find {|s| s.filename =~ /user/}.lines.map(&:coverage)
+        context "with second result way above the merge_timeout" do
+          setup do
+            @result2.created_at = Time.now - 172800 # two days ago
+            assert SimpleCov::ResultMerger.store_result(@result2)
           end
 
-          context "with second result way above the merge_timeout" do
-            setup do
-              @result2.created_at = Time.now - 172800 # two days ago
-              assert SimpleCov::ResultMerger.store_result(@result2)
-            end
-
-            should "have only one result in SimpleCov::ResultMerger.results" do
-              assert_equal 1, SimpleCov::ResultMerger.results.length
-            end
+          should "have only one result in SimpleCov::ResultMerger.results" do
+            assert_equal 1, SimpleCov::ResultMerger.results.length
           end
+        end
 
-          context "with merging disabled" do
-            setup { SimpleCov.use_merging false }
+        context "with merging disabled" do
+          setup { SimpleCov.use_merging false }
 
-            should "return nil for SimpleCov.result" do
-              assert_nil SimpleCov.result
-            end
+          should "return nil for SimpleCov.result" do
+            assert_nil SimpleCov.result
           end
         end
-
       end
+
     end
   end
-end
+end if SimpleCov.usable?