Dummy Caffeine app.

65 files changed, 113 insertions, 112 deletions

diff --git a/Library/Homebrew/cask/spec/support/Casks/version-latest-with-checksum.rb b/Library/Homebrew/cask/spec/support/Casks/version-latest-with-checksum.rb
index 8dbca1a69..884ddff90 100644
--- a/Library/Homebrew/cask/spec/support/Casks/version-latest-with-checksum.rb
+++ b/Library/Homebrew/cask/spec/support/Casks/version-latest-with-checksum.rb
@@ -1,4 +1,4 @@
 test_cask 'version-latest-with-checksum' do
   version :latest
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 end
diff --git a/Library/Homebrew/cask/test/cask/artifact/alt_target_test.rb b/Library/Homebrew/cask/test/cask/artifact/alt_target_test.rb
index 1d1dba254..56d16b147 100644
--- a/Library/Homebrew/cask/test/cask/artifact/alt_target_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/alt_target_test.rb
@@ -24,7 +24,7 @@ describe Hbc::Artifact::App do
         url TestHelper.local_binary_url("caffeine.zip")
         homepage "http://example.com/local-caffeine"
         version "1.2.3"
-        sha256 "9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853"
+        sha256 "67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94"
         app "subdir/Caffeine.app", target: "AnotherName.app"
       end
 
@@ -53,7 +53,7 @@ describe Hbc::Artifact::App do
       cask = local_alt_caffeine
 
       staged_app_path = cask.staged_path.join("Caffeine.app")
-      staged_app_copy = staged_app_path.sub("Caffeine.app", "CaffeineAgain.app")
+      staged_app_copy = staged_app_path.sub("Caffeine.app", "Caffeine Deluxe.app")
       FileUtils.cp_r staged_app_path, staged_app_copy
 
       shutup do
@@ -64,7 +64,7 @@ describe Hbc::Artifact::App do
       File.exist?(staged_app_path).must_equal false
 
       File.exist?(Hbc.appdir.join("AnotherNameAgain.app")).must_equal false
-      File.exist?(cask.staged_path.join("CaffeineAgain.app")).must_equal true
+      File.exist?(cask.staged_path.join("Caffeine Deluxe.app")).must_equal true
     end
 
     it "avoids clobbering an existing app by moving over it" do
diff --git a/Library/Homebrew/cask/test/cask/artifact/app_test.rb b/Library/Homebrew/cask/test/cask/artifact/app_test.rb
index c5aa78365..aef288398 100644
--- a/Library/Homebrew/cask/test/cask/artifact/app_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/app_test.rb
@@ -24,7 +24,7 @@ describe Hbc::Artifact::App do
         url TestHelper.local_binary_url("caffeine.zip")
         homepage "http://example.com/local-caffeine"
         version "1.2.3"
-        sha256 "9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853"
+        sha256 "67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94"
         app "subdir/Caffeine.app"
       end
 
@@ -53,7 +53,7 @@ describe Hbc::Artifact::App do
       cask = local_caffeine
 
       staged_app_path = cask.staged_path.join("Caffeine.app")
-      staged_app_copy = staged_app_path.sub("Caffeine.app", "CaffeineAgain.app")
+      staged_app_copy = staged_app_path.sub("Caffeine.app", "Caffeine Deluxe.app")
       FileUtils.cp_r staged_app_path, staged_app_copy
 
       shutup do
@@ -63,8 +63,8 @@ describe Hbc::Artifact::App do
       File.ftype(Hbc.appdir.join("Caffeine.app")).must_equal "directory"
       File.exist?(staged_app_path).must_equal false
 
-      File.exist?(Hbc.appdir.join("CaffeineAgain.app")).must_equal false
-      File.exist?(cask.staged_path.join("CaffeineAgain.app")).must_equal true
+      File.exist?(Hbc.appdir.join("Caffeine Deluxe.app")).must_equal false
+      File.exist?(cask.staged_path.join("Caffeine Deluxe.app")).must_equal true
     end
 
     describe "when the target already exists" do
diff --git a/Library/Homebrew/cask/test/cask/artifact/suite_test.rb b/Library/Homebrew/cask/test/cask/artifact/suite_test.rb
index 5f72c4565..7d0e8aad3 100644
--- a/Library/Homebrew/cask/test/cask/artifact/suite_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/suite_test.rb
@@ -7,9 +7,9 @@ describe Hbc::Artifact::Suite do
     end
   }
   let(:expected_path) {
-    Hbc.appdir.join("caffeine_suite")
+    Hbc.appdir.join("Caffeine")
   }
-  let(:source_path) { cask.staged_path.join("caffeine_suite") }
+  let(:source_path) { cask.staged_path.join("Caffeine") }
 
   it "moves the suite to the proper directory" do
     shutup do
diff --git a/Library/Homebrew/cask/test/cask/artifact/two_apps_correct_test.rb b/Library/Homebrew/cask/test/cask/artifact/two_apps_correct_test.rb
index 3432597e0..afa4a61aa 100644
--- a/Library/Homebrew/cask/test/cask/artifact/two_apps_correct_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/two_apps_correct_test.rb
@@ -21,11 +21,11 @@ describe Hbc::Artifact::App do
         Hbc::Artifact::App.new(cask).install_phase
       end
 
-      File.ftype(Hbc.appdir.join("Caffeine.app")).must_equal "directory"
-      File.exist?(cask.staged_path.join("Caffeine.app")).must_equal false
+      File.ftype(Hbc.appdir.join("Caffeine Mini.app")).must_equal "directory"
+      File.exist?(cask.staged_path.join("Caffeine Mini.app")).must_equal false
 
-      File.ftype(Hbc.appdir.join("Caffeine-2.app")).must_equal "directory"
-      File.exist?(cask.staged_path.join("Caffeine-2.app")).must_equal false
+      File.ftype(Hbc.appdir.join("Caffeine Pro.app")).must_equal "directory"
+      File.exist?(cask.staged_path.join("Caffeine Pro.app")).must_equal false
     end
 
     it "works with an application in a subdir" do
@@ -36,62 +36,63 @@ describe Hbc::Artifact::App do
         Hbc::Artifact::App.new(cask).install_phase
       end
 
-      File.ftype(Hbc.appdir.join("Caffeine.app")).must_equal "directory"
-      File.exist?(cask.staged_path.join("Caffeine.app")).must_equal false
+      File.ftype(Hbc.appdir.join("Caffeine Mini.app")).must_equal "directory"
+      File.exist?(cask.staged_path.join("Caffeine Mini.app")).must_equal false
 
-      File.ftype(Hbc.appdir.join("Caffeine-2.app")).must_equal "directory"
-      File.exist?(cask.staged_path.join("Caffeine-2.app")).must_equal false
+      File.ftype(Hbc.appdir.join("Caffeine Pro.app")).must_equal "directory"
+      File.exist?(cask.staged_path.join("Caffeine Pro.app")).must_equal false
     end
 
     it "only uses apps when they are specified" do
       cask = local_two_apps_caffeine
 
-      app_path = cask.staged_path.join("Caffeine.app")
-      FileUtils.cp_r app_path, app_path.sub("Caffeine.app", "CaffeineAgain.app")
+      app_path = cask.staged_path.join("Caffeine Mini.app")
+      FileUtils.cp_r app_path, app_path.sub("Caffeine Mini.app", "Caffeine Deluxe.app")
 
       shutup do
         Hbc::Artifact::App.new(cask).install_phase
       end
 
-      File.ftype(Hbc.appdir.join("Caffeine.app")).must_equal "directory"
-      File.exist?(cask.staged_path.join("Caffeine.app")).must_equal false
+      File.ftype(Hbc.appdir.join("Caffeine Mini.app")).must_equal "directory"
+      File.exist?(cask.staged_path.join("Caffeine Mini.app")).must_equal false
 
-      File.exist?(Hbc.appdir.join("CaffeineAgain.app")).must_equal false
-      File.exist?(cask.staged_path.join("CaffeineAgain.app")).must_equal true
+      File.exist?(Hbc.appdir.join("Caffeine Deluxe.app")).must_equal false
+      File.exist?(cask.staged_path.join("Caffeine Deluxe.app")).must_equal true
     end
 
-    it "avoids clobbering an existing app (app 1)" do
-      cask = local_two_apps_caffeine
 
-      Hbc.appdir.join("Caffeine.app").mkpath
+    describe "avoids clobbering an existing app" do
+      let(:cask) { local_two_apps_caffeine }
 
-      TestHelper.must_output(self, lambda {
-        Hbc::Artifact::App.new(cask).install_phase
-      }, <<-MESSAGE.undent.chomp)
-         ==> Moving App 'Caffeine-2.app' to '#{Hbc.appdir.join('Caffeine-2.app')}'
-         ==> It seems there is already an App at '#{Hbc.appdir.join('Caffeine.app')}'; not moving.
-         MESSAGE
+      it "when the first app of two already exists" do
+        Hbc.appdir.join("Caffeine Mini.app").mkpath
 
-      source_path = cask.staged_path.join("Caffeine.app")
+        TestHelper.must_output(self, lambda {
+          Hbc::Artifact::App.new(cask).install_phase
+        }, <<-EOS.undent.chomp)
+             ==> It seems there is already an App at '#{Hbc.appdir.join('Caffeine Mini.app')}'; not moving.
+             ==> Moving App 'Caffeine Pro.app' to '#{Hbc.appdir.join('Caffeine Pro.app')}'
+           EOS
 
-      File.identical?(source_path, Hbc.appdir.join("Caffeine.app")).must_equal false
-    end
+        source_path = cask.staged_path.join("Caffeine Mini.app")
 
-    it "avoids clobbering an existing app (app 2)" do
-      cask = local_two_apps_caffeine
+        File.identical?(source_path, Hbc.appdir.join("Caffeine Mini.app")).must_equal false
+      end
 
-      Hbc.appdir.join("Caffeine-2.app").mkpath
+      it "when the second app of two already exists" do
+        Hbc.appdir.join("Caffeine Pro.app").mkpath
 
-      TestHelper.must_output(self, lambda {
-        Hbc::Artifact::App.new(cask).install_phase
-      }, <<-MESSAGE.undent.chomp)
-         ==> It seems there is already an App at '#{Hbc.appdir.join('Caffeine-2.app')}'; not moving.
-         ==> Moving App 'Caffeine.app' to '#{Hbc.appdir.join('Caffeine.app')}'
-         MESSAGE
+        TestHelper.must_output(self, lambda {
+          Hbc::Artifact::App.new(cask).install_phase
+        }, <<-EOS.undent.chomp)
+             ==> Moving App 'Caffeine Mini.app' to '#{Hbc.appdir.join('Caffeine Mini.app')}'
+             ==> It seems there is already an App at '#{Hbc.appdir.join('Caffeine Pro.app')}'; not moving.
+           EOS
 
-      source_path = cask.staged_path.join("Caffeine-2.app")
+        source_path = cask.staged_path.join("Caffeine Pro.app")
 
-      File.identical?(source_path, Hbc.appdir.join("Caffeine-2.app")).must_equal false
+        File.identical?(source_path, Hbc.appdir.join("Caffeine Pro.app")).must_equal false
+      end
     end
   end
 end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-multiple.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-multiple.rb
index c257b05a1..0cb56c283 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-multiple.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-multiple.rb
@@ -1,12 +1,12 @@
 test_cask 'invalid-appcast-multiple' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   appcast 'http://example.com/appcast1.xml',
-          checkpoint: '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+          checkpoint: '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
   appcast 'http://example.com/appcast2.xml',
-          checkpoint: '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+          checkpoint: '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
   homepage 'http://example.com/invalid-appcast-multiple'
 
   app 'Caffeine.app'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-url.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-url.rb
index c38702964..c57d23539 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-url.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-url.rb
@@ -1,10 +1,10 @@
 test_cask 'invalid-appcast-url' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   appcast 1,
-          checkpoint: '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+          checkpoint: '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
   homepage 'http://example.com/invalid-appcast-url'
 
   app 'Caffeine.app'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-conflicts-with-key.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-conflicts-with-key.rb
index c3cdaf90c..c37a796ea 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-conflicts-with-key.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-conflicts-with-key.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-conflicts-with-key' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-conflicts-with-key'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-arch-value.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-arch-value.rb
index 68cefaee9..2582213ca 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-arch-value.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-arch-value.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-depends-on-arch-value' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-depends-on-arch-value'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-key.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-key.rb
index 99b438731..0ede1144f 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-key.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-key.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-depends-on-key' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-depends-on-key'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-bad-release.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-bad-release.rb
index fdf4d6faf..8ff76ef23 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-bad-release.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-bad-release.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-depends-on-macos-bad-release' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-depends-on-macos-bad-release'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-conflicting-forms.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-conflicting-forms.rb
index d00960ecf..a5c6edc9c 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-conflicting-forms.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-conflicting-forms.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-depends-on-macos-conflicting-forms' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-depends-on-macos-conflicting-forms'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-x11-value.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-x11-value.rb
index e15e25933..306db3e76 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-x11-value.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-x11-value.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-depends-on-x11-value' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-depends-on-x11-value'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-conflicting-keys.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-conflicting-keys.rb
index a61b7b045..7d30a337a 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-conflicting-keys.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-conflicting-keys.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-conflicting-keys' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-conflicting-keys'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-id.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-id.rb
index ba6761311..44831de37 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-id.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-id.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-key-id' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-key-id'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-url.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-url.rb
index 7e4fc33c1..217d1af51 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-url.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-url.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-key-url' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-key-url'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-missing-key.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-missing-key.rb
index 339228626..8818d4129 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-missing-key.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-missing-key.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-missing-key' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-missing-keys'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-multiple-stanzas.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-multiple-stanzas.rb
index 94125f9d9..4bf13712f 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-multiple-stanzas.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-multiple-stanzas.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-multiple-stanzas' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-multiple-stanzas'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-parameter.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-parameter.rb
index 0e08f0c18..ad8caec73 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-parameter.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-parameter.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-parameter' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-type'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-signature-url.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-signature-url.rb
index f1cdfcb63..010255475 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-signature-url.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-signature-url.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-signature-url' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-signature-url'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-type.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-type.rb
index bfb67b3f9..386273269 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-type.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-type.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-type' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-type'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-format.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-format.rb
index 90ede3b2f..6ab549b11 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-format.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-format.rb
@@ -1,6 +1,6 @@
 test_cask => 'invalid-header-format' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-token-mismatch.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-token-mismatch.rb
index a69b0d752..4c51019f4 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-token-mismatch.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-token-mismatch.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-header-token-mismatch-this-text-does-not-belong' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-version.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-version.rb
index d49b83467..d07c0f43b 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-version.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-version.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-header-version' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-homepage.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-homepage.rb
index ee90fa81a..0f562f13f 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-homepage.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-homepage.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-two-homepage' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-url.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-url.rb
index 7a4dce7ae..8b2d435cc 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-url.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-url.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-two-url' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   url 'http://example.com/caffeine.zip'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-version.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-version.rb
index a3c47c907..78ec5f367 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-version.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-version.rb
@@ -1,7 +1,7 @@
 test_cask 'invalid-two-version' do
   version '1.2.3'
   version '2.0'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/local-caffeine.rb b/Library/Homebrew/cask/test/support/Casks/local-caffeine.rb
index fb217cc20..93a7624a5 100644
--- a/Library/Homebrew/cask/test/support/Casks/local-caffeine.rb
+++ b/Library/Homebrew/cask/test/support/Casks/local-caffeine.rb
@@ -1,6 +1,6 @@
 test_cask 'local-caffeine' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-alt-target.rb b/Library/Homebrew/cask/test/support/Casks/with-alt-target.rb
index 6d6456d86..9a3196ce1 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-alt-target.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-alt-target.rb
@@ -1,6 +1,6 @@
 test_cask 'with-alt-target' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-appcast.rb b/Library/Homebrew/cask/test/support/Casks/with-appcast.rb
index acfb1565f..fb4ad9249 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-appcast.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-appcast.rb
@@ -1,10 +1,10 @@
 test_cask 'with-appcast' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   appcast 'http://example.com/appcast.xml',
-          checkpoint: '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+          checkpoint: '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
   homepage 'http://example.com/with-appcast'
 
   app 'Caffeine.app'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-caveats.rb b/Library/Homebrew/cask/test/support/Casks/with-caveats.rb
index 4412ceb3a..38ae23b44 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-caveats.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-caveats.rb
@@ -1,6 +1,6 @@
 test_cask 'with-caveats' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-conditional-caveats.rb b/Library/Homebrew/cask/test/support/Casks/with-conditional-caveats.rb
index 2690649c3..db55930a2 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-conditional-caveats.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-conditional-caveats.rb
@@ -1,6 +1,6 @@
 test_cask 'with-conditional-caveats' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-conflicts-with.rb b/Library/Homebrew/cask/test/support/Casks/with-conflicts-with.rb
index 789c9839a..540f14164 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-conflicts-with.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-conflicts-with.rb
@@ -1,6 +1,6 @@
 test_cask 'with-conflicts-with' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-conflicts-with'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch-failure.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch-failure.rb
index a257d7bbb..5f9016be9 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch-failure.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch-failure.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-arch-failure' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-arch-failure'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch.rb
index 9fc5baf1a..0746c3874 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-arch' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-arch'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic-helper.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic-helper.rb
index 735289591..4a11a163b 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic-helper.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic-helper.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-cask-cyclic-helper' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-cask-cyclic-helper'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic.rb
index 776929e83..bb782ae19 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-cask-cyclic' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-cask-cyclic'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-multiple.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-multiple.rb
index f08e73ac4..1dc939350 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-multiple.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-multiple.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-cask-multiple' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-cask-multiple'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask.rb
index 013da2379..62f32c32b 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-cask' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-cask'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula-multiple.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula-multiple.rb
index bdc4e1f8b..1d02add39 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula-multiple.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula-multiple.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-formula-multiple' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-formula-multiple'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula.rb
index 3d365a187..3dd542893 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-formula' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-formula'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-array.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-array.rb
index 4b3b8320e..946782536 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-array.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-array.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-macos-array' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-macos-array'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-comparison.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-comparison.rb
index 448e44a03..2780b94b7 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-comparison.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-comparison.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-macos-comparison' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-macos-comparison'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-failure.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-failure.rb
index 8e7a9a1d6..4e3c777ec 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-failure.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-failure.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-macos-failure' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-macos-failure'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-string.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-string.rb
index 1dab7654c..7c15e6308 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-string.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-string.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-macos-string' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-macos-string'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-symbol.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-symbol.rb
index 00a99c525..10b1de754 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-symbol.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-symbol.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-macos-symbol' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-macos-symbol'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11-false.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11-false.rb
index 00ea1cef9..d52a0e8df 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11-false.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11-false.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-x11-false' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-x11-false'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11.rb
index 234547334..c7384cf3a 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-x11' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-x11'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-generic-artifact-no-target.rb b/Library/Homebrew/cask/test/support/Casks/with-generic-artifact-no-target.rb
index 5e6eb51b8..3d8d80445 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-generic-artifact-no-target.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-generic-artifact-no-target.rb
@@ -1,6 +1,6 @@
 test_cask 'with-generic-artifact-no-target' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-generic-artifact'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-generic-artifact.rb b/Library/Homebrew/cask/test/support/Casks/with-generic-artifact.rb
index 87bf43cba..9e379c543 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-generic-artifact.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-generic-artifact.rb
@@ -1,6 +1,6 @@
 test_cask 'with-generic-artifact' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-generic-artifact'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-gpg-key-url.rb b/Library/Homebrew/cask/test/support/Casks/with-gpg-key-url.rb
index 68fa8123a..943421b82 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-gpg-key-url.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-gpg-key-url.rb
@@ -1,6 +1,6 @@
 test_cask 'with-gpg-key-url' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-gpg-key-url'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-gpg.rb b/Library/Homebrew/cask/test/support/Casks/with-gpg.rb
index 84c29fe65..dcdd8f593 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-gpg.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-gpg.rb
@@ -1,6 +1,6 @@
 test_cask 'with-gpg' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-gpg'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-installer-manual.rb b/Library/Homebrew/cask/test/support/Casks/with-installer-manual.rb
index 6291d7f88..7e9a8eac7 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-installer-manual.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-installer-manual.rb
@@ -1,6 +1,6 @@
 test_cask 'with-installer-manual' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-installer-script.rb b/Library/Homebrew/cask/test/support/Casks/with-installer-script.rb
index 3014a3945..c4b18417a 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-installer-script.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-installer-script.rb
@@ -1,6 +1,6 @@
 test_cask 'with-installer-script' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-install-script'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-suite.rb b/Library/Homebrew/cask/test/support/Casks/with-suite.rb
index 594276574..dbaaaea67 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-suite.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-suite.rb
@@ -1,11 +1,11 @@
 test_cask 'with-suite' do
   version '1.2.3'
-  sha256 'd1302a0dc25aff72ad395ed01a830468b92253ffd28269574f3ac0b5eb8aad54'
+  sha256 'd95dcc12d4e5be0bc3cb9793c4b7e7f69a25f0b3c7418494b0c883957e6eeae4'
 
-  url TestHelper.local_binary_url('caffeine_suite.zip')
+  url TestHelper.local_binary_url('caffeine-suite.zip')
   name 'Caffeine'
   homepage 'http://example.com/with-suite'
   license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder
 
-  suite 'caffeine_suite'
+  suite 'Caffeine'
 end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-two-apps-correct.rb b/Library/Homebrew/cask/test/support/Casks/with-two-apps-correct.rb
index a0b142528..069eb9fed 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-two-apps-correct.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-two-apps-correct.rb
@@ -1,10 +1,10 @@
 test_cask 'with-two-apps-correct' do
   version '1.2.3'
-  sha256 'c0c79dce9511c80603328013dbbcb80b859cc8b9190660b6832b5f0e60d74c82'
+  sha256 '3178fbfd1ea5d87a2a0662a4eb599ebc9a03888e73f37538d9f3f6ee69d2368e'
 
-  url TestHelper.local_binary_url('2_app_caffeine.zip')
+  url TestHelper.local_binary_url('caffeines.zip')
   homepage 'http://example.com/local-caffeine'
 
-  app 'Caffeine.app'
-  app 'Caffeine-2.app'
+  app 'Caffeine Mini.app'
+  app 'Caffeine Pro.app'
 end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-two-apps-incorrect.rb b/Library/Homebrew/cask/test/support/Casks/with-two-apps-incorrect.rb
index 0ae37a79c..baf6e52f0 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-two-apps-incorrect.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-two-apps-incorrect.rb
@@ -1,6 +1,6 @@
 test_cask 'with-two-apps-incorrect' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-two-apps-subdir.rb b/Library/Homebrew/cask/test/support/Casks/with-two-apps-subdir.rb
index 61adefab6..d4783e6a6 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-two-apps-subdir.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-two-apps-subdir.rb
@@ -1,10 +1,10 @@
 test_cask 'with-two-apps-subdir' do
   version '1.2.3'
-  sha256 '03edce6992a6095e120dcfadf7049158589ae6f0548c145ed1b1c6f2883f6dca'
+  sha256 'd687c22a21c02bd8f07da9302c8292b93a04df9a929e3f04d09aea6c76f75c65'
 
-  url TestHelper.local_binary_url('2_app_subdir.zip')
+  url TestHelper.local_binary_url('caffeines-subdir.zip')
   homepage 'http://example.com/local-caffeine'
 
-  app 'subdir/Caffeine.app'
-  app 'subdir/Caffeine-2.app'
+  app 'Caffeines/Caffeine Mini.app'
+  app 'Caffeines/Caffeine Pro.app'
 end
diff --git a/Library/Homebrew/cask/test/support/binaries/2_app_caffeine.zip b/Library/Homebrew/cask/test/support/binaries/2_app_caffeine.zip
deleted file mode 100755
index a678f7c11..000000000
--- a/Library/Homebrew/cask/test/support/binaries/2_app_caffeine.zip
+++ /dev/null
diff --git a/Library/Homebrew/cask/test/support/binaries/2_app_subdir.zip b/Library/Homebrew/cask/test/support/binaries/2_app_subdir.zip
deleted file mode 100755
index 27637a731..000000000
--- a/Library/Homebrew/cask/test/support/binaries/2_app_subdir.zip
+++ /dev/null
diff --git a/Library/Homebrew/cask/test/support/binaries/caffeine-suite.zip b/Library/Homebrew/cask/test/support/binaries/caffeine-suite.zip
new file mode 100644
index 000000000..c38f771ae
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/binaries/caffeine-suite.zip
diff --git a/Library/Homebrew/cask/test/support/binaries/caffeine.zip b/Library/Homebrew/cask/test/support/binaries/caffeine.zip
index 74aca21db..99d61bbfb 100644
--- a/Library/Homebrew/cask/test/support/binaries/caffeine.zip
+++ b/Library/Homebrew/cask/test/support/binaries/caffeine.zip
diff --git a/Library/Homebrew/cask/test/support/binaries/caffeine_suite.zip b/Library/Homebrew/cask/test/support/binaries/caffeine_suite.zip
deleted file mode 100644
index 7fa5c958e..000000000
--- a/Library/Homebrew/cask/test/support/binaries/caffeine_suite.zip
+++ /dev/null
diff --git a/Library/Homebrew/cask/test/support/binaries/caffeines-subdir.zip b/Library/Homebrew/cask/test/support/binaries/caffeines-subdir.zip
new file mode 100644
index 000000000..ce5064d09
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/binaries/caffeines-subdir.zip
diff --git a/Library/Homebrew/cask/test/support/binaries/caffeines.zip b/Library/Homebrew/cask/test/support/binaries/caffeines.zip
new file mode 100644
index 000000000..372fcc522
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/binaries/caffeines.zip