From f04a1b59aa817c362ee34767930e7404a0760ccc Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Wed, 19 Oct 2016 22:27:14 +0200
Subject: [PATCH] Require `spec_helper` globally.

---
 Library/Homebrew/cask/.rspec                                    | 2 --
 Library/Homebrew/cask/cmd/brew-cask-tests.rb                    | 2 ++
 Library/Homebrew/cask/spec/cask/artifact/binary_spec.rb         | 2 --
 Library/Homebrew/cask/spec/cask/audit_spec.rb                   | 2 --
 Library/Homebrew/cask/spec/cask/cask_spec.rb                    | 2 --
 Library/Homebrew/cask/spec/cask/cli/cleanup_spec.rb             | 2 --
 Library/Homebrew/cask/spec/cask/cli/doctor_spec.rb              | 1 -
 Library/Homebrew/cask/spec/cask/cli/style_spec.rb               | 1 -
 Library/Homebrew/cask/spec/cask/cli_spec.rb                     | 2 --
 Library/Homebrew/cask/spec/cask/download_strategy_spec.rb       | 2 --
 Library/Homebrew/cask/spec/cask/dsl/version_spec.rb             | 2 --
 Library/Homebrew/cask/spec/cask/macos_spec.rb                   | 2 --
 Library/Homebrew/cask/spec/cask/scopes_spec.rb                  | 2 --
 Library/Homebrew/cask/spec/cask/system_command_result_spec.rb   | 2 --
 Library/Homebrew/cask/spec/cask/system_command_spec.rb          | 2 --
 .../Homebrew/cask/spec/cask/underscore_supporting_uri_spec.rb   | 2 --
 Library/Homebrew/cask/spec/cask/verify/checksum_spec.rb         | 2 --
 Library/Homebrew/cask/spec/cask/verify_spec.rb                  | 2 --
 Library/Homebrew/cask/spec/formatter_spec.rb                    | 1 -
 Library/Homebrew/cask/spec/locale_spec.rb                       | 1 -
 20 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 Library/Homebrew/cask/.rspec

diff --git a/Library/Homebrew/cask/.rspec b/Library/Homebrew/cask/.rspec
deleted file mode 100644
index 83e16f8044..0000000000
--- a/Library/Homebrew/cask/.rspec
+++ /dev/null
@@ -1,2 +0,0 @@
---color
---require spec_helper
diff --git a/Library/Homebrew/cask/cmd/brew-cask-tests.rb b/Library/Homebrew/cask/cmd/brew-cask-tests.rb
index ce62b5d84e..4840ab4513 100755
--- a/Library/Homebrew/cask/cmd/brew-cask-tests.rb
+++ b/Library/Homebrew/cask/cmd/brew-cask-tests.rb
@@ -25,6 +25,8 @@ repo_root.cd do
 
   if rspec
     run_tests "parallel_rspec", Dir["spec/**/*_spec.rb"], %w[
+      --color
+      --require spec_helper
       --format progress
       --format ParallelTests::RSpec::RuntimeLogger
       --out tmp/parallel_runtime_rspec.log
diff --git a/Library/Homebrew/cask/spec/cask/artifact/binary_spec.rb b/Library/Homebrew/cask/spec/cask/artifact/binary_spec.rb
index 38b61a7e11..af6973777c 100644
--- a/Library/Homebrew/cask/spec/cask/artifact/binary_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/artifact/binary_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe Hbc::Artifact::Binary do
   let(:cask) {
     Hbc.load("with-binary").tap do |cask|
diff --git a/Library/Homebrew/cask/spec/cask/audit_spec.rb b/Library/Homebrew/cask/spec/cask/audit_spec.rb
index 7094ea3a89..f5a27ea8f0 100644
--- a/Library/Homebrew/cask/spec/cask/audit_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/audit_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe Hbc::Audit do
   include AuditMatchers
   include Sha256Helper
diff --git a/Library/Homebrew/cask/spec/cask/cask_spec.rb b/Library/Homebrew/cask/spec/cask/cask_spec.rb
index f31bee023e..d470c6ec37 100644
--- a/Library/Homebrew/cask/spec/cask/cask_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/cask_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe Hbc::Cask do
   let(:cask) { described_class.new("versioned-cask") }
 
diff --git a/Library/Homebrew/cask/spec/cask/cli/cleanup_spec.rb b/Library/Homebrew/cask/spec/cask/cli/cleanup_spec.rb
index fe8bb2d4db..58ce5b7a39 100644
--- a/Library/Homebrew/cask/spec/cask/cli/cleanup_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/cli/cleanup_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe Hbc::CLI::Cleanup do
   let(:cache_location) { Pathname.new(Dir.mktmpdir).realpath }
   let(:cleanup_outdated) { false }
diff --git a/Library/Homebrew/cask/spec/cask/cli/doctor_spec.rb b/Library/Homebrew/cask/spec/cask/cli/doctor_spec.rb
index 3c9c661501..b452fdb19f 100644
--- a/Library/Homebrew/cask/spec/cask/cli/doctor_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/cli/doctor_spec.rb
@@ -1,4 +1,3 @@
-require "spec_helper"
 require "hbc/version"
 
 describe Hbc::CLI::Doctor do
diff --git a/Library/Homebrew/cask/spec/cask/cli/style_spec.rb b/Library/Homebrew/cask/spec/cask/cli/style_spec.rb
index dbd6970d52..b0d34576a0 100644
--- a/Library/Homebrew/cask/spec/cask/cli/style_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/cli/style_spec.rb
@@ -1,5 +1,4 @@
 require "English"
-require "spec_helper"
 
 describe Hbc::CLI::Style do
   let(:args) { [] }
diff --git a/Library/Homebrew/cask/spec/cask/cli_spec.rb b/Library/Homebrew/cask/spec/cask/cli_spec.rb
index 1bdc57b6e0..9964275f10 100644
--- a/Library/Homebrew/cask/spec/cask/cli_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/cli_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe Hbc::CLI do
   it "lists the taps for Casks that show up in two taps" do
     listing = Hbc::CLI.nice_listing(%w[
diff --git a/Library/Homebrew/cask/spec/cask/download_strategy_spec.rb b/Library/Homebrew/cask/spec/cask/download_strategy_spec.rb
index 9b1c4d8e3c..f867dc19f7 100644
--- a/Library/Homebrew/cask/spec/cask/download_strategy_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/download_strategy_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe "download strategies" do
   let(:url) { "http://example.com/cask.dmg" }
   let(:url_options) { Hash.new }
diff --git a/Library/Homebrew/cask/spec/cask/dsl/version_spec.rb b/Library/Homebrew/cask/spec/cask/dsl/version_spec.rb
index b0efa2f10e..1dfbb44679 100644
--- a/Library/Homebrew/cask/spec/cask/dsl/version_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/dsl/version_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe Hbc::DSL::Version do
   include ExpectationsHashHelper
 
diff --git a/Library/Homebrew/cask/spec/cask/macos_spec.rb b/Library/Homebrew/cask/spec/cask/macos_spec.rb
index 902c80d7a2..a1ebb0a9e3 100644
--- a/Library/Homebrew/cask/spec/cask/macos_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/macos_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe MacOS do
   it "says '/' is undeletable" do
     expect(MacOS).to be_undeletable(
diff --git a/Library/Homebrew/cask/spec/cask/scopes_spec.rb b/Library/Homebrew/cask/spec/cask/scopes_spec.rb
index 0e592c9909..12c1a697f7 100644
--- a/Library/Homebrew/cask/spec/cask/scopes_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/scopes_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe Hbc::Scopes do
   describe "installed" do
     let(:fake_caskroom) { Pathname(Dir.mktmpdir) }
diff --git a/Library/Homebrew/cask/spec/cask/system_command_result_spec.rb b/Library/Homebrew/cask/spec/cask/system_command_result_spec.rb
index 7eb4fb722d..a6a51301a0 100644
--- a/Library/Homebrew/cask/spec/cask/system_command_result_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/system_command_result_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe Hbc::SystemCommand::Result do
   describe "::_parse_plist" do
     let(:command) { Hbc::SystemCommand.new("/usr/bin/true", {}) }
diff --git a/Library/Homebrew/cask/spec/cask/system_command_spec.rb b/Library/Homebrew/cask/spec/cask/system_command_spec.rb
index c291023057..2af0958532 100644
--- a/Library/Homebrew/cask/spec/cask/system_command_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/system_command_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe Hbc::SystemCommand do
   describe "when the exit code is 0" do
     describe "its result" do
diff --git a/Library/Homebrew/cask/spec/cask/underscore_supporting_uri_spec.rb b/Library/Homebrew/cask/spec/cask/underscore_supporting_uri_spec.rb
index a8756fde0c..a8e2925db1 100644
--- a/Library/Homebrew/cask/spec/cask/underscore_supporting_uri_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/underscore_supporting_uri_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe Hbc::UnderscoreSupportingURI do
   describe "parse" do
     it "works like normal on normal URLs" do
diff --git a/Library/Homebrew/cask/spec/cask/verify/checksum_spec.rb b/Library/Homebrew/cask/spec/cask/verify/checksum_spec.rb
index a5772b21d3..a379dafb90 100644
--- a/Library/Homebrew/cask/spec/cask/verify/checksum_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/verify/checksum_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe Hbc::Verify::Checksum do
   include Sha256Helper
 
diff --git a/Library/Homebrew/cask/spec/cask/verify_spec.rb b/Library/Homebrew/cask/spec/cask/verify_spec.rb
index 5925119edc..fc62b749cb 100644
--- a/Library/Homebrew/cask/spec/cask/verify_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/verify_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe Hbc::Verify do
   let(:cask) { double("cask") }
 
diff --git a/Library/Homebrew/cask/spec/formatter_spec.rb b/Library/Homebrew/cask/spec/formatter_spec.rb
index 7e143d9331..2c1de9b74d 100644
--- a/Library/Homebrew/cask/spec/formatter_spec.rb
+++ b/Library/Homebrew/cask/spec/formatter_spec.rb
@@ -1,4 +1,3 @@
-require "spec_helper"
 require "utils/formatter"
 require "utils/tty"
 
diff --git a/Library/Homebrew/cask/spec/locale_spec.rb b/Library/Homebrew/cask/spec/locale_spec.rb
index 98a2de9139..69914e23c3 100644
--- a/Library/Homebrew/cask/spec/locale_spec.rb
+++ b/Library/Homebrew/cask/spec/locale_spec.rb
@@ -1,4 +1,3 @@
-require "spec_helper"
 require "locale"
 
 describe Locale do