From c1621f7f54fe90dd3fb6cc42b127814a59067d5d Mon Sep 17 00:00:00 2001
From: Markus Reiter
Date: Sun, 21 Aug 2016 07:51:25 +0200
Subject: Also report Cask coverage.

---
 Library/Homebrew/cask/.simplecov          |  7 +------
 Library/Homebrew/cask/Rakefile            | 12 ++++++++----
 Library/Homebrew/cask/spec/spec_helper.rb |  6 +++---
 Library/Homebrew/cask/test/test_helper.rb |  6 +++---
 4 files changed, 15 insertions(+), 16 deletions(-)
 mode change 100644 => 120000 Library/Homebrew/cask/.simplecov

(limited to 'Library/Homebrew/cask')

diff --git a/Library/Homebrew/cask/.simplecov b/Library/Homebrew/cask/.simplecov
deleted file mode 100644
index e1a2a4001..000000000
--- a/Library/Homebrew/cask/.simplecov
+++ /dev/null
@@ -1,6 +0,0 @@
-SimpleCov.start do
-  add_filter 'lib/vendor/'
-  add_filter 'doc/'
-  add_filter 'spec/'
-  add_filter 'test/'
-end
diff --git a/Library/Homebrew/cask/.simplecov b/Library/Homebrew/cask/.simplecov
new file mode 120000
index 000000000..d1b045262
--- /dev/null
+++ b/Library/Homebrew/cask/.simplecov
@@ -0,0 +1 @@
+../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__))
-- 
cgit v1.2.3