simplecov 0.9.1 → 0.10.0

data/features/rspec_groups_and_filters_complex.feature

@@ -15,6 +15,7 @@ Feature: Sophisticated grouping and filtering on RSpec
           src_file.filename =~ /MaGiC/i
         end
         add_group 'By string', 'project/meta_magic'
+        add_group 'By array', ['project/meta_magic']
 
         add_filter 'faked_project.rb'
         # Remove all files that include "describe" in their source
@@ -29,6 +30,7 @@ Feature: Sophisticated grouping and filtering on RSpec
       | All Files | 100.0%   | 1     |
       | By block  | 100.0%   | 1     |
       | By string | 100.0%   | 1     |
+      | By array  | 100.0%   | 1     |
 
     And I should see the source files:
       | name                            | coverage |

data/features/rspec_groups_using_filter_class.feature

@@ -24,10 +24,10 @@ Feature: Grouping on RSpec using a custom filter class
     When I open the coverage report generated with `bundle exec rspec spec`
     Then I should see the groups:
       | name             | coverage | files |
-      | All Files        | 91.23%   | 6     |
+      | All Files        | 91.8%    | 7     |
       | By filter class  | 78.26%   | 2     |
       | By string        | 100.0%   | 1     |
-      | Ungrouped        | 100.0%   | 3     |
+      | Ungrouped        | 100.0%   | 4     |
 
     And I should see the source files:
       | name                                    | coverage |
@@ -35,6 +35,7 @@ Feature: Grouping on RSpec using a custom filter class
       | lib/faked_project/some_class.rb         | 80.0 %   |
       | lib/faked_project.rb                    | 100.0 %  |
       | lib/faked_project/meta_magic.rb         | 100.0 %  |
+      | spec/forking_spec.rb                    | 100.0 %  |
       | spec/meta_magic_spec.rb                 | 100.0 %  |
       | spec/some_class_spec.rb                 | 100.0 %  |
 

data/features/step_definitions/html_steps.rb

@@ -1,15 +1,14 @@
 module GroupHelpers
   def available_groups
-    all('#content .file_list_container')
+    all("#content .file_list_container")
   end
 
   def available_source_files
-    all('.source_files .source_table')
+    all(".source_files .source_table")
   end
 end
 World(GroupHelpers)
 
-
 Then /^I should see the groups:$/ do |table|
   expected_groups = table.hashes
   # Given group names should be the same number than those rendered in report
@@ -18,8 +17,8 @@ Then /^I should see the groups:$/ do |table|
   # Verify each of the expected groups has a file list container and corresponding title and coverage number
   # as well as the correct number of links to files.
   expected_groups.each do |group|
-    with_scope "#content ##{group["name"].gsub(/[^a-z]/i, '')}.file_list_container" do
-      file_count_in_group = page.all('a.src_link').count
+    with_scope "#content ##{group['name'].gsub(/[^a-z]/i, '')}.file_list_container" do
+      file_count_in_group = page.all("a.src_link").count
       expect(file_count_in_group).to eq(group["files"].to_i)
 
       with_scope "h2" do
@@ -35,9 +34,9 @@ Then /^I should see the source files:$/ do |table|
   expect(expected_files.length).to eq(available_source_files.count)
 
   # Find all filenames and their coverage present in coverage report
-  files = available_source_files.map {|f| {"name" => f.find('h3').text, "coverage" => f.find('h4 > span').text} }
+  files = available_source_files.map { |f| {"name" => f.find("h3").text, "coverage" => f.find("h4 > span").text} }
 
-  expect(files.sort_by {|hsh| hsh["name"] }).to eq(expected_files.sort_by {|hsh| hsh["name"] })
+  expect(files.sort_by { |hsh| hsh["name"] }).to eq(expected_files.sort_by { |hsh| hsh["name"] })
 end
 
 Then /^there should be (\d+) skipped lines in the source files$/ do |expected_count|

data/features/step_definitions/simplecov_steps.rb

@@ -2,7 +2,8 @@
 # The test project is using separate config files to avoid specifying all of
 # test/spec_helper in the features every time.
 Given /^SimpleCov for (.*) is configured with:$/ do |framework, config_body|
-  framework_dir = case framework
+  framework_dir = begin
+    case framework
     when /RSpec/i
       "spec"
     when /Test\/Unit/i
@@ -10,53 +11,54 @@ Given /^SimpleCov for (.*) is configured with:$/ do |framework, config_body|
     when /Cucumber/i
       "features/support"
     else
-      raise ArgumentError, "Could not identify test framework #{framework}!"
+      fail ArgumentError, "Could not identify test framework #{framework}!"
+    end
   end
 
-  steps %Q{
+  steps %(
     Given a file named "#{framework_dir}/simplecov_config.rb" with:
       """
       #{config_body}
       """
-  }
+    )
 end
 
 When /^I open the coverage report generated with `([^`]+)`$/ do |command|
-  steps %Q{
+  steps %(
     When I successfully run `#{command}`
     Then a coverage report should have been generated
     When I open the coverage report
-  }
+    )
 end
 
 Then /^a coverage report should have been generated(?: in "([^"]*)")?$/ do |coverage_dir|
-  coverage_dir ||= 'coverage'
-  steps %Q{
+  coverage_dir ||= "coverage"
+  steps %(
     Then the output should contain "Coverage report generated"
     And a directory named "#{coverage_dir}" should exist
     And the following files should exist:
       | #{coverage_dir}/index.html      |
       | #{coverage_dir}/.resultset.json |
-  }
+    )
 end
 
 Then /^no coverage report should have been generated(?: in "([^"]*)")?$/ do |coverage_dir|
-  coverage_dir ||= 'coverage'
-  steps %Q{
+  coverage_dir ||= "coverage"
+  steps %(
     Then the output should not contain "Coverage report generated"
     And a directory named "#{coverage_dir}" should not exist
     And the following files should not exist:
       | #{coverage_dir}/index.html      |
       | #{coverage_dir}/.resultset.json |
-  }
+    )
 end
 
 Then /^the report should be based upon:$/ do |table|
   frameworks = table.raw.flatten
-  steps %Q{
-    Then the output should contain "Coverage report generated for #{frameworks.join(", ")}"
-    And I should see "using #{frameworks.join(", ")}" within "#footer"
-  }
+  steps %(
+    Then the output should contain "Coverage report generated for #{frameworks.join(', ')}"
+    And I should see "using #{frameworks.join(', ')}" within "#footer"
+    )
 end
 
 # This is neccessary to ensure timing-dependant tests like the merge timeout

data/features/step_definitions/transformers.rb

@@ -6,8 +6,8 @@
 # This is due to the fact that coverage will not include the first loaded spec/test file.
 # To get predictable coverage results, we need to know which one that is...
 #
-Transform "bundle exec rspec spec" do |t|
+Transform "bundle exec rspec spec" do |_|
   files = nil # Avoid shadowing
-  in_current_dir { files = Dir['spec/**/*_spec.rb'] }
+  in_current_dir { files = Dir["spec/**/*_spec.rb"] }
   "bundle exec rspec #{files.sort.join(' ')}"
 end

data/features/step_definitions/web_steps.rb

@@ -6,7 +6,7 @@ end
 World(WithinHelpers)
 
 When /^I open the coverage report$/ do
-  visit '/'
+  visit "/"
 end
 
 Given /^(?:|I )am on (.+)$/ do |path|
@@ -38,7 +38,7 @@ end
 Then /^(?:|I )should see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
   regexp = Regexp.new(regexp)
   with_scope(selector) do
-    expect(page).to have_xpath('//*', :text => regexp)
+    expect(page).to have_xpath("//*", :text => regexp)
   end
 end
 
@@ -51,12 +51,12 @@ end
 Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
   regexp = Regexp.new(regexp)
   with_scope(selector) do
-    expect(page).to have_no_xpath('//*', :text => regexp)
+    expect(page).to have_no_xpath("//*", :text => regexp)
   end
 end
 
 Then /^show me the page$/ do
-  save_and_open_page
+  save_and_open_page # rubocop:disable Lint/Debugger
 end
 
 Then /^print the page$/ do

data/features/support/env.rb

@@ -1,36 +1,39 @@
-unless '1.9'.respond_to?(:encoding)
+if RUBY_VERSION < "1.9"
   $stderr.puts "Sorry, Cucumber features are only meant to run on Ruby 1.9+ :("
   exit 0
 end
 
-require 'bundler'
+require "bundler"
 Bundler.setup
-require 'aruba/cucumber'
-require 'aruba/jruby' if RUBY_ENGINE == 'jruby'
-require 'capybara/cucumber'
-require 'phantomjs/poltergeist'
+require "aruba/cucumber"
+require "aruba/jruby" if RUBY_ENGINE == "jruby"
+require "capybara/cucumber"
+require "minitest/autorun"
+require "phantomjs/poltergeist"
 
 # Fake rack app for capybara that just returns the latest coverage report from aruba temp project dir
 Capybara.app = lambda { |env|
-  request_path = env['REQUEST_PATH'] || '/'
-  request_path = '/index.html' if request_path == '/'
-
-  [200, {'Content-Type' => 'text/html'},
-    [File.read(File.join(File.dirname(__FILE__), '../../tmp/aruba/project/coverage', request_path))]]
+  request_path = env["REQUEST_PATH"] || "/"
+  request_path = "/index.html" if request_path == "/"
+  [
+    200,
+    {"Content-Type" => "text/html"},
+    [File.read(File.join(File.dirname(__FILE__), "../../tmp/aruba/project/coverage", request_path))],
+  ]
 }
 
 Capybara.default_driver = Capybara.javascript_driver = :poltergeist
 
 Before do
   # JRuby takes it's time... See https://github.com/cucumber/aruba/issues/134
-  @aruba_timeout_seconds = RUBY_ENGINE == 'jruby' ? 60 : 20
+  @aruba_timeout_seconds = RUBY_ENGINE == "jruby" ? 60 : 20
 
   this_dir = File.dirname(__FILE__)
 
   # Clean up and create blank state for fake project
   in_current_dir do
-    FileUtils.rm_rf 'project'
-    FileUtils.cp_r File.join(this_dir, '../../test/faked_project/'), 'project'
+    FileUtils.rm_rf "project"
+    FileUtils.cp_r File.join(this_dir, "../../test/faked_project/"), "project"
   end
 
   step 'I cd to "project"'
@@ -39,6 +42,6 @@ end
 # Workaround for https://github.com/cucumber/aruba/pull/125
 Aruba.configure do |config|
   config.before_cmd do
-    set_env('JRUBY_OPTS', '-X-C --1.9')
+    set_env("JRUBY_OPTS", "-X-C --1.9")
   end
 end

data/lib/simplecov/command_guesser.rb

@@ -1,32 +1,32 @@
 #
 # Helper that tries to find out what test suite is running (for SimpleCov.command_name)
 #
-module SimpleCov::CommandGuesser
-  class << self
-    # Storage for the original command line call that invoked the test suite.
-    # This has got to be stored as early as possible because i.e. rake and test/unit 2
-    # have a habit of tampering with ARGV, which makes i.e. the automatic distinction
-    # between rails unit/functional/integration tests impossible without this cached
-    # item.
-    attr_accessor :original_run_command
+module SimpleCov
+  module CommandGuesser
+    class << self
+      # Storage for the original command line call that invoked the test suite.
+      # This has got to be stored as early as possible because i.e. rake and test/unit 2
+      # have a habit of tampering with ARGV, which makes i.e. the automatic distinction
+      # between rails unit/functional/integration tests impossible without this cached
+      # item.
+      attr_accessor :original_run_command
 
-    def guess
-      from_env || from_command_line_options || from_defined_constants
-    end
+      def guess
+        from_env || from_command_line_options || from_defined_constants
+      end
 
     private
 
-    def from_env
-      # If being run from inside parallel_tests set the command name according to the process number
-      if ENV['PARALLEL_TEST_GROUPS'] && ENV['TEST_ENV_NUMBER']
-        number = ENV['TEST_ENV_NUMBER']
-        number = '1' if number == ''
+      def from_env
+        # If being run from inside parallel_tests set the command name according to the process number
+        return unless ENV["PARALLEL_TEST_GROUPS"] && ENV["TEST_ENV_NUMBER"]
+        number = ENV["TEST_ENV_NUMBER"]
+        number = "1" if number.empty?
         "(#{number}/#{ENV['PARALLEL_TEST_GROUPS']})"
       end
-    end
 
-    def from_command_line_options
-      case original_run_command
+      def from_command_line_options
+        case original_run_command
         when /test\/functional\//, /test\/\{.*functional.*\}\//
           "Functional Tests"
         when /test\/integration\//
@@ -37,23 +37,22 @@ module SimpleCov::CommandGuesser
           "RSpec"
         when /cucumber/, /features/
           "Cucumber Features"
-        else
-          nil
+        end
       end
-    end
 
-    def from_defined_constants
-      # If the command regexps fail, let's try checking defined constants.
-      if defined?(RSpec)
-        "RSpec"
-      elsif defined?(Test::Unit)
-        "Unit Tests"
-      elsif defined?(MiniTest)
-        "MiniTest"
-      else
-        # TODO: Provide link to docs/wiki article
-        warn "SimpleCov failed to recognize the test framework and/or suite used. Please specify manually using SimpleCov.command_name 'Unit Tests'."
-        'Unknown Test Framework'
+      def from_defined_constants
+        # If the command regexps fail, let's try checking defined constants.
+        if defined?(RSpec)
+          "RSpec"
+        elsif defined?(Test::Unit)
+          "Unit Tests"
+        elsif defined?(MiniTest)
+          "MiniTest"
+        else
+          # TODO: Provide link to docs/wiki article
+          warn "SimpleCov failed to recognize the test framework and/or suite used. Please specify manually using SimpleCov.command_name 'Unit Tests'."
+          "Unknown Test Framework"
+        end
       end
     end
   end