Merge pull request #1353 from reitermarkus/fix-linked-caskroom-tap

Use proper path to `caskroom/cask` tap in `test_helper`.

2 files changed, 5 insertions, 5 deletions

diff --git a/Library/Homebrew/cask/test/cask/cli/create_test.rb b/Library/Homebrew/cask/test/cask/cli/create_test.rb
index c4e175915..f09c91e8e 100644
--- a/Library/Homebrew/cask/test/cask/cli/create_test.rb
+++ b/Library/Homebrew/cask/test/cask/cli/create_test.rb
@@ -25,7 +25,7 @@ describe Hbc::CLI::Create do
   end
 
   after do
-    %w[new-cask additional-cask another-cask yet-another-cask feine].each do |cask|
+    %w[new-cask additional-cask another-cask yet-another-cask local-caff].each do |cask|
       path = Hbc.path(cask)
       path.delete if path.exist?
     end
@@ -71,14 +71,14 @@ describe Hbc::CLI::Create do
 
   it "raises an exception when the Cask already exists" do
     lambda {
-      Hbc::CLI::Create.run("caffeine")
+      Hbc::CLI::Create.run("basic-cask")
     }.must_raise Hbc::CaskAlreadyCreatedError
   end
 
   it "allows creating Casks that are substrings of existing Casks" do
-    Hbc::CLI::Create.run("feine")
+    Hbc::CLI::Create.run("local-caff")
     Hbc::CLI::Create.editor_commands.must_equal [
-      [Hbc.path("feine")],
+      [Hbc.path("local-caff")],
     ]
   end
 
diff --git a/Library/Homebrew/cask/test/test_helper.rb b/Library/Homebrew/cask/test/test_helper.rb
index 67d2c698d..6b66c1138 100644
--- a/Library/Homebrew/cask/test/test_helper.rb
+++ b/Library/Homebrew/cask/test/test_helper.rb
@@ -50,7 +50,7 @@ Hbc.default_tap = Tap.fetch("caskroom", "test").tap do |tap|
 end
 
 # pretend that the caskroom/cask Tap is installed
-FileUtils.ln_s HOMEBREW_LIBRARY.join("Taps", "caskroom", "homebrew-cask"), Tap.fetch("caskroom", "cask").path
+FileUtils.ln_s Pathname.new(ENV["HOMEBREW_LIBRARY"]).join("Taps", "caskroom", "homebrew-cask"), Tap.fetch("caskroom", "cask").path
 
 class TestHelper
   # helpers for test Casks to reference local files easily