Merge pull request #2514 from reitermarkus/refactor-cask-metadata

Refactor cask metadata directory methods.

2 files changed, 6 insertions, 8 deletions

diff --git a/Library/Homebrew/test/cask/cask_spec.rb b/Library/Homebrew/test/cask/cask_spec.rb
index 2ab966f82..3736f3c01 100644
--- a/Library/Homebrew/test/cask/cask_spec.rb
+++ b/Library/Homebrew/test/cask/cask_spec.rb
@@ -85,8 +85,8 @@ describe Hbc::Cask, :cask do
     it "proposes a versioned metadata directory name for each instance" do
       cask_token = "local-caffeine"
       c = Hbc::CaskLoader.load(cask_token)
-      metadata_path = Hbc.caskroom.join(cask_token, ".metadata", c.version)
-      expect(c.metadata_versioned_container_path.to_s).to eq(metadata_path.to_s)
+      metadata_timestamped_path = Hbc.caskroom.join(cask_token, ".metadata", c.version)
+      expect(c.metadata_versioned_path.to_s).to eq(metadata_timestamped_path.to_s)
     end
   end
 
diff --git a/Library/Homebrew/test/cask/installer_spec.rb b/Library/Homebrew/test/cask/installer_spec.rb
index 7dd5b2bda..59d61bbdd 100644
--- a/Library/Homebrew/test/cask/installer_spec.rb
+++ b/Library/Homebrew/test/cask/installer_spec.rb
@@ -336,9 +336,8 @@ describe Hbc::Installer, :cask do
         Hbc::Installer.new(caffeine).install
       end
 
-      m_path = caffeine.metadata_path(:now, true)
-      expect(caffeine.metadata_path(:now, false)).to eq(m_path)
-      expect(caffeine.metadata_path(:latest)).to eq(m_path)
+      m_path = caffeine.metadata_timestamped_path(timestamp: :now, create: true)
+      expect(caffeine.metadata_timestamped_path(timestamp: :latest)).to eq(m_path)
     end
 
     it "generates and finds a metadata subdirectory for an installed Cask" do
@@ -349,9 +348,8 @@ describe Hbc::Installer, :cask do
       end
 
       subdir_name = "Casks"
-      m_subdir = caffeine.metadata_subdir(subdir_name, :now, true)
-      expect(caffeine.metadata_subdir(subdir_name, :now, false)).to eq(m_subdir)
-      expect(caffeine.metadata_subdir(subdir_name, :latest)).to eq(m_subdir)
+      m_subdir = caffeine.metadata_subdir(subdir_name, timestamp: :now, create: true)
+      expect(caffeine.metadata_subdir(subdir_name, timestamp: :latest)).to eq(m_subdir)
     end
   end