Move Cask specs into brew tests.

Library/Homebrew/.simplecov

@@ -11,8 +11,6 @@ SimpleCov.start do
   # tests to be dropped. This causes random fluctuations in test coverage.
   merge_timeout 86400
 
-  add_filter "/Homebrew/cask/spec/"
-  add_filter "/Homebrew/cask/test/"
   add_filter "/Homebrew/compat/"
   add_filter "/Homebrew/dev-cmd/tests.rb"
   add_filter "/Homebrew/test/"

Library/Homebrew/test/spec_helper.rb

@@ -6,6 +6,11 @@
 
 if ENV["HOMEBREW_TESTS_COVERAGE"]
   require "simplecov"
+
+  if ENV["CODECOV_TOKEN"] || ENV["TRAVIS"]
+    require "codecov"
+    SimpleCov.formatter = SimpleCov::Formatter::Codecov
+  end
 end
 
 $LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_LIBRARY"]}/Homebrew"))
@@ -18,6 +23,8 @@
 require "test/support/helper/fixtures"
 require "test/support/helper/formula"
 require "test/support/helper/mktmpdir"
+
+require "test/support/helper/spec/shared_context/homebrew_cask" if OS.mac?
 require "test/support/helper/spec/shared_context/integration_test"
 
 TEST_DIRECTORIES = [

Library/Homebrew/cask/spec/spec_helper.rb → Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb

@@ -1,7 +1,3 @@
-$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_REPOSITORY"]}/Library/Homebrew"))
-require "test/spec_helper"
-
-# add Homebrew-Cask to load path
 $LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.join("cask", "lib").to_s)
 
 require "hbc"
@@ -20,25 +16,30 @@
   :binarydir,
 ].freeze
 
-RSpec.configure do |config|
-  config.around(:each) do |example|
+RSpec.shared_context "Homebrew-Cask" do
+  around(:each) do |example|
     begin
-      dirs = HOMEBREW_CASK_DIRS.map { |dir|
-        Pathname.new(TEST_TMPDIR).join("cask-#{dir}").tap { |path|
+      dirs = HOMEBREW_CASK_DIRS.map do |dir|
+        Pathname.new(TEST_TMPDIR).join("cask-#{dir}").tap do |path|
           path.mkpath
           Hbc.public_send("#{dir}=", path)
-        }
-      }
+        end
+      end
 
       Hbc.default_tap = Tap.fetch("caskroom", "spec").tap do |tap|
-        # link test casks
         FileUtils.mkdir_p tap.path.dirname
         FileUtils.ln_sf TEST_FIXTURE_DIR.join("cask"), tap.path
       end
 
       example.run
     ensure
       FileUtils.rm_rf dirs
+      Hbc.default_tap.path.unlink
+      FileUtils.rm_rf Hbc.default_tap.path.parent
     end
   end
 end
+
+RSpec.configure do |config|
+  config.include_context "Homebrew-Cask", :cask
+end