From 8ee6ac26130c74fd102d4e77e24f2c3b6aa86adc Mon Sep 17 00:00:00 2001
From: L. E. Segovia
Date: Thu, 16 Nov 2017 10:40:32 -0300
Subject: Implement @reitermarkus's comments - Split move into a move_back (and
 clarify when it is used) - Remove unused flags - Raise error if installed
 Caskfile not found - Error out if an upgrade fails - Remove some defensive
 programming checks

---
 Library/Homebrew/test/cask/cli/reinstall_spec.rb | 2 +-
 Library/Homebrew/test/cask/cli/uninstall_spec.rb | 2 +-
 Library/Homebrew/test/cask/cli/upgrade_spec.rb   | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

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

diff --git a/Library/Homebrew/test/cask/cli/reinstall_spec.rb b/Library/Homebrew/test/cask/cli/reinstall_spec.rb
index 1df814715..3737a7a70 100644
--- a/Library/Homebrew/test/cask/cli/reinstall_spec.rb
+++ b/Library/Homebrew/test/cask/cli/reinstall_spec.rb
@@ -13,7 +13,7 @@ describe Hbc::CLI::Reinstall, :cask do
       Already downloaded: .*local-caffeine--1.2.3.zip
       ==> Verifying checksum for Cask local-caffeine
       ==> Uninstalling Cask local-caffeine
-      ==> Moving App 'Caffeine.app' to '.*Caffeine.app'.
+      ==> Moving App 'Caffeine.app' back to '.*Caffeine.app'.
       ==> Purging files for version 1.2.3 of Cask local-caffeine
       ==> Installing Cask local-caffeine
       ==> Moving App 'Caffeine.app' to '.*Caffeine.app'.
diff --git a/Library/Homebrew/test/cask/cli/uninstall_spec.rb b/Library/Homebrew/test/cask/cli/uninstall_spec.rb
index 578c0d43a..345e1b9f2 100644
--- a/Library/Homebrew/test/cask/cli/uninstall_spec.rb
+++ b/Library/Homebrew/test/cask/cli/uninstall_spec.rb
@@ -12,7 +12,7 @@ describe Hbc::CLI::Uninstall, :cask do
 
     output = Regexp.new <<~EOS
       ==> Uninstalling Cask local-caffeine
-      ==> Moving App 'Caffeine.app' to '.*Caffeine.app'.
+      ==> Moving App 'Caffeine.app' back to '.*Caffeine.app'.
       ==> Purging files for version 1.2.3 of Cask local-caffeine
     EOS
 
diff --git a/Library/Homebrew/test/cask/cli/upgrade_spec.rb b/Library/Homebrew/test/cask/cli/upgrade_spec.rb
index ee7ef2261..5c08a4728 100644
--- a/Library/Homebrew/test/cask/cli/upgrade_spec.rb
+++ b/Library/Homebrew/test/cask/cli/upgrade_spec.rb
@@ -158,7 +158,9 @@ describe Hbc::CLI::Upgrade, :cask do
       expect(Hbc::CaskLoader.load("will-fail-if-upgraded").versions).to include("1.2.2")
 
       expect {
-        described_class.run("will-fail-if-upgraded")
+        expect {
+          described_class.run("will-fail-if-upgraded")
+        }.to raise_error(Hbc::CaskError)
       }.to output(output_reverted).to_stderr
 
       expect(Hbc::CaskLoader.load("will-fail-if-upgraded")).to be_installed
@@ -173,7 +175,9 @@ describe Hbc::CLI::Upgrade, :cask do
       expect(Hbc::CaskLoader.load("bad-checksum").versions).to include("1.2.2")
 
       expect {
-        described_class.run("bad-checksum")
+        expect {
+          described_class.run("bad-checksum")
+        }.to raise_error(Hbc::CaskSha256MismatchError)
       }.to_not output(output_reverted).to_stderr
 
       expect(Hbc::CaskLoader.load("bad-checksum")).to be_installed
-- 
cgit v1.2.3