Merge pull request #793 from reitermarkus/refactoring-pathname

Merge Cask’s `Pathname` extension with Homebrew’s.

3 files changed, 2 insertions, 3 deletions

diff --git a/Library/Homebrew/cask/test/cask/installer_test.rb b/Library/Homebrew/cask/test/cask/installer_test.rb
index 34ea2e321..2275c3080 100644
--- a/Library/Homebrew/cask/test/cask/installer_test.rb
+++ b/Library/Homebrew/cask/test/cask/installer_test.rb
@@ -154,7 +154,7 @@ describe Hbc::Installer do
 
       dest_path = Hbc.caskroom.join("container-gzip", asset.version)
       dest_path.must_be :directory?
-      file = Hbc.appdir.join("container-gzip--#{asset.version}")
+      file = Hbc.appdir.join("container")
       file.must_be :file?
     end
 
diff --git a/Library/Homebrew/cask/test/support/Casks/container-gzip.rb b/Library/Homebrew/cask/test/support/Casks/container-gzip.rb
index 0a5c64ba9..eac74a04c 100644
--- a/Library/Homebrew/cask/test/support/Casks/container-gzip.rb
+++ b/Library/Homebrew/cask/test/support/Casks/container-gzip.rb
@@ -5,5 +5,5 @@ test_cask 'container-gzip' do
   url TestHelper.local_binary_url('container.gz')
   homepage 'https://example.com/container-gzip'
 
-  app 'container-gzip--1.2.3'
+  app 'container'
 end
diff --git a/Library/Homebrew/cask/test/test_helper.rb b/Library/Homebrew/cask/test/test_helper.rb
index fdbd8af0e..24c979535 100644
--- a/Library/Homebrew/cask/test/test_helper.rb
+++ b/Library/Homebrew/cask/test/test_helper.rb
@@ -14,7 +14,6 @@ tap_root = Pathname.new(ENV["HOMEBREW_LIBRARY"]).join("Taps", "caskroom", "homeb
 $LOAD_PATH.unshift(File.expand_path("#{ENV['HOMEBREW_REPOSITORY']}/Library/Homebrew"))
 
 require "global"
-require "extend/pathname"
 
 # add Homebrew-Cask to load path
 $LOAD_PATH.push(project_root.join("lib").to_s)