Merge pull request #773 from reitermarkus/report-cask-coverage

Also report Cask coverage.

1 files changed, 6 insertions, 14 deletions

diff --git a/Library/Homebrew/test/.simplecov b/Library/Homebrew/test/.simplecov
index 3cbd53943..7b057e878 100644..100755
--- a/Library/Homebrew/test/.simplecov
+++ b/Library/Homebrew/test/.simplecov
@@ -1,18 +1,16 @@
-# vim: filetype=ruby
+#!/usr/bin/env ruby
 
 SimpleCov.start do
-  tests_path = File.dirname(__FILE__)
-
-  minimum_coverage 40 unless ENV["HOMEBREW_TESTS_ONLY"]
-  coverage_dir File.expand_path("#{tests_path}/coverage")
-  root File.expand_path("#{tests_path}/..")
+  coverage_dir File.expand_path("../coverage", File.realpath(__FILE__))
+  root File.expand_path("../..", File.realpath(__FILE__))
 
   # We manage the result cache ourselves and the default of 10 minutes can be
   # too low (particularly on Travis CI), causing results from some integration
   # tests to be dropped. This causes random fluctuations in test coverage.
   merge_timeout 86400
 
-  add_filter "/Homebrew/cask/"
+  add_filter "/Homebrew/cask/spec/"
+  add_filter "/Homebrew/cask/test/"
   add_filter "/Homebrew/compat/"
   add_filter "/Homebrew/test/"
   add_filter "/Homebrew/vendor/"
@@ -33,6 +31,7 @@ SimpleCov.start do
 
   # Add groups and the proper project name to the output.
   project_name "Homebrew"
+  add_group "Cask", "/Homebrew/cask/"
   add_group "Commands", %w[/Homebrew/cmd/ /Homebrew/dev-cmd/]
   add_group "Extensions", "/Homebrew/extend/"
   add_group "OS", %w[/Homebrew/extend/os/ /Homebrew/os/]
@@ -44,10 +43,3 @@ SimpleCov.start do
     /Homebrew/test.rb
   ]
 end
-
-# Don't use Coveralls outside of CI, as it will override SimpleCov's default
-# formatter causing the `index.html` not to be written once all tests finish.
-if RUBY_VERSION.split(".").first.to_i >= 2 && !ENV["HOMEBREW_INTEGRATION_TEST"] && ENV["CI"]
-  require "coveralls"
-  Coveralls.wear!
-end