From ee253e465b8e2f5acdb53daf572311e87055e082 Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Sun, 7 May 2017 13:52:57 +0100
Subject: Vendor all Homebrew's gems.

Homebrew's actually ended up using a fair few gems. While we want to
avoid Bundler at runtime (and this PR still does that, in fact uses
Bundler even less at runtime than it did before) writing our own version
to use at build-time seems redundant.
---
 Library/Homebrew/test/cask/cask_spec.rb      | 6 ++++--
 Library/Homebrew/test/cask/cli/style_spec.rb | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'Library/Homebrew/test/cask')

diff --git a/Library/Homebrew/test/cask/cask_spec.rb b/Library/Homebrew/test/cask/cask_spec.rb
index 3736f3c01..a8c4ecf5f 100644
--- a/Library/Homebrew/test/cask/cask_spec.rb
+++ b/Library/Homebrew/test/cask/cask_spec.rb
@@ -24,7 +24,7 @@ describe Hbc::Cask, :cask do
   describe "load" do
     let(:tap_path) { Hbc.default_tap.path }
     let(:file_dirname) { Pathname.new(__FILE__).dirname }
-    let(:relative_tap_path) { tap_path.relative_path_from(file_dirname) }
+    let(:relative_tap_path) { tap_path.realpath.relative_path_from(file_dirname) }
 
     it "returns an instance of the Cask for the given token" do
       c = Hbc::CaskLoader.load("local-caffeine")
@@ -56,7 +56,9 @@ describe Hbc::Cask, :cask do
     end
 
     it "returns an instance of the Cask from a relative file location" do
-      c = Hbc::CaskLoader.load(relative_tap_path/"Casks/local-caffeine.rb")
+      c = file_dirname.cd do
+        Hbc::CaskLoader.load(relative_tap_path/"Casks/local-caffeine.rb")
+      end
       expect(c).to be_kind_of(Hbc::Cask)
       expect(c.token).to eq("local-caffeine")
     end
diff --git a/Library/Homebrew/test/cask/cli/style_spec.rb b/Library/Homebrew/test/cask/cli/style_spec.rb
index d41636beb..d021d8000 100644
--- a/Library/Homebrew/test/cask/cli/style_spec.rb
+++ b/Library/Homebrew/test/cask/cli/style_spec.rb
@@ -62,7 +62,7 @@ describe Hbc::CLI::Style, :cask do
 
     context "when installation succeeds" do
       before do
-        allow(Homebrew).to receive(:install_gem_setup_path!)
+        allow(Homebrew).to receive(:run_bundler_if_needed!)
       end
 
       it "exits successfully" do
@@ -72,7 +72,7 @@ describe Hbc::CLI::Style, :cask do
 
     context "when installation fails" do
       before do
-        allow(Homebrew).to receive(:install_gem_setup_path!).and_raise(SystemExit)
+        allow(Homebrew).to receive(:run_bundler_if_needed!).and_raise(SystemExit)
       end
 
       it "raises an error" do
-- 
cgit v1.2.3