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

Also report Cask coverage.

4 files changed, 15 insertions, 16 deletions

diff --git a/Library/Homebrew/cask/.simplecov b/Library/Homebrew/cask/.simplecov
index e1a2a4001..d1b045262 100644..120000
--- a/Library/Homebrew/cask/.simplecov
+++ b/Library/Homebrew/cask/.simplecov
@@ -1,6 +1 @@
-SimpleCov.start do
-  add_filter 'lib/vendor/'
-  add_filter 'doc/'
-  add_filter 'spec/'
-  add_filter 'test/'
-end
+../test/.simplecov
\ No newline at end of file
diff --git a/Library/Homebrew/cask/Rakefile b/Library/Homebrew/cask/Rakefile
index 6a6f76e6f..7a276b347 100644
--- a/Library/Homebrew/cask/Rakefile
+++ b/Library/Homebrew/cask/Rakefile
@@ -1,4 +1,3 @@
-require "coveralls/rake/task"
 require "rake/testtask"
 require "rspec/core/rake_task"
 require "rubocop/rake_task"
@@ -20,16 +19,21 @@ namespace :test do
 
   desc "Run tests for minitest and RSpec with coverage"
   task :coverage do
-    ENV["COVERAGE"] = "1"
+    ENV["HOMEBREW_TESTS_COVERAGE"] = "1"
+
     Rake::Task[:test].invoke
+
+    if ENV["TRAVIS"]
+      require "coveralls/rake/task"
+      Coveralls::RakeTask.new
+      Rake::Task['coveralls:push'].invoke
+    end
   end
 end
 
 desc "Run tests for minitest and RSpec"
 task test: ["test:minitest", "test:rspec"]
 
-Coveralls::RakeTask.new
-
 RuboCop::RakeTask.new(:rubocop) do |t|
   t.options = ["--force-exclusion"]
 end
diff --git a/Library/Homebrew/cask/spec/spec_helper.rb b/Library/Homebrew/cask/spec/spec_helper.rb
index d197db983..6bb13bdcf 100644
--- a/Library/Homebrew/cask/spec/spec_helper.rb
+++ b/Library/Homebrew/cask/spec/spec_helper.rb
@@ -2,9 +2,9 @@ require "pathname"
 require "rspec/its"
 require "rspec/wait"
 
-if ENV["COVERAGE"]
-  require "coveralls"
-  Coveralls.wear_merged!
+if ENV["HOMEBREW_TESTS_COVERAGE"]
+  require "simplecov"
+  SimpleCov.command_name "test:cask:rspec"
 end
 
 project_root = Pathname.new(File.expand_path("../..", __FILE__))
diff --git a/Library/Homebrew/cask/test/test_helper.rb b/Library/Homebrew/cask/test/test_helper.rb
index 24c979535..e4fd72170 100644
--- a/Library/Homebrew/cask/test/test_helper.rb
+++ b/Library/Homebrew/cask/test/test_helper.rb
@@ -2,9 +2,9 @@ require "bundler"
 require "bundler/setup"
 require "pathname"
 
-if ENV["COVERAGE"]
-  require "coveralls"
-  Coveralls.wear_merged!
+if ENV["HOMEBREW_TESTS_COVERAGE"]
+  require "simplecov"
+  SimpleCov.command_name "test:cask:minitest"
 end
 
 project_root = Pathname.new(File.expand_path("../..", __FILE__))