From 31ec04704a1bc11d181b7d55a02d16b83ea2a11d Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sat, 22 Oct 2016 00:48:30 +0200 Subject: [PATCH] Move cask fixtures to `test/fixtures/cask`. --- .../cask/spec/support/Casks/with-binary.rb | 2 +- .../spec/support/Casks/with-embedded-binary.rb | 2 +- .../Homebrew/cask/spec/support/file_helper.rb | 16 ++++------------ .../cask/test/cask/artifact/alt_target_test.rb | 2 +- .../cask/test/cask/artifact/app_test.rb | 2 +- .../cask/test/cask/artifact/uninstall_test.rb | 2 +- .../cask/test/cask/artifact/zap_test.rb | 2 +- .../test/support/Casks/appdir-interpolation.rb | 2 +- .../cask/test/support/Casks/auto-updates.rb | 2 +- .../cask/test/support/Casks/bad-checksum.rb | 2 +- .../cask/test/support/Casks/container-7z.rb | 2 +- .../cask/test/support/Casks/container-air.rb | 2 +- .../cask/test/support/Casks/container-bzip2.rb | 2 +- .../cask/test/support/Casks/container-cab.rb | 2 +- .../cask/test/support/Casks/container-dmg.rb | 2 +- .../cask/test/support/Casks/container-gzip.rb | 2 +- .../cask/test/support/Casks/container-lzma.rb | 2 +- .../cask/test/support/Casks/container-pkg.rb | 2 +- .../cask/test/support/Casks/container-rar.rb | 2 +- .../cask/test/support/Casks/container-sit.rb | 2 +- .../cask/test/support/Casks/container-tar-gz.rb | 2 +- .../cask/test/support/Casks/container-xar.rb | 2 +- .../cask/test/support/Casks/container-xz.rb | 2 +- .../Casks/invalid/invalid-appcast-multiple.rb | 2 +- .../Casks/invalid/invalid-appcast-url.rb | 2 +- .../Casks/invalid/invalid-conflicts-with-key.rb | 2 +- .../invalid/invalid-depends-on-arch-value.rb | 2 +- .../Casks/invalid/invalid-depends-on-key.rb | 2 +- .../invalid-depends-on-macos-bad-release.rb | 2 +- ...nvalid-depends-on-macos-conflicting-forms.rb | 2 +- .../invalid/invalid-depends-on-x11-value.rb | 2 +- .../invalid/invalid-gpg-conflicting-keys.rb | 2 +- .../support/Casks/invalid/invalid-gpg-key-id.rb | 2 +- .../Casks/invalid/invalid-gpg-key-url.rb | 2 +- .../Casks/invalid/invalid-gpg-missing-key.rb | 2 +- .../invalid/invalid-gpg-multiple-stanzas.rb | 2 +- .../Casks/invalid/invalid-gpg-parameter.rb | 2 +- .../Casks/invalid/invalid-gpg-signature-url.rb | 2 +- .../support/Casks/invalid/invalid-gpg-type.rb | 2 +- .../Casks/invalid/invalid-header-format.rb | 2 +- .../invalid/invalid-header-token-mismatch.rb | 2 +- .../Casks/invalid/invalid-header-version.rb | 2 +- .../invalid/invalid-stage-only-conflict.rb | 2 +- .../Casks/invalid/invalid-two-homepage.rb | 2 +- .../support/Casks/invalid/invalid-two-url.rb | 2 +- .../Casks/invalid/invalid-two-version.rb | 2 +- .../cask/test/support/Casks/local-caffeine.rb | 2 +- .../test/support/Casks/local-transmission.rb | 2 +- .../cask/test/support/Casks/missing-checksum.rb | 2 +- .../cask/test/support/Casks/naked-executable.rb | 2 +- .../cask/test/support/Casks/nested-app.rb | 2 +- .../cask/test/support/Casks/no-checksum.rb | 2 +- .../cask/test/support/Casks/stage-only.rb | 2 +- .../cask/test/support/Casks/with-alt-target.rb | 2 +- .../cask/test/support/Casks/with-appcast.rb | 2 +- .../cask/test/support/Casks/with-caveats.rb | 2 +- .../support/Casks/with-conditional-caveats.rb | 2 +- .../test/support/Casks/with-conflicts-with.rb | 2 +- .../Casks/with-depends-on-arch-failure.rb | 2 +- .../test/support/Casks/with-depends-on-arch.rb | 2 +- .../Casks/with-depends-on-cask-cyclic-helper.rb | 2 +- .../Casks/with-depends-on-cask-cyclic.rb | 2 +- .../Casks/with-depends-on-cask-multiple.rb | 2 +- .../test/support/Casks/with-depends-on-cask.rb | 2 +- .../Casks/with-depends-on-formula-multiple.rb | 2 +- .../support/Casks/with-depends-on-formula.rb | 2 +- .../Casks/with-depends-on-macos-array.rb | 2 +- .../Casks/with-depends-on-macos-comparison.rb | 2 +- .../Casks/with-depends-on-macos-failure.rb | 2 +- .../Casks/with-depends-on-macos-string.rb | 2 +- .../Casks/with-depends-on-macos-symbol.rb | 2 +- .../support/Casks/with-depends-on-x11-false.rb | 2 +- .../test/support/Casks/with-depends-on-x11.rb | 2 +- .../Casks/with-generic-artifact-no-target.rb | 2 +- .../test/support/Casks/with-generic-artifact.rb | 2 +- .../cask/test/support/Casks/with-gpg-key-url.rb | 2 +- .../cask/test/support/Casks/with-gpg.rb | 2 +- .../cask/test/support/Casks/with-installable.rb | 4 ++-- .../test/support/Casks/with-installer-manual.rb | 2 +- .../test/support/Casks/with-installer-script.rb | 2 +- .../cask/test/support/Casks/with-macosx-dir.rb | 2 +- .../cask/test/support/Casks/with-pkgutil-zap.rb | 2 +- .../cask/test/support/Casks/with-suite.rb | 2 +- .../test/support/Casks/with-two-apps-correct.rb | 2 +- .../support/Casks/with-two-apps-incorrect.rb | 2 +- .../test/support/Casks/with-two-apps-subdir.rb | 2 +- .../test/support/Casks/with-uninstall-delete.rb | 2 +- .../Casks/with-uninstall-early-script.rb | 2 +- .../test/support/Casks/with-uninstall-kext.rb | 2 +- .../support/Casks/with-uninstall-launchctl.rb | 2 +- .../support/Casks/with-uninstall-login-item.rb | 2 +- .../support/Casks/with-uninstall-pkgutil.rb | 2 +- .../test/support/Casks/with-uninstall-quit.rb | 2 +- .../test/support/Casks/with-uninstall-rmdir.rb | 4 ++-- .../test/support/Casks/with-uninstall-script.rb | 2 +- .../test/support/Casks/with-uninstall-signal.rb | 2 +- .../test/support/Casks/with-uninstall-trash.rb | 2 +- .../cask/test/support/Casks/with-zap-delete.rb | 2 +- .../test/support/Casks/with-zap-early-script.rb | 2 +- .../cask/test/support/Casks/with-zap-kext.rb | 2 +- .../test/support/Casks/with-zap-launchctl.rb | 2 +- .../test/support/Casks/with-zap-login-item.rb | 2 +- .../cask/test/support/Casks/with-zap-pkgutil.rb | 2 +- .../cask/test/support/Casks/with-zap-quit.rb | 2 +- .../cask/test/support/Casks/with-zap-rmdir.rb | 4 ++-- .../cask/test/support/Casks/with-zap-script.rb | 2 +- .../cask/test/support/Casks/with-zap-signal.rb | 2 +- .../cask/test/support/Casks/with-zap-trash.rb | 2 +- .../cask/test/support/Casks/with-zap.rb | 2 +- Library/Homebrew/formula.rb | 2 +- .../fixtures/cask}/AppWithBinary.zip | Bin .../fixtures/cask}/AppWithEmbeddedBinary.zip | Bin .../fixtures/cask}/MyFancyApp.zip | Bin .../fixtures/cask}/MyFancyPkg.zip | Bin .../fixtures/cask}/NestedApp.dmg.zip | Bin .../fixtures/cask}/caffeine-suite.zip | Bin .../fixtures/cask}/caffeine.zip | Bin .../fixtures/cask}/caffeines-subdir.zip | Bin .../fixtures/cask}/caffeines.zip | Bin .../fixtures/cask}/container.7z | Bin .../fixtures/cask}/container.air | Bin .../fixtures/cask}/container.bz2 | Bin .../fixtures/cask}/container.cab | Bin .../fixtures/cask}/container.dmg | Bin .../fixtures/cask}/container.gz | Bin .../fixtures/cask}/container.lzma | Bin .../fixtures/cask}/container.pkg | Bin .../fixtures/cask}/container.rar | Bin .../fixtures/cask}/container.sit | Bin .../fixtures/cask}/container.tar.gz | Bin .../fixtures/cask}/container.xar | Bin .../fixtures/cask}/container.xz | Bin .../fixtures/cask}/empty_directory/.gitignore | 0 .../fixtures/cask}/naked_executable | 0 .../fixtures/cask}/transmission-2.61.dmg | Bin Library/Homebrew/test/lib/config.rb | 2 ++ Library/Homebrew/test/test_formula.rb | 2 +- Library/Homebrew/test/test_tab.rb | 4 ++-- Library/Homebrew/test/test_update_report.rb | 2 +- 139 files changed, 122 insertions(+), 128 deletions(-) rename Library/Homebrew/{cask/spec/support/binaries => test/fixtures/cask}/AppWithBinary.zip (100%) rename Library/Homebrew/{cask/spec/support/binaries => test/fixtures/cask}/AppWithEmbeddedBinary.zip (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/MyFancyApp.zip (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/MyFancyPkg.zip (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/NestedApp.dmg.zip (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/caffeine-suite.zip (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/caffeine.zip (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/caffeines-subdir.zip (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/caffeines.zip (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/container.7z (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/container.air (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/container.bz2 (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/container.cab (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/container.dmg (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/container.gz (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/container.lzma (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/container.pkg (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/container.rar (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/container.sit (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/container.tar.gz (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/container.xar (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/container.xz (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/empty_directory/.gitignore (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/naked_executable (100%) rename Library/Homebrew/{cask/test/support/binaries => test/fixtures/cask}/transmission-2.61.dmg (100%) diff --git a/Library/Homebrew/cask/spec/support/Casks/with-binary.rb b/Library/Homebrew/cask/spec/support/Casks/with-binary.rb index a067871250..d8cede7aad 100644 --- a/Library/Homebrew/cask/spec/support/Casks/with-binary.rb +++ b/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' diff --git a/Library/Homebrew/cask/spec/support/Casks/with-embedded-binary.rb b/Library/Homebrew/cask/spec/support/Casks/with-embedded-binary.rb index 796f28c78b..107c6cbe2e 100644 --- a/Library/Homebrew/cask/spec/support/Casks/with-embedded-binary.rb +++ b/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' diff --git a/Library/Homebrew/cask/spec/support/file_helper.rb b/Library/Homebrew/cask/spec/support/file_helper.rb index 8eb78f759f..abe7b26180 100644 --- a/Library/Homebrew/cask/spec/support/file_helper.rb +++ b/Library/Homebrew/cask/spec/support/file_helper.rb @@ -1,16 +1,8 @@ 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 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 da273a6ca8..d5702d4aff 100644 --- a/Library/Homebrew/cask/test/cask/artifact/alt_target_test.rb +++ b/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" diff --git a/Library/Homebrew/cask/test/cask/artifact/app_test.rb b/Library/Homebrew/cask/test/cask/artifact/app_test.rb index ea8fe16682..795e732bae 100644 --- a/Library/Homebrew/cask/test/cask/artifact/app_test.rb +++ b/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" diff --git a/Library/Homebrew/cask/test/cask/artifact/uninstall_test.rb b/Library/Homebrew/cask/test/cask/artifact/uninstall_test.rb index 08c179a534..10c51420a5 100644 --- a/Library/Homebrew/cask/test/cask/artifact/uninstall_test.rb +++ b/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( diff --git a/Library/Homebrew/cask/test/cask/artifact/zap_test.rb b/Library/Homebrew/cask/test/cask/artifact/zap_test.rb index da80f7bdea..3291afbcab 100644 --- a/Library/Homebrew/cask/test/cask/artifact/zap_test.rb +++ b/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( diff --git a/Library/Homebrew/cask/test/support/Casks/appdir-interpolation.rb b/Library/Homebrew/cask/test/support/Casks/appdir-interpolation.rb index f1d6190bc4..fdc09ef5ac 100644 --- a/Library/Homebrew/cask/test/support/Casks/appdir-interpolation.rb +++ b/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" diff --git a/Library/Homebrew/cask/test/support/Casks/auto-updates.rb b/Library/Homebrew/cask/test/support/Casks/auto-updates.rb index ac3e008659..0fcdb991a9 100644 --- a/Library/Homebrew/cask/test/support/Casks/auto-updates.rb +++ b/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 diff --git a/Library/Homebrew/cask/test/support/Casks/bad-checksum.rb b/Library/Homebrew/cask/test/support/Casks/bad-checksum.rb index 074dae01f3..79e5f24c9a 100644 --- a/Library/Homebrew/cask/test/support/Casks/bad-checksum.rb +++ b/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' diff --git a/Library/Homebrew/cask/test/support/Casks/container-7z.rb b/Library/Homebrew/cask/test/support/Casks/container-7z.rb index 0526bf7fe6..7dd01eee4a 100644 --- a/Library/Homebrew/cask/test/support/Casks/container-7z.rb +++ b/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' diff --git a/Library/Homebrew/cask/test/support/Casks/container-air.rb b/Library/Homebrew/cask/test/support/Casks/container-air.rb index 949b0f7a77..c310e0a6f0 100644 --- a/Library/Homebrew/cask/test/support/Casks/container-air.rb +++ b/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' diff --git a/Library/Homebrew/cask/test/support/Casks/container-bzip2.rb b/Library/Homebrew/cask/test/support/Casks/container-bzip2.rb index b11b032f38..9d9bdff98e 100644 --- a/Library/Homebrew/cask/test/support/Casks/container-bzip2.rb +++ b/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' diff --git a/Library/Homebrew/cask/test/support/Casks/container-cab.rb b/Library/Homebrew/cask/test/support/Casks/container-cab.rb index bdd1b72569..ebc7a544e0 100644 --- a/Library/Homebrew/cask/test/support/Casks/container-cab.rb +++ b/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' diff --git a/Library/Homebrew/cask/test/support/Casks/container-dmg.rb b/Library/Homebrew/cask/test/support/Casks/container-dmg.rb index 6eb8ac013f..d63596f42c 100644 --- a/Library/Homebrew/cask/test/support/Casks/container-dmg.rb +++ b/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' diff --git a/Library/Homebrew/cask/test/support/Casks/container-gzip.rb b/Library/Homebrew/cask/test/support/Casks/container-gzip.rb index eac74a04c1..c2ab00384e 100644 --- a/Library/Homebrew/cask/test/support/Casks/container-gzip.rb +++ b/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' diff --git a/Library/Homebrew/cask/test/support/Casks/container-lzma.rb b/Library/Homebrew/cask/test/support/Casks/container-lzma.rb index faa37c3baa..d5f7085234 100644 --- a/Library/Homebrew/cask/test/support/Casks/container-lzma.rb +++ b/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' diff --git a/Library/Homebrew/cask/test/support/Casks/container-pkg.rb b/Library/Homebrew/cask/test/support/Casks/container-pkg.rb index 4f4cd99fa9..959caaa085 100644 --- a/Library/Homebrew/cask/test/support/Casks/container-pkg.rb +++ b/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 diff --git a/Library/Homebrew/cask/test/support/Casks/container-rar.rb b/Library/Homebrew/cask/test/support/Casks/container-rar.rb index 2105b738df..7186577a26 100644 --- a/Library/Homebrew/cask/test/support/Casks/container-rar.rb +++ b/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' diff --git a/Library/Homebrew/cask/test/support/Casks/container-sit.rb b/Library/Homebrew/cask/test/support/Casks/container-sit.rb index 282e229404..3a0faad97b 100644 --- a/Library/Homebrew/cask/test/support/Casks/container-sit.rb +++ b/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' diff --git a/Library/Homebrew/cask/test/support/Casks/container-tar-gz.rb b/Library/Homebrew/cask/test/support/Casks/container-tar-gz.rb index 1e6c12959d..58e1d82fdd 100644 --- a/Library/Homebrew/cask/test/support/Casks/container-tar-gz.rb +++ b/Library/Homebrew/cask/test/support/Casks/container-tar-gz.rb @@ -2,7 +2,7 @@ test_cask 'container-tar-gz' do version '1.2.3' sha256 'fab685fabf73d5a9382581ce8698fce9408f5feaa49fa10d9bc6c510493300f5' - url TestHelper.local_binary_url('container.tar.gz') + url "file://#{TEST_FIXTURE_DIR}/cask/container.tar.gz" homepage 'https://example.com/container-tar-gz' app 'container' diff --git a/Library/Homebrew/cask/test/support/Casks/container-xar.rb b/Library/Homebrew/cask/test/support/Casks/container-xar.rb index 96a81dc644..35e01d0a84 100644 --- a/Library/Homebrew/cask/test/support/Casks/container-xar.rb +++ b/Library/Homebrew/cask/test/support/Casks/container-xar.rb @@ -2,7 +2,7 @@ test_cask 'container-xar' do version '1.2.3' sha256 '5bb8e09a6fc630ebeaf266b1fd2d15e2ae7d32d7e4da6668a8093426fa1ba509' - url TestHelper.local_binary_url('container.xar') + url "file://#{TEST_FIXTURE_DIR}/cask/container.xar" homepage 'https://example.com/container-xar' app 'container' diff --git a/Library/Homebrew/cask/test/support/Casks/container-xz.rb b/Library/Homebrew/cask/test/support/Casks/container-xz.rb index 8fd42c73f6..b27e908aea 100644 --- a/Library/Homebrew/cask/test/support/Casks/container-xz.rb +++ b/Library/Homebrew/cask/test/support/Casks/container-xz.rb @@ -2,7 +2,7 @@ test_cask 'container-xz' do version '1.2.3' sha256 '839263f474edde1d54a9101606e6f0dc9d963acc93f6dcc5af8d10ebc3187c02' - url TestHelper.local_binary_url('container.xz') + url "file://#{TEST_FIXTURE_DIR}/cask/container.xz" homepage 'https://example.com/container-xz' depends_on formula: 'xz' 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 0cb56c283c..db26210744 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 @@ -2,7 +2,7 @@ test_cask 'invalid-appcast-multiple' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" appcast 'http://example.com/appcast1.xml', checkpoint: '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' appcast 'http://example.com/appcast2.xml', 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 c57d235393..b4c11b1bed 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 @@ -2,7 +2,7 @@ test_cask 'invalid-appcast-url' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" appcast 1, checkpoint: '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' homepage 'http://example.com/invalid-appcast-url' 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 c37a796ea6..d39d124b0b 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 @@ -2,7 +2,7 @@ test_cask 'invalid-conflicts-with-key' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/invalid-conflicts-with-key' conflicts_with no_such_key: 'unar' 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 2582213cac..b0c919a9be 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 @@ -2,7 +2,7 @@ test_cask 'invalid-depends-on-arch-value' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/invalid-depends-on-arch-value' depends_on arch: :no_such_arch 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 0ede1144fc..05304e8061 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 @@ -2,7 +2,7 @@ test_cask 'invalid-depends-on-key' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/invalid-depends-on-key' depends_on no_such_key: 'unar' 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 8ff76ef23a..183dd5d919 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 @@ -2,7 +2,7 @@ test_cask 'invalid-depends-on-macos-bad-release' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/invalid-depends-on-macos-bad-release' depends_on macos: :no_such_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 a5c6edc9c4..b1f763d76f 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 @@ -2,7 +2,7 @@ test_cask 'invalid-depends-on-macos-conflicting-forms' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/invalid-depends-on-macos-conflicting-forms' depends_on macos: :yosemite 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 306db3e761..eefd3ac402 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 @@ -2,7 +2,7 @@ test_cask 'invalid-depends-on-x11-value' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/invalid-depends-on-x11-value' depends_on x11: :no_such_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 7d30a337a1..bf14d372b7 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 @@ -2,7 +2,7 @@ test_cask 'invalid-gpg-conflicting-keys' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/invalid-gpg-conflicting-keys' gpg 'http://example.com/gpg-signature.asc', key_id: '01234567', 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 44831de375..626e02a473 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 @@ -2,7 +2,7 @@ test_cask 'invalid-gpg-key-id' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/invalid-gpg-key-id' gpg 'http://example.com/gpg-signature.asc', key_id: '012' 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 217d1af510..77d41ed6b5 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 @@ -2,7 +2,7 @@ test_cask 'invalid-gpg-key-url' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/invalid-gpg-key-url' gpg 'http://example.com/gpg-signature.asc', key_url: 1 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 8818d41298..460bcd532c 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 @@ -2,7 +2,7 @@ test_cask 'invalid-gpg-missing-key' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/invalid-gpg-missing-keys' gpg 'http://example.com/gpg-signature.asc' 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 4bf13712f0..8abc894860 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 @@ -2,7 +2,7 @@ test_cask 'invalid-gpg-multiple-stanzas' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/invalid-gpg-multiple-stanzas' gpg 'http://example.com/gpg-signature.asc', key_id: '01234567' 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 ad8caec737..f1abc9225f 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 @@ -2,7 +2,7 @@ test_cask 'invalid-gpg-parameter' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/invalid-gpg-type' gpg 'http://example.com/gpg-signature.asc', no_such_parameter: :value 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 0102554753..1b9e7362f4 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 @@ -2,7 +2,7 @@ test_cask 'invalid-gpg-signature-url' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/invalid-gpg-signature-url' gpg 1, key_id: '01234567' 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 3862732697..2660476179 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 @@ -2,7 +2,7 @@ test_cask 'invalid-gpg-type' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/invalid-gpg-type' gpg 'http://example.com/gpg-signature.asc', no_such_parameter: :value 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 6ab549b11f..a8159c9795 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 @@ -2,7 +2,7 @@ test_cask => 'invalid-header-format' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/local-caffeine' app 'Caffeine.app' 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 4c51019f43..2b8ad56197 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 @@ -2,7 +2,7 @@ test_cask 'invalid-header-token-mismatch-this-text-does-not-belong' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/local-caffeine' app 'Caffeine.app' 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 d07c0f43bb..47851c0e0a 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 @@ -2,7 +2,7 @@ test_cask 'invalid-header-version' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/local-caffeine' app 'Caffeine.app' diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-stage-only-conflict.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-stage-only-conflict.rb index 1dc8757398..84510ac24c 100644 --- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-stage-only-conflict.rb +++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-stage-only-conflict.rb @@ -2,7 +2,7 @@ test_cask 'invalid-stage-only-conflict' 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/invalid-stage-only-conflict' app 'Transmission.app' 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 0f562f13f3..d4e5ff4a98 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 @@ -2,7 +2,7 @@ test_cask 'invalid-two-homepage' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/local-caffeine' homepage 'http://www.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 8b2d435cc6..49e4707887 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 @@ -2,7 +2,7 @@ test_cask 'invalid-two-url' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" url 'http://example.com/caffeine.zip' homepage 'http://example.com/local-caffeine' 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 78ec5f367e..c9fe377726 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 @@ -3,7 +3,7 @@ test_cask 'invalid-two-version' do version '2.0' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/local-caffeine' app 'Caffeine.app' diff --git a/Library/Homebrew/cask/test/support/Casks/local-caffeine.rb b/Library/Homebrew/cask/test/support/Casks/local-caffeine.rb index 93a7624a52..2be9b4397d 100644 --- a/Library/Homebrew/cask/test/support/Casks/local-caffeine.rb +++ b/Library/Homebrew/cask/test/support/Casks/local-caffeine.rb @@ -2,7 +2,7 @@ test_cask 'local-caffeine' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/local-caffeine' app 'Caffeine.app' diff --git a/Library/Homebrew/cask/test/support/Casks/local-transmission.rb b/Library/Homebrew/cask/test/support/Casks/local-transmission.rb index 365ef02f74..f5244d0a5a 100644 --- a/Library/Homebrew/cask/test/support/Casks/local-transmission.rb +++ b/Library/Homebrew/cask/test/support/Casks/local-transmission.rb @@ -2,7 +2,7 @@ test_cask 'local-transmission' 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/local-transmission' app 'Transmission.app' diff --git a/Library/Homebrew/cask/test/support/Casks/missing-checksum.rb b/Library/Homebrew/cask/test/support/Casks/missing-checksum.rb index 3187f6fd23..5e1886a57a 100644 --- a/Library/Homebrew/cask/test/support/Casks/missing-checksum.rb +++ b/Library/Homebrew/cask/test/support/Casks/missing-checksum.rb @@ -1,7 +1,7 @@ test_cask 'missing-checksum' do version '1.2.3' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/local-caffeine' app 'Caffeine.app' diff --git a/Library/Homebrew/cask/test/support/Casks/naked-executable.rb b/Library/Homebrew/cask/test/support/Casks/naked-executable.rb index 03e89e97b1..619c7a5fb2 100644 --- a/Library/Homebrew/cask/test/support/Casks/naked-executable.rb +++ b/Library/Homebrew/cask/test/support/Casks/naked-executable.rb @@ -2,7 +2,7 @@ test_cask 'naked-executable' do version '1.2.3' sha256 '306c6ca7407560340797866e077e053627ad409277d1b9da58106fce4cf717cb' - url TestHelper.local_binary_url('naked_executable') + url "file://#{TEST_FIXTURE_DIR}/cask/naked_executable" homepage 'http://example.com/naked-executable' container type: :naked diff --git a/Library/Homebrew/cask/test/support/Casks/nested-app.rb b/Library/Homebrew/cask/test/support/Casks/nested-app.rb index 77bd04127d..526c7414aa 100644 --- a/Library/Homebrew/cask/test/support/Casks/nested-app.rb +++ b/Library/Homebrew/cask/test/support/Casks/nested-app.rb @@ -2,7 +2,7 @@ test_cask 'nested-app' do version '1.2.3' sha256 '1866dfa833b123bb8fe7fa7185ebf24d28d300d0643d75798bc23730af734216' - url TestHelper.local_binary_url('NestedApp.dmg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/NestedApp.dmg.zip" homepage 'http://example.com/nested-app' container nested: 'NestedApp.dmg' diff --git a/Library/Homebrew/cask/test/support/Casks/no-checksum.rb b/Library/Homebrew/cask/test/support/Casks/no-checksum.rb index dbe62b02b6..d9ba354f5b 100644 --- a/Library/Homebrew/cask/test/support/Casks/no-checksum.rb +++ b/Library/Homebrew/cask/test/support/Casks/no-checksum.rb @@ -2,7 +2,7 @@ test_cask 'no-checksum' do version '1.2.3' sha256 :no_check - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/local-caffeine' app 'Caffeine.app' diff --git a/Library/Homebrew/cask/test/support/Casks/stage-only.rb b/Library/Homebrew/cask/test/support/Casks/stage-only.rb index d7fae47d6c..b52b5d3d28 100644 --- a/Library/Homebrew/cask/test/support/Casks/stage-only.rb +++ b/Library/Homebrew/cask/test/support/Casks/stage-only.rb @@ -2,7 +2,7 @@ test_cask 'stage-only' 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/stage-only' stage_only true 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 9a3196ce14..b75ff320c5 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-alt-target.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-alt-target.rb @@ -2,7 +2,7 @@ test_cask 'with-alt-target' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/local-caffeine' app 'Caffeine.app', target: 'AnotherName.app' diff --git a/Library/Homebrew/cask/test/support/Casks/with-appcast.rb b/Library/Homebrew/cask/test/support/Casks/with-appcast.rb index fb4ad9249f..f99f7a93c4 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-appcast.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-appcast.rb @@ -2,7 +2,7 @@ test_cask 'with-appcast' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" appcast 'http://example.com/appcast.xml', checkpoint: '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' homepage 'http://example.com/with-appcast' diff --git a/Library/Homebrew/cask/test/support/Casks/with-caveats.rb b/Library/Homebrew/cask/test/support/Casks/with-caveats.rb index 38ae23b44a..30d3a49b37 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-caveats.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-caveats.rb @@ -2,7 +2,7 @@ test_cask 'with-caveats' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/local-caffeine' app 'Caffeine.app' 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 db55930a28..d8a3836b84 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-conditional-caveats.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-conditional-caveats.rb @@ -2,7 +2,7 @@ test_cask 'with-conditional-caveats' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/local-caffeine' app 'Caffeine.app' 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 540f14164b..a20d932ba2 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-conflicts-with.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-conflicts-with.rb @@ -2,7 +2,7 @@ test_cask 'with-conflicts-with' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-conflicts-with' conflicts_with formula: 'unar' 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 5f9016be90..14c9165735 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 @@ -2,7 +2,7 @@ test_cask 'with-depends-on-arch-failure' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-depends-on-arch-failure' # guarantee mismatched hardware 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 0746c38744..fe5e4ba032 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 @@ -2,7 +2,7 @@ test_cask 'with-depends-on-arch' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-depends-on-arch' # covers all known hardware; always succeeds 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 4a11a163ba..327fc4000d 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 @@ -2,7 +2,7 @@ test_cask 'with-depends-on-cask-cyclic-helper' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-depends-on-cask-cyclic-helper' depends_on cask: 'with-depends-on-cask-cyclic' 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 bb782ae19f..f74d860bff 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 @@ -2,7 +2,7 @@ test_cask 'with-depends-on-cask-cyclic' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-depends-on-cask-cyclic' depends_on cask: 'local-caffeine' 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 1dc9393508..bb69b75069 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 @@ -2,7 +2,7 @@ test_cask 'with-depends-on-cask-multiple' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-depends-on-cask-multiple' depends_on cask: 'local-caffeine' 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 62f32c32b6..05a1805605 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 @@ -2,7 +2,7 @@ test_cask 'with-depends-on-cask' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-depends-on-cask' depends_on cask: 'local-transmission' 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 1d02add393..c99d2dee15 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 @@ -2,7 +2,7 @@ test_cask 'with-depends-on-formula-multiple' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-depends-on-formula-multiple' depends_on formula: 'unar' 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 3dd5428930..b0339e68cc 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 @@ -2,7 +2,7 @@ test_cask 'with-depends-on-formula' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-depends-on-formula' depends_on formula: 'unar' 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 9467825366..cae16704ce 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 @@ -2,7 +2,7 @@ test_cask 'with-depends-on-macos-array' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-depends-on-macos-array' # since all OS releases are included, this should always pass 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 2780b94b7a..7f14dd84fa 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 @@ -2,7 +2,7 @@ test_cask 'with-depends-on-macos-comparison' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-depends-on-macos-comparison' depends_on macos: '>= 10.4' 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 4e3c777ec9..ecefff362b 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 @@ -2,7 +2,7 @@ test_cask 'with-depends-on-macos-failure' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-depends-on-macos-failure' # guarantee a mismatched release 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 7c15e63080..6e370d46ac 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 @@ -2,7 +2,7 @@ test_cask 'with-depends-on-macos-string' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-depends-on-macos-string' depends_on macos: MacOS.version.to_s 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 10b1de754a..7f11b6e646 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 @@ -2,7 +2,7 @@ test_cask 'with-depends-on-macos-symbol' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-depends-on-macos-symbol' depends_on macos: MacOS.version.to_sym 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 d52a0e8dfa..fc84f2daae 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 @@ -2,7 +2,7 @@ test_cask 'with-depends-on-x11-false' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-depends-on-x11-false' 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 c7384cf3ab..b1a7bad2b2 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 @@ -2,7 +2,7 @@ test_cask 'with-depends-on-x11' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-depends-on-x11' depends_on x11: true 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 3d8d80445e..a7d347fb5c 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 @@ -2,7 +2,7 @@ test_cask 'with-generic-artifact-no-target' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-generic-artifact' artifact 'Caffeine.app' 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 9e379c543a..e718b994b9 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-generic-artifact.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-generic-artifact.rb @@ -2,7 +2,7 @@ test_cask 'with-generic-artifact' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-generic-artifact' artifact 'Caffeine.app', target: "#{Hbc.appdir}/Caffeine.app" 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 943421b82e..6aa735e1ff 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 @@ -2,7 +2,7 @@ test_cask 'with-gpg-key-url' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-gpg-key-url' gpg 'http://example.com/gpg-signature.asc', key_url: 'http://example.com/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 dcdd8f5933..1f70425158 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-gpg.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-gpg.rb @@ -2,7 +2,7 @@ test_cask 'with-gpg' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-gpg' gpg 'http://example.com/gpg-signature.asc', key_id: '01234567' diff --git a/Library/Homebrew/cask/test/support/Casks/with-installable.rb b/Library/Homebrew/cask/test/support/Casks/with-installable.rb index b32273a6c2..d1105b50e1 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-installable.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-installable.rb @@ -2,7 +2,7 @@ test_cask 'with-installable' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'MyFancyPkg/Fancy.pkg' @@ -16,5 +16,5 @@ test_cask 'with-installable' do 'impermissible/relative/path', '/another/impermissible/../relative/path', ], - rmdir: TestHelper.local_binary_path('empty_directory') + rmdir: "#{TEST_FIXTURE_DIR}/cask/empty_directory" end 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 7e9a8eac74..92e2e09df9 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-installer-manual.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-installer-manual.rb @@ -2,7 +2,7 @@ test_cask 'with-installer-manual' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/local-caffeine' installer manual: 'Caffeine.app' 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 c4b18417a9..5e98eab484 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-installer-script.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-installer-script.rb @@ -2,7 +2,7 @@ test_cask 'with-installer-script' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/with-install-script' installer script: '/usr/bin/true', diff --git a/Library/Homebrew/cask/test/support/Casks/with-macosx-dir.rb b/Library/Homebrew/cask/test/support/Casks/with-macosx-dir.rb index 24c4ec4dd8..8376271199 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-macosx-dir.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-macosx-dir.rb @@ -2,7 +2,7 @@ test_cask 'with-macosx-dir' do version '1.2.3' sha256 '5633c3a0f2e572cbf021507dec78c50998b398c343232bdfc7e26221d0a5db4d' - url TestHelper.local_binary_url('MyFancyApp.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyApp.zip" homepage 'http://example.com/MyFancyApp' app 'MyFancyApp/MyFancyApp.app' diff --git a/Library/Homebrew/cask/test/support/Casks/with-pkgutil-zap.rb b/Library/Homebrew/cask/test/support/Casks/with-pkgutil-zap.rb index 6440285a01..8bb42c447d 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-pkgutil-zap.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-pkgutil-zap.rb @@ -2,7 +2,7 @@ test_cask 'with-pkgutil-zap' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-suite.rb b/Library/Homebrew/cask/test/support/Casks/with-suite.rb index e92b224253..c36151d526 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-suite.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-suite.rb @@ -2,7 +2,7 @@ test_cask 'with-suite' do version '1.2.3' sha256 'd95dcc12d4e5be0bc3cb9793c4b7e7f69a25f0b3c7418494b0c883957e6eeae4' - url TestHelper.local_binary_url('caffeine-suite.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine-suite.zip" name 'Caffeine' homepage 'http://example.com/with-suite' 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 069eb9fed8..8eb68d88a5 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 @@ -2,7 +2,7 @@ test_cask 'with-two-apps-correct' do version '1.2.3' sha256 '3178fbfd1ea5d87a2a0662a4eb599ebc9a03888e73f37538d9f3f6ee69d2368e' - url TestHelper.local_binary_url('caffeines.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeines.zip" homepage 'http://example.com/local-caffeine' app 'Caffeine Mini.app' 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 baf6e52f0d..6bd316dfe3 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 @@ -2,7 +2,7 @@ test_cask 'with-two-apps-incorrect' do version '1.2.3' sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94' - url TestHelper.local_binary_url('caffeine.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip" homepage 'http://example.com/local-caffeine' app 'Caffeine.app', 'Caffeine.app/Contents/MacOS/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 d4783e6a65..2024236914 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 @@ -2,7 +2,7 @@ test_cask 'with-two-apps-subdir' do version '1.2.3' sha256 'd687c22a21c02bd8f07da9302c8292b93a04df9a929e3f04d09aea6c76f75c65' - url TestHelper.local_binary_url('caffeines-subdir.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/caffeines-subdir.zip" homepage 'http://example.com/local-caffeine' app 'Caffeines/Caffeine Mini.app' diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-delete.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-delete.rb index c85b3bd0f9..203f18405e 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-delete.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-uninstall-delete.rb @@ -2,7 +2,7 @@ test_cask 'with-uninstall-delete' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-early-script.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-early-script.rb index 6fe3842e21..a26abab1cb 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-early-script.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-uninstall-early-script.rb @@ -2,7 +2,7 @@ test_cask 'with-uninstall-early-script' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'MyFancyPkg/Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-kext.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-kext.rb index 682ce689e7..fa54c7e1fa 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-kext.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-uninstall-kext.rb @@ -2,7 +2,7 @@ test_cask 'with-uninstall-kext' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-launchctl.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-launchctl.rb index 0e601b41e9..51ad45a092 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-launchctl.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-uninstall-launchctl.rb @@ -2,7 +2,7 @@ test_cask 'with-uninstall-launchctl' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyApp.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyApp.zip" homepage 'http://example.com/fancy' app 'Fancy.app' diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-login-item.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-login-item.rb index d977b31e33..26dca6f1a4 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-login-item.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-uninstall-login-item.rb @@ -2,7 +2,7 @@ test_cask 'with-uninstall-login-item' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'MyFancyPkg/Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-pkgutil.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-pkgutil.rb index 773e1e43b6..db77a460b6 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-pkgutil.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-uninstall-pkgutil.rb @@ -2,7 +2,7 @@ test_cask 'with-uninstall-pkgutil' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-quit.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-quit.rb index 88e063c627..19337b18ab 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-quit.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-uninstall-quit.rb @@ -2,7 +2,7 @@ test_cask 'with-uninstall-quit' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'MyFancyPkg/Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-rmdir.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-rmdir.rb index ce1c665186..88142ea71a 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-rmdir.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-uninstall-rmdir.rb @@ -2,10 +2,10 @@ test_cask 'with-uninstall-rmdir' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'MyFancyPkg/Fancy.pkg' - uninstall rmdir: TestHelper.local_binary_path('empty_directory') + uninstall rmdir: "#{TEST_FIXTURE_DIR}/cask/empty_directory" end diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-script.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-script.rb index 975a144422..d2e0d6167d 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-script.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-uninstall-script.rb @@ -2,7 +2,7 @@ test_cask 'with-uninstall-script' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'MyFancyPkg/Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-signal.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-signal.rb index 8087681739..cc32b888a5 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-signal.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-uninstall-signal.rb @@ -2,7 +2,7 @@ test_cask 'with-uninstall-signal' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'MyFancyPkg/Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-trash.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-trash.rb index 16f174c2d6..4fe58a19a0 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-trash.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-uninstall-trash.rb @@ -2,7 +2,7 @@ test_cask 'with-uninstall-trash' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-delete.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-delete.rb index 77d50ffbaa..c76a9acb06 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-zap-delete.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-zap-delete.rb @@ -2,7 +2,7 @@ test_cask 'with-zap-delete' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-early-script.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-early-script.rb index 299c4d135e..d35c1809e0 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-zap-early-script.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-zap-early-script.rb @@ -2,7 +2,7 @@ test_cask 'with-zap-early-script' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'MyFancyPkg/Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-kext.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-kext.rb index d8809b4097..463fe8133f 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-zap-kext.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-zap-kext.rb @@ -2,7 +2,7 @@ test_cask 'with-zap-kext' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-launchctl.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-launchctl.rb index 321e17a789..aab285672c 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-zap-launchctl.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-zap-launchctl.rb @@ -2,7 +2,7 @@ test_cask 'with-zap-launchctl' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyApp.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyApp.zip" homepage 'http://example.com/fancy' app 'Fancy.app' diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-login-item.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-login-item.rb index a7af6ce63f..d7ba9a65bd 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-zap-login-item.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-zap-login-item.rb @@ -2,7 +2,7 @@ test_cask 'with-zap-login-item' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'MyFancyPkg/Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-pkgutil.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-pkgutil.rb index ded6508cd1..17a6670006 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-zap-pkgutil.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-zap-pkgutil.rb @@ -2,7 +2,7 @@ test_cask 'with-zap-pkgutil' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-quit.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-quit.rb index 0b21221c86..21f824ae96 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-zap-quit.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-zap-quit.rb @@ -2,7 +2,7 @@ test_cask 'with-zap-quit' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'MyFancyPkg/Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-rmdir.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-rmdir.rb index f3f7999195..eac02ad0e2 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-zap-rmdir.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-zap-rmdir.rb @@ -2,10 +2,10 @@ test_cask 'with-zap-rmdir' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'MyFancyPkg/Fancy.pkg' - zap rmdir: TestHelper.local_binary_path('empty_directory') + zap rmdir: "#{TEST_FIXTURE_DIR}/cask/empty_directory" end diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-script.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-script.rb index 9e8ae0d121..f8646a2672 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-zap-script.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-zap-script.rb @@ -2,7 +2,7 @@ test_cask 'with-zap-script' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'MyFancyPkg/Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-signal.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-signal.rb index 7338b67b0c..5accd83372 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-zap-signal.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-zap-signal.rb @@ -2,7 +2,7 @@ test_cask 'with-zap-signal' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'MyFancyPkg/Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-trash.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-trash.rb index 7295b7a235..aef4e0eab7 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-zap-trash.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-zap-trash.rb @@ -2,7 +2,7 @@ test_cask 'with-zap-trash' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'Fancy.pkg' diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap.rb b/Library/Homebrew/cask/test/support/Casks/with-zap.rb index 752aca019b..056c90671a 100644 --- a/Library/Homebrew/cask/test/support/Casks/with-zap.rb +++ b/Library/Homebrew/cask/test/support/Casks/with-zap.rb @@ -2,7 +2,7 @@ test_cask 'with-zap' do version '1.2.3' sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b' - url TestHelper.local_binary_url('MyFancyPkg.zip') + url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip" homepage 'http://example.com/fancy-pkg' pkg 'MyFancyPkg/Fancy.pkg' diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 69cab88c47..f1d907b7a5 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -1596,7 +1596,7 @@ class Formula # @private def test_fixtures(file) - HOMEBREW_LIBRARY.join("Homebrew", "test", "fixtures", file) + HOMEBREW_LIBRARY_PATH.join("test", "fixtures", file) end # This method is overriden in {Formula} subclasses to provide the installation instructions. diff --git a/Library/Homebrew/cask/spec/support/binaries/AppWithBinary.zip b/Library/Homebrew/test/fixtures/cask/AppWithBinary.zip similarity index 100% rename from Library/Homebrew/cask/spec/support/binaries/AppWithBinary.zip rename to Library/Homebrew/test/fixtures/cask/AppWithBinary.zip diff --git a/Library/Homebrew/cask/spec/support/binaries/AppWithEmbeddedBinary.zip b/Library/Homebrew/test/fixtures/cask/AppWithEmbeddedBinary.zip similarity index 100% rename from Library/Homebrew/cask/spec/support/binaries/AppWithEmbeddedBinary.zip rename to Library/Homebrew/test/fixtures/cask/AppWithEmbeddedBinary.zip diff --git a/Library/Homebrew/cask/test/support/binaries/MyFancyApp.zip b/Library/Homebrew/test/fixtures/cask/MyFancyApp.zip similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/MyFancyApp.zip rename to Library/Homebrew/test/fixtures/cask/MyFancyApp.zip diff --git a/Library/Homebrew/cask/test/support/binaries/MyFancyPkg.zip b/Library/Homebrew/test/fixtures/cask/MyFancyPkg.zip similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/MyFancyPkg.zip rename to Library/Homebrew/test/fixtures/cask/MyFancyPkg.zip diff --git a/Library/Homebrew/cask/test/support/binaries/NestedApp.dmg.zip b/Library/Homebrew/test/fixtures/cask/NestedApp.dmg.zip similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/NestedApp.dmg.zip rename to Library/Homebrew/test/fixtures/cask/NestedApp.dmg.zip diff --git a/Library/Homebrew/cask/test/support/binaries/caffeine-suite.zip b/Library/Homebrew/test/fixtures/cask/caffeine-suite.zip similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/caffeine-suite.zip rename to Library/Homebrew/test/fixtures/cask/caffeine-suite.zip diff --git a/Library/Homebrew/cask/test/support/binaries/caffeine.zip b/Library/Homebrew/test/fixtures/cask/caffeine.zip similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/caffeine.zip rename to Library/Homebrew/test/fixtures/cask/caffeine.zip diff --git a/Library/Homebrew/cask/test/support/binaries/caffeines-subdir.zip b/Library/Homebrew/test/fixtures/cask/caffeines-subdir.zip similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/caffeines-subdir.zip rename to Library/Homebrew/test/fixtures/cask/caffeines-subdir.zip diff --git a/Library/Homebrew/cask/test/support/binaries/caffeines.zip b/Library/Homebrew/test/fixtures/cask/caffeines.zip similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/caffeines.zip rename to Library/Homebrew/test/fixtures/cask/caffeines.zip diff --git a/Library/Homebrew/cask/test/support/binaries/container.7z b/Library/Homebrew/test/fixtures/cask/container.7z similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/container.7z rename to Library/Homebrew/test/fixtures/cask/container.7z diff --git a/Library/Homebrew/cask/test/support/binaries/container.air b/Library/Homebrew/test/fixtures/cask/container.air similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/container.air rename to Library/Homebrew/test/fixtures/cask/container.air diff --git a/Library/Homebrew/cask/test/support/binaries/container.bz2 b/Library/Homebrew/test/fixtures/cask/container.bz2 similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/container.bz2 rename to Library/Homebrew/test/fixtures/cask/container.bz2 diff --git a/Library/Homebrew/cask/test/support/binaries/container.cab b/Library/Homebrew/test/fixtures/cask/container.cab similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/container.cab rename to Library/Homebrew/test/fixtures/cask/container.cab diff --git a/Library/Homebrew/cask/test/support/binaries/container.dmg b/Library/Homebrew/test/fixtures/cask/container.dmg similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/container.dmg rename to Library/Homebrew/test/fixtures/cask/container.dmg diff --git a/Library/Homebrew/cask/test/support/binaries/container.gz b/Library/Homebrew/test/fixtures/cask/container.gz similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/container.gz rename to Library/Homebrew/test/fixtures/cask/container.gz diff --git a/Library/Homebrew/cask/test/support/binaries/container.lzma b/Library/Homebrew/test/fixtures/cask/container.lzma similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/container.lzma rename to Library/Homebrew/test/fixtures/cask/container.lzma diff --git a/Library/Homebrew/cask/test/support/binaries/container.pkg b/Library/Homebrew/test/fixtures/cask/container.pkg similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/container.pkg rename to Library/Homebrew/test/fixtures/cask/container.pkg diff --git a/Library/Homebrew/cask/test/support/binaries/container.rar b/Library/Homebrew/test/fixtures/cask/container.rar similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/container.rar rename to Library/Homebrew/test/fixtures/cask/container.rar diff --git a/Library/Homebrew/cask/test/support/binaries/container.sit b/Library/Homebrew/test/fixtures/cask/container.sit similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/container.sit rename to Library/Homebrew/test/fixtures/cask/container.sit diff --git a/Library/Homebrew/cask/test/support/binaries/container.tar.gz b/Library/Homebrew/test/fixtures/cask/container.tar.gz similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/container.tar.gz rename to Library/Homebrew/test/fixtures/cask/container.tar.gz diff --git a/Library/Homebrew/cask/test/support/binaries/container.xar b/Library/Homebrew/test/fixtures/cask/container.xar similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/container.xar rename to Library/Homebrew/test/fixtures/cask/container.xar diff --git a/Library/Homebrew/cask/test/support/binaries/container.xz b/Library/Homebrew/test/fixtures/cask/container.xz similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/container.xz rename to Library/Homebrew/test/fixtures/cask/container.xz diff --git a/Library/Homebrew/cask/test/support/binaries/empty_directory/.gitignore b/Library/Homebrew/test/fixtures/cask/empty_directory/.gitignore similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/empty_directory/.gitignore rename to Library/Homebrew/test/fixtures/cask/empty_directory/.gitignore diff --git a/Library/Homebrew/cask/test/support/binaries/naked_executable b/Library/Homebrew/test/fixtures/cask/naked_executable similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/naked_executable rename to Library/Homebrew/test/fixtures/cask/naked_executable diff --git a/Library/Homebrew/cask/test/support/binaries/transmission-2.61.dmg b/Library/Homebrew/test/fixtures/cask/transmission-2.61.dmg similarity index 100% rename from Library/Homebrew/cask/test/support/binaries/transmission-2.61.dmg rename to Library/Homebrew/test/fixtures/cask/transmission-2.61.dmg diff --git a/Library/Homebrew/test/lib/config.rb b/Library/Homebrew/test/lib/config.rb index 98144d71e1..4fe62d4090 100644 --- a/Library/Homebrew/test/lib/config.rb +++ b/Library/Homebrew/test/lib/config.rb @@ -31,6 +31,8 @@ HOMEBREW_CELLAR = HOMEBREW_PREFIX.parent+"cellar" HOMEBREW_LOGS = HOMEBREW_PREFIX.parent+"logs" HOMEBREW_TEMP = HOMEBREW_PREFIX.parent+"temp" +TEST_FIXTURE_DIR = HOMEBREW_LIBRARY_PATH.join("test", "fixtures") + TESTBALL_SHA1 = "be478fd8a80fe7f29196d6400326ac91dad68c37".freeze TESTBALL_SHA256 = "91e3f7930c98d7ccfb288e115ed52d06b0e5bc16fec7dce8bdda86530027067b".freeze TESTBALL_PATCHES_SHA256 = "799c2d551ac5c3a5759bea7796631a7906a6a24435b52261a317133a0bfb34d9".freeze diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb index a12983e4ce..4aa8355909 100644 --- a/Library/Homebrew/test/test_formula.rb +++ b/Library/Homebrew/test/test_formula.rb @@ -634,7 +634,7 @@ class FormulaTests < Homebrew::TestCase url "foo-1.0" end - assert_equal Pathname.new("#{HOMEBREW_LIBRARY}/Homebrew/test/fixtures/foo"), + assert_equal Pathname.new("#{HOMEBREW_LIBRARY_PATH}/test/fixtures/foo"), f1.test_fixtures("foo") end diff --git a/Library/Homebrew/test/test_tab.rb b/Library/Homebrew/test/test_tab.rb index e41f76e274..93c88d64bf 100644 --- a/Library/Homebrew/test/test_tab.rb +++ b/Library/Homebrew/test/test_tab.rb @@ -81,7 +81,7 @@ class TabTests < Homebrew::TestCase end def test_from_old_version_file - path = Pathname.new(TEST_DIRECTORY).join("fixtures", "receipt_old.json") + path = Pathname.new("#{TEST_FIXTURE_DIR}/receipt_old.json") tab = Tab.from_file(path) assert_equal @used.sort, tab.used_options.sort @@ -101,7 +101,7 @@ class TabTests < Homebrew::TestCase end def test_from_file - path = Pathname.new(TEST_DIRECTORY).join("fixtures", "receipt.json") + path = Pathname.new("#{TEST_FIXTURE_DIR}/receipt.json") tab = Tab.from_file(path) source_path = "/usr/local/Library/Taps/hombrew/homebrew-core/Formula/foo.rb" runtime_dependencies = [{ "full_name" => "foo", "version" => "1.0" }] diff --git a/Library/Homebrew/test/test_update_report.rb b/Library/Homebrew/test/test_update_report.rb index b3ae865a5a..6b6cec6ce0 100644 --- a/Library/Homebrew/test/test_update_report.rb +++ b/Library/Homebrew/test/test_update_report.rb @@ -20,7 +20,7 @@ class ReportTests < Homebrew::TestCase end def self.fixture_data - @fixture_data ||= YAML.load_file("#{TEST_DIRECTORY}/fixtures/updater_fixture.yaml") + @fixture_data ||= YAML.load_file("#{TEST_FIXTURE_DIR}/updater_fixture.yaml") end def setup