Merge pull request #1400 from reitermarkus/move-bundle-path

Move `test/vendor/bundle` to `vendor/bundle`.

1 files changed, 5 insertions, 2 deletions

diff --git a/Library/Homebrew/cask/cmd/brew-cask-tests.rb b/Library/Homebrew/cask/cmd/brew-cask-tests.rb
index 4840ab451..3126490e3 100755
--- a/Library/Homebrew/cask/cmd/brew-cask-tests.rb
+++ b/Library/Homebrew/cask/cmd/brew-cask-tests.rb
@@ -1,5 +1,8 @@
 require "English"
 
+ENV["BUNDLE_GEMFILE"] = "#{HOMEBREW_LIBRARY_PATH}/cask/Gemfile"
+ENV["BUNDLE_PATH"] = "#{HOMEBREW_LIBRARY_PATH}/vendor/bundle"
+
 def run_tests(executable, files, args = [])
   opts = []
   opts << "--serialize-stdout" if ENV["CI"]
@@ -7,7 +10,7 @@ def run_tests(executable, files, args = [])
   system "bundle", "exec", executable, *opts, "--", *args, "--", *files
 end
 
-repo_root = Pathname(__FILE__).realpath.parent.parent
+repo_root = Pathname.new(__FILE__).realpath.parent.parent
 repo_root.cd do
   ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1"
   ENV["HOMEBREW_NO_EMOJI"] = "1"
@@ -15,7 +18,7 @@ repo_root.cd do
 
   Homebrew.install_gem_setup_path! "bundler"
   unless quiet_system("bundle", "check")
-    system "bundle", "install", "--path", "vendor/bundle"
+    system "bundle", "install"
   end
 
   rspec = ARGV.flag?("--rspec") || !ARGV.flag?("--minitest")