Merge pull request #1620 from reitermarkus/refactoring

Refactor Cask installer.

2 files changed, 4 insertions, 3 deletions

diff --git a/Library/Homebrew/cask/test/cask/cli/install_test.rb b/Library/Homebrew/cask/test/cask/cli/install_test.rb
index c774f1fb5..eef3f2e5b 100644
--- a/Library/Homebrew/cask/test/cask/cli/install_test.rb
+++ b/Library/Homebrew/cask/test/cask/cli/install_test.rb
@@ -39,7 +39,7 @@ describe Hbc::CLI::Install do
 
     lambda {
       Hbc::CLI::Install.run("local-transmission", "--force")
-    }.must_output(/==> Success! local-transmission was successfully installed!/)
+    }.must_output(/local-transmission was successfully installed!/)
   end
 
   it "skips dependencies with --skip-cask-deps" do
diff --git a/Library/Homebrew/cask/test/cask/depends_on_test.rb b/Library/Homebrew/cask/test/cask/depends_on_test.rb
index 31e51b5e5..ce2e54178 100644
--- a/Library/Homebrew/cask/test/cask/depends_on_test.rb
+++ b/Library/Homebrew/cask/test/cask/depends_on_test.rb
@@ -93,6 +93,7 @@ describe "Satisfy Dependencies and Requirements" do
   describe "depends_on x11" do
     it "succeeds when depends_on x11 is satisfied" do
       x11_cask = Hbc.load("with-depends-on-x11")
+      MacOS::X11.stubs(:installed?).returns(true)
       shutup do
         Hbc::Installer.new(x11_cask).install
       end
@@ -100,7 +101,7 @@ describe "Satisfy Dependencies and Requirements" do
 
     it "raises an exception when depends_on x11 is not satisfied" do
       x11_cask = Hbc.load("with-depends-on-x11")
-      Hbc.stubs(:x11_libpng).returns([Pathname.new("/usr/path/does/not/exist")])
+      MacOS::X11.stubs(:installed?).returns(false)
       lambda {
         shutup do
           Hbc::Installer.new(x11_cask).install
@@ -110,7 +111,7 @@ describe "Satisfy Dependencies and Requirements" do
 
     it "never raises when depends_on x11: false" do
       x11_cask = Hbc.load("with-depends-on-x11-false")
-      Hbc.stubs(:x11_executable).returns(Pathname.new("/usr/path/does/not/exist"))
+      MacOS::X11.stubs(:installed?).returns(false)
       lambda do
         shutup do
           Hbc::Installer.new(x11_cask).install