Merge pull request #2362 from joshka/install-uninstall-messages

Install uninstall messages

3 files changed, 54 insertions, 0 deletions

diff --git a/Library/Homebrew/test/cask/cli/install_spec.rb b/Library/Homebrew/test/cask/cli/install_spec.rb
index 5a40017e8..219b9522e 100644
--- a/Library/Homebrew/test/cask/cli/install_spec.rb
+++ b/Library/Homebrew/test/cask/cli/install_spec.rb
@@ -1,4 +1,18 @@
 describe Hbc::CLI::Install, :cask do
+  it "displays the installation progress" do
+    output = Regexp.new <<-EOS.undent
+      ==> Downloading file:.*caffeine.zip
+      ==> Verifying checksum for Cask local-caffeine
+      ==> Installing Cask local-caffeine
+      ==> Moving App 'Caffeine.app' to '.*Caffeine.app'.
+      .*local-caffeine was successfully installed!
+    EOS
+
+    expect {
+      Hbc::CLI::Install.run("local-caffeine")
+    }.to output(output).to_stdout
+  end
+
   it "allows staging and activation of multiple Casks at once" do
     shutup do
       Hbc::CLI::Install.run("local-transmission", "local-caffeine")
diff --git a/Library/Homebrew/test/cask/cli/reinstall_spec.rb b/Library/Homebrew/test/cask/cli/reinstall_spec.rb
index e573a3470..8885fa199 100644
--- a/Library/Homebrew/test/cask/cli/reinstall_spec.rb
+++ b/Library/Homebrew/test/cask/cli/reinstall_spec.rb
@@ -1,4 +1,27 @@
 describe Hbc::CLI::Reinstall, :cask do
+  it "displays the reinstallation progress" do
+    caffeine = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb")
+
+    shutup do
+      Hbc::Installer.new(caffeine).install
+    end
+
+    output = Regexp.new <<-EOS.undent
+      ==> Downloading file:.*caffeine.zip
+      Already downloaded: .*local-caffeine--1.2.3.zip
+      ==> Verifying checksum for Cask local-caffeine
+      ==> Uninstalling Cask local-caffeine
+      ==> Removing App '.*Caffeine.app'.
+      ==> Installing Cask local-caffeine
+      ==> Moving App 'Caffeine.app' to '.*Caffeine.app'.
+      .*local-caffeine was successfully installed!
+    EOS
+
+    expect {
+      Hbc::CLI::Reinstall.run("local-caffeine")
+    }.to output(output).to_stdout
+  end
+
   it "allows reinstalling a Cask" do
     shutup do
       Hbc::CLI::Install.run("local-transmission")
diff --git a/Library/Homebrew/test/cask/cli/uninstall_spec.rb b/Library/Homebrew/test/cask/cli/uninstall_spec.rb
index c03f64c8f..4089c47b4 100644
--- a/Library/Homebrew/test/cask/cli/uninstall_spec.rb
+++ b/Library/Homebrew/test/cask/cli/uninstall_spec.rb
@@ -1,4 +1,21 @@
 describe Hbc::CLI::Uninstall, :cask do
+  it "displays the uninstallation progress" do
+    caffeine = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb")
+
+    shutup do
+      Hbc::Installer.new(caffeine).install
+    end
+
+    output = Regexp.new <<-EOS.undent
+      ==> Uninstalling Cask local-caffeine
+      ==> Removing App '.*Caffeine.app'.
+    EOS
+
+    expect {
+      Hbc::CLI::Uninstall.run("local-caffeine")
+    }.to output(output).to_stdout
+  end
+
   it "shows an error when a bad Cask is provided" do
     expect {
       Hbc::CLI::Uninstall.run("notacask")