Add helper method for Cask fixture paths and refactor CaskLoader.

1 files changed, 24 insertions, 24 deletions

diff --git a/Library/Homebrew/test/cask/installer_spec.rb b/Library/Homebrew/test/cask/installer_spec.rb
index 6f7c6d3d7..2dc27f04c 100644
--- a/Library/Homebrew/test/cask/installer_spec.rb
+++ b/Library/Homebrew/test/cask/installer_spec.rb
@@ -5,7 +5,7 @@ describe Hbc::Installer, :cask do
     }
 
     it "downloads and installs a nice fresh Cask" do
-      caffeine = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb")
+      caffeine = Hbc::CaskLoader.load(cask_path("local-caffeine"))
 
       Hbc::Installer.new(caffeine).install
 
@@ -14,7 +14,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "works with dmg-based Casks" do
-      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-dmg.rb")
+      asset = Hbc::CaskLoader.load(cask_path("container-dmg"))
 
       Hbc::Installer.new(asset).install
 
@@ -23,7 +23,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "works with tar-gz-based Casks" do
-      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-tar-gz.rb")
+      asset = Hbc::CaskLoader.load(cask_path("container-tar-gz"))
 
       Hbc::Installer.new(asset).install
 
@@ -32,7 +32,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "works with xar-based Casks" do
-      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-xar.rb")
+      asset = Hbc::CaskLoader.load(cask_path("container-xar"))
 
       Hbc::Installer.new(asset).install
 
@@ -41,7 +41,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "works with pure bzip2-based Casks" do
-      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-bzip2.rb")
+      asset = Hbc::CaskLoader.load(cask_path("container-bzip2"))
 
       Hbc::Installer.new(asset).install
 
@@ -50,7 +50,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "works with pure gzip-based Casks" do
-      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-gzip.rb")
+      asset = Hbc::CaskLoader.load(cask_path("container-gzip"))
 
       Hbc::Installer.new(asset).install
 
@@ -59,21 +59,21 @@ describe Hbc::Installer, :cask do
     end
 
     it "blows up on a bad checksum" do
-      bad_checksum = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/bad-checksum.rb")
+      bad_checksum = Hbc::CaskLoader.load(cask_path("bad-checksum"))
       expect {
         Hbc::Installer.new(bad_checksum).install
       }.to raise_error(Hbc::CaskSha256MismatchError)
     end
 
     it "blows up on a missing checksum" do
-      missing_checksum = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/missing-checksum.rb")
+      missing_checksum = Hbc::CaskLoader.load(cask_path("missing-checksum"))
       expect {
         Hbc::Installer.new(missing_checksum).install
       }.to raise_error(Hbc::CaskSha256MissingError)
     end
 
     it "installs fine if sha256 :no_check is used" do
-      no_checksum = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/no-checksum.rb")
+      no_checksum = Hbc::CaskLoader.load(cask_path("no-checksum"))
 
       Hbc::Installer.new(no_checksum).install
 
@@ -81,14 +81,14 @@ describe Hbc::Installer, :cask do
     end
 
     it "fails to install if sha256 :no_check is used with --require-sha" do
-      no_checksum = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/no-checksum.rb")
+      no_checksum = Hbc::CaskLoader.load(cask_path("no-checksum"))
       expect {
         Hbc::Installer.new(no_checksum, require_sha: true).install
       }.to raise_error(Hbc::CaskNoShasumError)
     end
 
     it "installs fine if sha256 :no_check is used with --require-sha and --force" do
-      no_checksum = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/no-checksum.rb")
+      no_checksum = Hbc::CaskLoader.load(cask_path("no-checksum"))
 
       Hbc::Installer.new(no_checksum, require_sha: true, force: true).install
 
@@ -96,7 +96,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "prints caveats if they're present" do
-      with_caveats = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-caveats.rb")
+      with_caveats = Hbc::CaskLoader.load(cask_path("with-caveats"))
 
       expect {
         Hbc::Installer.new(with_caveats).install
@@ -106,7 +106,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "prints installer :manual instructions when present" do
-      with_installer_manual = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-installer-manual.rb")
+      with_installer_manual = Hbc::CaskLoader.load(cask_path("with-installer-manual"))
 
       expect {
         Hbc::Installer.new(with_installer_manual).install
@@ -116,7 +116,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "does not extract __MACOSX directories from zips" do
-      with_macosx_dir = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-macosx-dir.rb")
+      with_macosx_dir = Hbc::CaskLoader.load(cask_path("with-macosx-dir"))
 
       Hbc::Installer.new(with_macosx_dir).install
 
@@ -124,7 +124,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "allows already-installed Casks which auto-update to be installed if force is provided" do
-      with_auto_updates = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/auto-updates.rb")
+      with_auto_updates = Hbc::CaskLoader.load(cask_path("auto-updates"))
 
       expect(with_auto_updates).not_to be_installed
 
@@ -137,7 +137,7 @@ describe Hbc::Installer, :cask do
 
     # unlike the CLI, the internal interface throws exception on double-install
     it "installer method raises an exception when already-installed Casks are attempted" do
-      transmission = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb")
+      transmission = Hbc::CaskLoader.load(cask_path("local-transmission"))
 
       expect(transmission).not_to be_installed
 
@@ -151,7 +151,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "allows already-installed Casks to be installed if force is provided" do
-      transmission = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb")
+      transmission = Hbc::CaskLoader.load(cask_path("local-transmission"))
 
       expect(transmission).not_to be_installed
 
@@ -163,7 +163,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "works naked-pkg-based Casks" do
-      naked_pkg = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-pkg.rb")
+      naked_pkg = Hbc::CaskLoader.load(cask_path("container-pkg"))
 
       Hbc::Installer.new(naked_pkg).install
 
@@ -171,7 +171,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "works properly with an overridden container :type" do
-      naked_executable = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/naked-executable.rb")
+      naked_executable = Hbc::CaskLoader.load(cask_path("naked-executable"))
 
       Hbc::Installer.new(naked_executable).install
 
@@ -179,7 +179,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "works fine with a nested container" do
-      nested_app = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/nested-app.rb")
+      nested_app = Hbc::CaskLoader.load(cask_path("nested-app"))
 
       Hbc::Installer.new(nested_app).install
 
@@ -187,7 +187,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "generates and finds a timestamped metadata directory for an installed Cask" do
-      caffeine = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb")
+      caffeine = Hbc::CaskLoader.load(cask_path("local-caffeine"))
 
       Hbc::Installer.new(caffeine).install
 
@@ -196,7 +196,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "generates and finds a metadata subdirectory for an installed Cask" do
-      caffeine = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb")
+      caffeine = Hbc::CaskLoader.load(cask_path("local-caffeine"))
 
       Hbc::Installer.new(caffeine).install
 
@@ -208,7 +208,7 @@ describe Hbc::Installer, :cask do
 
   describe "uninstall" do
     it "fully uninstalls a Cask" do
-      caffeine = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb")
+      caffeine = Hbc::CaskLoader.load(cask_path("local-caffeine"))
       installer = Hbc::Installer.new(caffeine)
 
       installer.install
@@ -220,7 +220,7 @@ describe Hbc::Installer, :cask do
     end
 
     it "uninstalls all versions if force is set" do
-      caffeine = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb")
+      caffeine = Hbc::CaskLoader.load(cask_path("local-caffeine"))
       mutated_version = caffeine.version + ".1"
 
       Hbc::Installer.new(caffeine).install