Merge pull request #1342 from reitermarkus/fixtures

Move cask's fixtures to `test/fixtures`.

Library/Homebrew/cask/spec/support/Casks/with-binary.rb

@@ -2,7 +2,7 @@ test_cask 'with-binary' do
   version '1.2.3'
   sha256 'd5b2dfbef7ea28c25f7a77cd7fa14d013d82b626db1d82e00e25822464ba19e2'
 
-  url FileHelper.local_binary_url('AppWithBinary.zip')
+  url "file://#{TEST_FIXTURE_DIR}/cask/AppWithBinary.zip"
   homepage 'http://example.com/with-binary'
 
   app 'App.app'

Library/Homebrew/cask/spec/support/Casks/with-embedded-binary.rb

@@ -2,7 +2,7 @@ test_cask 'with-embedded-binary' do
   version '1.2.3'
   sha256 'fe052d3e77d92676775fd916ddb8942e72a565b844ea7f6d055474c99bb4e47b'
 
-  url FileHelper.local_binary_url('AppWithEmbeddedBinary.zip')
+  url "file://#{TEST_FIXTURE_DIR}/cask/AppWithEmbeddedBinary.zip"
   homepage 'http://example.com/with-binary'
 
   app 'App.app'

Library/Homebrew/cask/spec/support/file_helper.rb

 module FileHelper
-  class << self
-    def local_binary_path(name)
-      File.expand_path(File.join(File.dirname(__FILE__), "binaries", name))
-    end
+  module_function
 
-    def local_binary_url(name)
-      "file://" + local_binary_path(name)
-    end
-
-    def valid_alias?(candidate)
-      return false unless candidate.symlink?
-      candidate.readlink.exist?
-    end
+  def valid_alias?(candidate)
+    return false unless candidate.symlink?
+    candidate.readlink.exist?
   end
 end

Library/Homebrew/cask/test/cask/artifact/alt_target_test.rb

@@ -30,7 +30,7 @@ describe Hbc::Artifact::App do
     describe "when app is in a subdirectory" do
       let(:cask) {
         Hbc::Cask.new("subdir") do
-          url TestHelper.local_binary_url("caffeine.zip")
+          url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
           homepage "http://example.com/local-caffeine"
           version "1.2.3"
           sha256 "67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94"

Library/Homebrew/cask/test/cask/artifact/app_test.rb

@@ -29,7 +29,7 @@ describe Hbc::Artifact::App do
     describe "when app is in a subdirectory" do
       let(:cask) {
         Hbc::Cask.new("subdir") do
-          url TestHelper.local_binary_url("caffeine.zip")
+          url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
           homepage "http://example.com/local-caffeine"
           version "1.2.3"
           sha256 "67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94"

Library/Homebrew/cask/test/cask/artifact/uninstall_test.rb

@@ -273,7 +273,7 @@ describe Hbc::Artifact::Uninstall do
 
     describe "when using rmdir" do
       let(:cask) { Hbc.load("with-uninstall-rmdir") }
-      let(:dir_pathname) { Pathname(TestHelper.local_binary_path("empty_directory")) }
+      let(:dir_pathname) { Pathname.new("#{TEST_FIXTURE_DIR}/cask/empty_directory") }
 
       it "can uninstall" do
         Hbc::FakeSystemCommand.expects_command(

Library/Homebrew/cask/test/cask/artifact/zap_test.rb

@@ -274,7 +274,7 @@ describe Hbc::Artifact::Zap do
 
     describe "when using rmdir" do
       let(:cask) { Hbc.load("with-zap-rmdir") }
-      let(:dir_pathname) { Pathname(TestHelper.local_binary_path("empty_directory")) }
+      let(:dir_pathname) { Pathname.new("#{TEST_FIXTURE_DIR}/cask/empty_directory") }
 
       it "can zap" do
         Hbc::FakeSystemCommand.expects_command(

Library/Homebrew/cask/test/support/Casks/appdir-interpolation.rb

@@ -2,7 +2,7 @@ test_cask 'appdir-interpolation' do
   version '2.61'
   sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
 
-  url TestHelper.local_binary_url('transmission-2.61.dmg')
+  url "file://#{TEST_FIXTURE_DIR}/cask/transmission-2.61.dmg"
   homepage 'http://example.com/appdir-interpolation'
 
   binary "#{appdir}/some/path"

Library/Homebrew/cask/test/support/Casks/auto-updates.rb

@@ -2,7 +2,7 @@ test_cask 'auto-updates' do
   version '2.61'
   sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
 
-  url TestHelper.local_binary_url('transmission-2.61.dmg')
+  url "file://#{TEST_FIXTURE_DIR}/cask/transmission-2.61.dmg"
   homepage 'http://example.com/auto-updates'
 
   auto_updates true

Library/Homebrew/cask/test/support/Casks/bad-checksum.rb

@@ -2,7 +2,7 @@ test_cask 'bad-checksum' do
   version '1.2.3'
   sha256 'badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb'
 
-  url TestHelper.local_binary_url('caffeine.zip')
+  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
   homepage 'http://example.com/local-caffeine'
 
   app 'Caffeine.app'

Library/Homebrew/cask/test/support/Casks/container-7z.rb

@@ -2,7 +2,7 @@ test_cask 'container-7z' do
   version '1.2.3'
   sha256 '3f9542ace85ed5f88549e2d0ea82210f8ddc87e0defbb78469d3aed719b3c964'
 
-  url TestHelper.local_binary_url('container.7z')
+  url "file://#{TEST_FIXTURE_DIR}/cask/container.7z"
   homepage 'https://example.com/container-7z'
 
   depends_on formula: 'unar'

Library/Homebrew/cask/test/support/Casks/container-air.rb

@@ -2,7 +2,7 @@ test_cask 'container-air' do
   version '0.1'
   sha256 '554472e163f8a028629b12b468e29acda9f16b223dff74fcd218bba73cc2365a'
 
-  url TestHelper.local_binary_url('container.air')
+  url "file://#{TEST_FIXTURE_DIR}/cask/container.air"
   homepage 'https://example.com/container-air'
 
   app 'container.app'

Library/Homebrew/cask/test/support/Casks/container-bzip2.rb

@@ -2,7 +2,7 @@ test_cask 'container-bzip2' do
   version '1.2.3'
   sha256 'eaf67b3a62cb9275f96e45d05c70b94bef9ef1dae344083e93eda6b0b388a61c'
 
-  url TestHelper.local_binary_url('container.bz2')
+  url "file://#{TEST_FIXTURE_DIR}/cask/container.bz2"
   homepage 'https://example.com/container-bzip2'
 
   app 'container-bzip2--1.2.3'

Library/Homebrew/cask/test/support/Casks/container-cab.rb

@@ -2,7 +2,7 @@ test_cask 'container-cab' do
   version '1.2.3'
   sha256 'c267f5cebb14814c8e612a8b7d2bda02aec913f869509b6f1d3883427c0f552b'
 
-  url TestHelper.local_binary_url('container.cab')
+  url "file://#{TEST_FIXTURE_DIR}/cask/container.cab"
   homepage 'https://example.com/container-cab'
 
   depends_on formula: 'cabextract'

Library/Homebrew/cask/test/support/Casks/container-dmg.rb

@@ -2,7 +2,7 @@ test_cask 'container-dmg' do
   version '1.2.3'
   sha256 '74d89d4fa5cef175cf43666ce11fefa3741aa1522114042ac75e656be37141a1'
 
-  url TestHelper.local_binary_url('container.dmg')
+  url "file://#{TEST_FIXTURE_DIR}/cask/container.dmg"
   homepage 'https://example.com/container-dmg'
 
   app 'container'

Library/Homebrew/cask/test/support/Casks/container-gzip.rb

@@ -2,7 +2,7 @@ test_cask 'container-gzip' do
   version '1.2.3'
   sha256 'fa4ebb5246583c4b6e62e1df4e3b71b4e38a1d7d91c025665827195d36214b20'
 
-  url TestHelper.local_binary_url('container.gz')
+  url "file://#{TEST_FIXTURE_DIR}/cask/container.gz"
   homepage 'https://example.com/container-gzip'
 
   app 'container'

Library/Homebrew/cask/test/support/Casks/container-lzma.rb

@@ -2,7 +2,7 @@ test_cask 'container-lzma' do
   version '1.2.3'
   sha256 '9d7edb32d02ab9bd9749a5bde8756595ea4cfcb1da02ca11c30fb591d4c1ed85'
 
-  url TestHelper.local_binary_url('container.lzma')
+  url "file://#{TEST_FIXTURE_DIR}/cask/container.lzma"
   homepage 'https://example.com/container-lzma'
 
   depends_on formula: 'lzma'

Library/Homebrew/cask/test/support/Casks/container-pkg.rb

@@ -2,6 +2,6 @@ test_cask 'container-pkg' do
   version '1.2.3'
   sha256 '611c50c8a2a2098951d2cd0fd54787ed81b92cd97b4b08bd7cba17f1e1d8e40b'
 
-  url TestHelper.local_binary_url('container.pkg')
+  url "file://#{TEST_FIXTURE_DIR}/cask/container.pkg"
   homepage 'https://example.com/container-pkg'
 end

Library/Homebrew/cask/test/support/Casks/container-rar.rb

@@ -2,7 +2,7 @@ test_cask 'container-rar' do
   version '1.2.3'
   sha256 '419af7864c0e1f125515c49b08bd22e0f7de39f5285897c440fe03c714871763'
 
-  url TestHelper.local_binary_url('container.rar')
+  url "file://#{TEST_FIXTURE_DIR}/cask/container.rar"
   homepage 'https://example.com/container-rar'
 
   depends_on formula: 'unar'

Library/Homebrew/cask/test/support/Casks/container-sit.rb

@@ -2,7 +2,7 @@ test_cask 'container-sit' do
   version '1.2.3'
   sha256 '0d21a64dce625044345c8ecca888e5439feaf254dac7f884917028a744f93cf3'
 
-  url TestHelper.local_binary_url('container.sit')
+  url "file://#{TEST_FIXTURE_DIR}/cask/container.sit"
   homepage 'https://example.com/container-sit'
 
   depends_on formula: 'unar'