diff options
Diffstat (limited to 'Library')
143 files changed, 166 insertions, 108 deletions
diff --git a/Library/Homebrew/cask/spec/spec_helper.rb b/Library/Homebrew/cask/spec/spec_helper.rb index 7e72a2cee..458fe00f4 100644 --- a/Library/Homebrew/cask/spec/spec_helper.rb +++ b/Library/Homebrew/cask/spec/spec_helper.rb @@ -8,15 +8,15 @@ end # add Homebrew to load path $LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_REPOSITORY"]}/Library/Homebrew")) -$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_REPOSITORY"]}/Library/Homebrew/test/lib")) +$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_REPOSITORY"]}/Library/Homebrew/test/support/lib")) require "global" # add Homebrew-Cask to load path $LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.join("cask", "lib").to_s) -require "test/helper/env" -require "test/helper/shutup" +require "test/support/helper/env" +require "test/support/helper/shutup" Pathname.glob(HOMEBREW_LIBRARY_PATH.join("cask", "spec", "support", "*.rb")).each(&method(:require)) diff --git a/Library/Homebrew/cask/test/test_helper.rb b/Library/Homebrew/cask/test/test_helper.rb index 73459cb25..275ede304 100644 --- a/Library/Homebrew/cask/test/test_helper.rb +++ b/Library/Homebrew/cask/test/test_helper.rb @@ -6,15 +6,15 @@ require "simplecov" if ENV["HOMEBREW_TESTS_COVERAGE"] # add Homebrew to load path $LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_REPOSITORY"]}/Library/Homebrew")) -$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_REPOSITORY"]}/Library/Homebrew/test/lib")) +$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_REPOSITORY"]}/Library/Homebrew/test/support/lib")) require "global" # add Homebrew-Cask to load path $LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.join("cask", "lib").to_s) -require "test/helper/env" -require "test/helper/shutup" +require "test/support/helper/env" +require "test/support/helper/shutup" include Test::Helper::Env include Test::Helper::Shutup diff --git a/Library/Homebrew/test/bottles/testball_bottle-0.1.el_capitan.bottle.tar.gz b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.el_capitan.bottle.tar.gz index 3e989830b..3e989830b 120000 --- a/Library/Homebrew/test/bottles/testball_bottle-0.1.el_capitan.bottle.tar.gz +++ b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.el_capitan.bottle.tar.gz diff --git a/Library/Homebrew/test/bottles/testball_bottle-0.1.linux_x86_64.bottle.tar.gz b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.linux_x86_64.bottle.tar.gz index 3e989830b..3e989830b 120000 --- a/Library/Homebrew/test/bottles/testball_bottle-0.1.linux_x86_64.bottle.tar.gz +++ b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.linux_x86_64.bottle.tar.gz diff --git a/Library/Homebrew/test/bottles/testball_bottle-0.1.macintosh_intel.bottle.tar.gz b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.macintosh_intel.bottle.tar.gz index 3e989830b..3e989830b 120000 --- a/Library/Homebrew/test/bottles/testball_bottle-0.1.macintosh_intel.bottle.tar.gz +++ b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.macintosh_intel.bottle.tar.gz diff --git a/Library/Homebrew/test/bottles/testball_bottle-0.1.mavericks.bottle.tar.gz b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.mavericks.bottle.tar.gz index 3e989830b..3e989830b 120000 --- a/Library/Homebrew/test/bottles/testball_bottle-0.1.mavericks.bottle.tar.gz +++ b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.mavericks.bottle.tar.gz diff --git a/Library/Homebrew/test/bottles/testball_bottle-0.1.mountain_lion.bottle.tar.gz b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.mountain_lion.bottle.tar.gz index 3e989830b..3e989830b 120000 --- a/Library/Homebrew/test/bottles/testball_bottle-0.1.mountain_lion.bottle.tar.gz +++ b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.mountain_lion.bottle.tar.gz diff --git a/Library/Homebrew/test/bottles/testball_bottle-0.1.sierra.bottle.tar.gz b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.sierra.bottle.tar.gz index 3e989830b..3e989830b 120000 --- a/Library/Homebrew/test/bottles/testball_bottle-0.1.sierra.bottle.tar.gz +++ b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.sierra.bottle.tar.gz diff --git a/Library/Homebrew/test/bottles/testball_bottle-0.1.yosemite.bottle.tar.gz b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.yosemite.bottle.tar.gz Binary files differindex d88838a94..d88838a94 100644 --- a/Library/Homebrew/test/bottles/testball_bottle-0.1.yosemite.bottle.tar.gz +++ b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.yosemite.bottle.tar.gz diff --git a/Library/Homebrew/test/fixtures/cask/AppWithBinary.zip b/Library/Homebrew/test/support/fixtures/cask/AppWithBinary.zip Binary files differindex 4a5b318ba..4a5b318ba 100644 --- a/Library/Homebrew/test/fixtures/cask/AppWithBinary.zip +++ b/Library/Homebrew/test/support/fixtures/cask/AppWithBinary.zip diff --git a/Library/Homebrew/test/fixtures/cask/AppWithEmbeddedBinary.zip b/Library/Homebrew/test/support/fixtures/cask/AppWithEmbeddedBinary.zip Binary files differindex 7c708038c..7c708038c 100644 --- a/Library/Homebrew/test/fixtures/cask/AppWithEmbeddedBinary.zip +++ b/Library/Homebrew/test/support/fixtures/cask/AppWithEmbeddedBinary.zip diff --git a/Library/Homebrew/test/fixtures/cask/MyFancyApp.zip b/Library/Homebrew/test/support/fixtures/cask/MyFancyApp.zip Binary files differindex ba09ee681..ba09ee681 100644 --- a/Library/Homebrew/test/fixtures/cask/MyFancyApp.zip +++ b/Library/Homebrew/test/support/fixtures/cask/MyFancyApp.zip diff --git a/Library/Homebrew/test/fixtures/cask/MyFancyPkg.zip b/Library/Homebrew/test/support/fixtures/cask/MyFancyPkg.zip Binary files differindex ec4f97f07..ec4f97f07 100644 --- a/Library/Homebrew/test/fixtures/cask/MyFancyPkg.zip +++ b/Library/Homebrew/test/support/fixtures/cask/MyFancyPkg.zip diff --git a/Library/Homebrew/test/fixtures/cask/NestedApp.dmg.zip b/Library/Homebrew/test/support/fixtures/cask/NestedApp.dmg.zip Binary files differindex ae6686c7e..ae6686c7e 100644 --- a/Library/Homebrew/test/fixtures/cask/NestedApp.dmg.zip +++ b/Library/Homebrew/test/support/fixtures/cask/NestedApp.dmg.zip diff --git a/Library/Homebrew/test/fixtures/cask/caffeine-suite.zip b/Library/Homebrew/test/support/fixtures/cask/caffeine-suite.zip Binary files differindex c38f771ae..c38f771ae 100644 --- a/Library/Homebrew/test/fixtures/cask/caffeine-suite.zip +++ b/Library/Homebrew/test/support/fixtures/cask/caffeine-suite.zip diff --git a/Library/Homebrew/test/fixtures/cask/caffeine.zip b/Library/Homebrew/test/support/fixtures/cask/caffeine.zip Binary files differindex 99d61bbfb..99d61bbfb 100644 --- a/Library/Homebrew/test/fixtures/cask/caffeine.zip +++ b/Library/Homebrew/test/support/fixtures/cask/caffeine.zip diff --git a/Library/Homebrew/test/fixtures/cask/caffeines-subdir.zip b/Library/Homebrew/test/support/fixtures/cask/caffeines-subdir.zip Binary files differindex ce5064d09..ce5064d09 100644 --- a/Library/Homebrew/test/fixtures/cask/caffeines-subdir.zip +++ b/Library/Homebrew/test/support/fixtures/cask/caffeines-subdir.zip diff --git a/Library/Homebrew/test/fixtures/cask/caffeines.zip b/Library/Homebrew/test/support/fixtures/cask/caffeines.zip Binary files differindex 372fcc522..372fcc522 100644 --- a/Library/Homebrew/test/fixtures/cask/caffeines.zip +++ b/Library/Homebrew/test/support/fixtures/cask/caffeines.zip diff --git a/Library/Homebrew/test/fixtures/cask/container.7z b/Library/Homebrew/test/support/fixtures/cask/container.7z Binary files differindex 30dbe24f7..30dbe24f7 100644 --- a/Library/Homebrew/test/fixtures/cask/container.7z +++ b/Library/Homebrew/test/support/fixtures/cask/container.7z diff --git a/Library/Homebrew/test/fixtures/cask/container.air b/Library/Homebrew/test/support/fixtures/cask/container.air Binary files differindex 64005aea3..64005aea3 100644 --- a/Library/Homebrew/test/fixtures/cask/container.air +++ b/Library/Homebrew/test/support/fixtures/cask/container.air diff --git a/Library/Homebrew/test/fixtures/cask/container.bz2 b/Library/Homebrew/test/support/fixtures/cask/container.bz2 Binary files differindex 6ec60f31f..6ec60f31f 100755 --- a/Library/Homebrew/test/fixtures/cask/container.bz2 +++ b/Library/Homebrew/test/support/fixtures/cask/container.bz2 diff --git a/Library/Homebrew/test/fixtures/cask/container.cab b/Library/Homebrew/test/support/fixtures/cask/container.cab Binary files differindex edc741aa1..edc741aa1 100644 --- a/Library/Homebrew/test/fixtures/cask/container.cab +++ b/Library/Homebrew/test/support/fixtures/cask/container.cab diff --git a/Library/Homebrew/test/fixtures/cask/container.dmg b/Library/Homebrew/test/support/fixtures/cask/container.dmg Binary files differindex 3b3cbf51c..3b3cbf51c 100644 --- a/Library/Homebrew/test/fixtures/cask/container.dmg +++ b/Library/Homebrew/test/support/fixtures/cask/container.dmg diff --git a/Library/Homebrew/test/fixtures/cask/container.gz b/Library/Homebrew/test/support/fixtures/cask/container.gz Binary files differindex 67ede6b96..67ede6b96 100755 --- a/Library/Homebrew/test/fixtures/cask/container.gz +++ b/Library/Homebrew/test/support/fixtures/cask/container.gz diff --git a/Library/Homebrew/test/fixtures/cask/container.lzma b/Library/Homebrew/test/support/fixtures/cask/container.lzma Binary files differindex 2ff7ccee7..2ff7ccee7 100755 --- a/Library/Homebrew/test/fixtures/cask/container.lzma +++ b/Library/Homebrew/test/support/fixtures/cask/container.lzma diff --git a/Library/Homebrew/test/fixtures/cask/container.pkg b/Library/Homebrew/test/support/fixtures/cask/container.pkg Binary files differindex 274f27e7a..274f27e7a 100644 --- a/Library/Homebrew/test/fixtures/cask/container.pkg +++ b/Library/Homebrew/test/support/fixtures/cask/container.pkg diff --git a/Library/Homebrew/test/fixtures/cask/container.rar b/Library/Homebrew/test/support/fixtures/cask/container.rar Binary files differindex 7477c3bb4..7477c3bb4 100644 --- a/Library/Homebrew/test/fixtures/cask/container.rar +++ b/Library/Homebrew/test/support/fixtures/cask/container.rar diff --git a/Library/Homebrew/test/fixtures/cask/container.sit b/Library/Homebrew/test/support/fixtures/cask/container.sit Binary files differindex 3e29d21dc..3e29d21dc 100755 --- a/Library/Homebrew/test/fixtures/cask/container.sit +++ b/Library/Homebrew/test/support/fixtures/cask/container.sit diff --git a/Library/Homebrew/test/fixtures/cask/container.tar.gz b/Library/Homebrew/test/support/fixtures/cask/container.tar.gz Binary files differindex c464fb413..c464fb413 100644 --- a/Library/Homebrew/test/fixtures/cask/container.tar.gz +++ b/Library/Homebrew/test/support/fixtures/cask/container.tar.gz diff --git a/Library/Homebrew/test/fixtures/cask/container.xar b/Library/Homebrew/test/support/fixtures/cask/container.xar Binary files differindex 563a5ba1e..563a5ba1e 100644 --- a/Library/Homebrew/test/fixtures/cask/container.xar +++ b/Library/Homebrew/test/support/fixtures/cask/container.xar diff --git a/Library/Homebrew/test/fixtures/cask/container.xz b/Library/Homebrew/test/support/fixtures/cask/container.xz Binary files differindex 74db22090..74db22090 100755 --- a/Library/Homebrew/test/fixtures/cask/container.xz +++ b/Library/Homebrew/test/support/fixtures/cask/container.xz diff --git a/Library/Homebrew/test/fixtures/cask/empty_directory/.gitignore b/Library/Homebrew/test/support/fixtures/cask/empty_directory/.gitignore index e69de29bb..e69de29bb 100644 --- a/Library/Homebrew/test/fixtures/cask/empty_directory/.gitignore +++ b/Library/Homebrew/test/support/fixtures/cask/empty_directory/.gitignore diff --git a/Library/Homebrew/test/fixtures/cask/naked_executable b/Library/Homebrew/test/support/fixtures/cask/naked_executable index 039e4d006..039e4d006 100755 --- a/Library/Homebrew/test/fixtures/cask/naked_executable +++ b/Library/Homebrew/test/support/fixtures/cask/naked_executable diff --git a/Library/Homebrew/test/fixtures/cask/transmission-2.61.dmg b/Library/Homebrew/test/support/fixtures/cask/transmission-2.61.dmg Binary files differindex e72afe027..e72afe027 100644 --- a/Library/Homebrew/test/fixtures/cask/transmission-2.61.dmg +++ b/Library/Homebrew/test/support/fixtures/cask/transmission-2.61.dmg diff --git a/Library/Homebrew/test/mach/a.out b/Library/Homebrew/test/support/fixtures/mach/a.out Binary files differindex 18e0e982f..18e0e982f 100755 --- a/Library/Homebrew/test/mach/a.out +++ b/Library/Homebrew/test/support/fixtures/mach/a.out diff --git a/Library/Homebrew/test/mach/fat.bundle b/Library/Homebrew/test/support/fixtures/mach/fat.bundle Binary files differindex f60f1e8bb..f60f1e8bb 100644 --- a/Library/Homebrew/test/mach/fat.bundle +++ b/Library/Homebrew/test/support/fixtures/mach/fat.bundle diff --git a/Library/Homebrew/test/mach/fat.dylib b/Library/Homebrew/test/support/fixtures/mach/fat.dylib Binary files differindex 6886a6a8b..6886a6a8b 100644 --- a/Library/Homebrew/test/mach/fat.dylib +++ b/Library/Homebrew/test/support/fixtures/mach/fat.dylib diff --git a/Library/Homebrew/test/mach/i386.bundle b/Library/Homebrew/test/support/fixtures/mach/i386.bundle Binary files differindex b6f94710d..b6f94710d 100644 --- a/Library/Homebrew/test/mach/i386.bundle +++ b/Library/Homebrew/test/support/fixtures/mach/i386.bundle diff --git a/Library/Homebrew/test/mach/i386.dylib b/Library/Homebrew/test/support/fixtures/mach/i386.dylib Binary files differindex 0304dca01..0304dca01 100644 --- a/Library/Homebrew/test/mach/i386.dylib +++ b/Library/Homebrew/test/support/fixtures/mach/i386.dylib diff --git a/Library/Homebrew/test/mach/x86_64.bundle b/Library/Homebrew/test/support/fixtures/mach/x86_64.bundle Binary files differindex d1bde419f..d1bde419f 100644 --- a/Library/Homebrew/test/mach/x86_64.bundle +++ b/Library/Homebrew/test/support/fixtures/mach/x86_64.bundle diff --git a/Library/Homebrew/test/mach/x86_64.dylib b/Library/Homebrew/test/support/fixtures/mach/x86_64.dylib Binary files differindex 781b41cb4..781b41cb4 100644 --- a/Library/Homebrew/test/mach/x86_64.dylib +++ b/Library/Homebrew/test/support/fixtures/mach/x86_64.dylib diff --git a/Library/Homebrew/test/patches/noop-a.diff b/Library/Homebrew/test/support/fixtures/patches/noop-a.diff index 7b57f8fc9..7b57f8fc9 100644 --- a/Library/Homebrew/test/patches/noop-a.diff +++ b/Library/Homebrew/test/support/fixtures/patches/noop-a.diff diff --git a/Library/Homebrew/test/patches/noop-b.diff b/Library/Homebrew/test/support/fixtures/patches/noop-b.diff index bc081ca82..bc081ca82 100644 --- a/Library/Homebrew/test/patches/noop-b.diff +++ b/Library/Homebrew/test/support/fixtures/patches/noop-b.diff diff --git a/Library/Homebrew/test/patches/noop-c.diff b/Library/Homebrew/test/support/fixtures/patches/noop-c.diff index 6d0de5b7b..6d0de5b7b 100644 --- a/Library/Homebrew/test/patches/noop-c.diff +++ b/Library/Homebrew/test/support/fixtures/patches/noop-c.diff diff --git a/Library/Homebrew/test/fixtures/receipt.json b/Library/Homebrew/test/support/fixtures/receipt.json index 404251026..404251026 100644 --- a/Library/Homebrew/test/fixtures/receipt.json +++ b/Library/Homebrew/test/support/fixtures/receipt.json diff --git a/Library/Homebrew/test/fixtures/receipt_old.json b/Library/Homebrew/test/support/fixtures/receipt_old.json index 955d56b47..955d56b47 100644 --- a/Library/Homebrew/test/fixtures/receipt_old.json +++ b/Library/Homebrew/test/support/fixtures/receipt_old.json diff --git a/Library/Homebrew/test/tarballs/testball-0.1-patches.tgz b/Library/Homebrew/test/support/fixtures/tarballs/testball-0.1-patches.tgz Binary files differindex 4b43f535e..4b43f535e 100644 --- a/Library/Homebrew/test/tarballs/testball-0.1-patches.tgz +++ b/Library/Homebrew/test/support/fixtures/tarballs/testball-0.1-patches.tgz diff --git a/Library/Homebrew/test/tarballs/testball-0.1.tbz b/Library/Homebrew/test/support/fixtures/tarballs/testball-0.1.tbz Binary files differindex c7e1af1f4..c7e1af1f4 100644 --- a/Library/Homebrew/test/tarballs/testball-0.1.tbz +++ b/Library/Homebrew/test/support/fixtures/tarballs/testball-0.1.tbz diff --git a/Library/Homebrew/test/tarballs/testbottest-0.1.tbz b/Library/Homebrew/test/support/fixtures/tarballs/testbottest-0.1.tbz Binary files differindex 83f7ab1dd..83f7ab1dd 100644 --- a/Library/Homebrew/test/tarballs/testbottest-0.1.tbz +++ b/Library/Homebrew/test/support/fixtures/tarballs/testbottest-0.1.tbz diff --git a/Library/Homebrew/test/fixtures/test.diff b/Library/Homebrew/test/support/fixtures/test.diff index 7b57f8fc9..7b57f8fc9 100644 --- a/Library/Homebrew/test/fixtures/test.diff +++ b/Library/Homebrew/test/support/fixtures/test.diff diff --git a/Library/Homebrew/test/fixtures/test.eps b/Library/Homebrew/test/support/fixtures/test.eps index 2832613e7..2832613e7 100644 --- a/Library/Homebrew/test/fixtures/test.eps +++ b/Library/Homebrew/test/support/fixtures/test.eps diff --git a/Library/Homebrew/test/fixtures/test.gif b/Library/Homebrew/test/support/fixtures/test.gif Binary files differindex 0589d2082..0589d2082 100644 --- a/Library/Homebrew/test/fixtures/test.gif +++ b/Library/Homebrew/test/support/fixtures/test.gif diff --git a/Library/Homebrew/test/fixtures/test.ico b/Library/Homebrew/test/support/fixtures/test.ico Binary files differindex 714f3478d..714f3478d 100644 --- a/Library/Homebrew/test/fixtures/test.ico +++ b/Library/Homebrew/test/support/fixtures/test.ico diff --git a/Library/Homebrew/test/fixtures/test.jpg b/Library/Homebrew/test/support/fixtures/test.jpg Binary files differindex 1adaa50a6..1adaa50a6 100644 --- a/Library/Homebrew/test/fixtures/test.jpg +++ b/Library/Homebrew/test/support/fixtures/test.jpg diff --git a/Library/Homebrew/test/fixtures/test.m4a b/Library/Homebrew/test/support/fixtures/test.m4a Binary files differindex 7650fc482..7650fc482 100644 --- a/Library/Homebrew/test/fixtures/test.m4a +++ b/Library/Homebrew/test/support/fixtures/test.m4a diff --git a/Library/Homebrew/test/fixtures/test.mp3 b/Library/Homebrew/test/support/fixtures/test.mp3 Binary files differindex a01322383..a01322383 100644 --- a/Library/Homebrew/test/fixtures/test.mp3 +++ b/Library/Homebrew/test/support/fixtures/test.mp3 diff --git a/Library/Homebrew/test/fixtures/test.pcap b/Library/Homebrew/test/support/fixtures/test.pcap Binary files differindex 671197e8a..671197e8a 100644 --- a/Library/Homebrew/test/fixtures/test.pcap +++ b/Library/Homebrew/test/support/fixtures/test.pcap diff --git a/Library/Homebrew/test/fixtures/test.pdf b/Library/Homebrew/test/support/fixtures/test.pdf index 1f2ac6390..1f2ac6390 100644 --- a/Library/Homebrew/test/fixtures/test.pdf +++ b/Library/Homebrew/test/support/fixtures/test.pdf diff --git a/Library/Homebrew/test/fixtures/test.png b/Library/Homebrew/test/support/fixtures/test.png Binary files differindex 18d7a15a9..18d7a15a9 100644 --- a/Library/Homebrew/test/fixtures/test.png +++ b/Library/Homebrew/test/support/fixtures/test.png diff --git a/Library/Homebrew/test/fixtures/test.ps b/Library/Homebrew/test/support/fixtures/test.ps index 68aae0621..68aae0621 100644 --- a/Library/Homebrew/test/fixtures/test.ps +++ b/Library/Homebrew/test/support/fixtures/test.ps diff --git a/Library/Homebrew/test/fixtures/test.svg b/Library/Homebrew/test/support/fixtures/test.svg index 1869e624c..1869e624c 100644 --- a/Library/Homebrew/test/fixtures/test.svg +++ b/Library/Homebrew/test/support/fixtures/test.svg diff --git a/Library/Homebrew/test/fixtures/test.tiff b/Library/Homebrew/test/support/fixtures/test.tiff Binary files differindex ae756b264..ae756b264 100644 --- a/Library/Homebrew/test/fixtures/test.tiff +++ b/Library/Homebrew/test/support/fixtures/test.tiff diff --git a/Library/Homebrew/test/fixtures/test.wav b/Library/Homebrew/test/support/fixtures/test.wav Binary files differindex c846b8a9b..c846b8a9b 100644 --- a/Library/Homebrew/test/fixtures/test.wav +++ b/Library/Homebrew/test/support/fixtures/test.wav diff --git a/Library/Homebrew/test/testball.rb b/Library/Homebrew/test/support/fixtures/testball.rb index cce09738d..ba725f51e 100644 --- a/Library/Homebrew/test/testball.rb +++ b/Library/Homebrew/test/support/fixtures/testball.rb @@ -1,7 +1,7 @@ class Testball < Formula def initialize(name = "testball", path = Pathname.new(__FILE__).expand_path, spec = :stable, alias_path: nil) self.class.instance_eval do - stable.url "file://#{File.expand_path("..", __FILE__)}/tarballs/testball-0.1.tbz" + stable.url "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz" stable.sha256 TESTBALL_SHA256 end super diff --git a/Library/Homebrew/test/testball_bottle.rb b/Library/Homebrew/test/support/fixtures/testball_bottle.rb index 769f615aa..9453255e6 100644 --- a/Library/Homebrew/test/testball_bottle.rb +++ b/Library/Homebrew/test/support/fixtures/testball_bottle.rb @@ -1,11 +1,11 @@ class TestballBottle < Formula def initialize(name = "testball_bottle", path = Pathname.new(__FILE__).expand_path, spec = :stable, alias_path: nil) self.class.instance_eval do - stable.url "file://#{File.expand_path("..", __FILE__)}/tarballs/testball-0.1.tbz" + stable.url "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz" stable.sha256 TESTBALL_SHA256 stable.bottle do cellar :any_skip_relocation - root_url "file://#{File.expand_path("..", __FILE__)}/bottles" + root_url "file://#{TEST_FIXTURE_DIR}/bottles" sha256 "9abc8ce779067e26556002c4ca6b9427b9874d25f0cafa7028e05b5c5c410cb4" => Utils::Bottles.tag end cxxstdlib_check :skip diff --git a/Library/Homebrew/test/testbottest.rb b/Library/Homebrew/test/support/fixtures/testbottest.rb index f7695cab5..28b88567e 100644 --- a/Library/Homebrew/test/testbottest.rb +++ b/Library/Homebrew/test/support/fixtures/testbottest.rb @@ -1,7 +1,7 @@ class Testbottest < Formula desc "Minimal C program and Makefile used for testing Homebrew." homepage "https://github.com/Homebrew/brew" - url "file://#{File.expand_path("..", __FILE__)}/tarballs/testbottest-0.1.tbz" + url "file://#{TEST_FIXTURE_DIR}/tarballs/testbottest-0.1.tbz" sha256 "78b54d8f31585c9773bed12b4aa4ab2ce458ebd044b9406cb24d40aa5107f082" def install diff --git a/Library/Homebrew/test/fixtures/updater_fixture.yaml b/Library/Homebrew/test/support/fixtures/updater_fixture.yaml index 06a6a0c7f..06a6a0c7f 100644 --- a/Library/Homebrew/test/fixtures/updater_fixture.yaml +++ b/Library/Homebrew/test/support/fixtures/updater_fixture.yaml diff --git a/Library/Homebrew/test/helper/env.rb b/Library/Homebrew/test/support/helper/env.rb index 904a1d4c7..904a1d4c7 100644 --- a/Library/Homebrew/test/helper/env.rb +++ b/Library/Homebrew/test/support/helper/env.rb diff --git a/Library/Homebrew/test/helper/integration_command_test_case.rb b/Library/Homebrew/test/support/helper/integration_command_test_case.rb index 2f137e14a..d7ae67423 100644 --- a/Library/Homebrew/test/helper/integration_command_test_case.rb +++ b/Library/Homebrew/test/support/helper/integration_command_test_case.rb @@ -1,5 +1,4 @@ require "bundler" -require "testing_env" require "fileutils" require "pathname" require "formula" @@ -21,6 +20,7 @@ class IntegrationCommandTestCase < Homebrew::TestCase HOMEBREW_LOCK_DIR.children, HOMEBREW_LOGS.children, HOMEBREW_TEMP.children, + HOMEBREW_PREFIX/".git", HOMEBREW_PREFIX/"bin", HOMEBREW_PREFIX/"share", HOMEBREW_PREFIX/"opt", @@ -59,7 +59,7 @@ class IntegrationCommandTestCase < Homebrew::TestCase env = args.last.is_a?(Hash) ? args.pop : {} cmd_args = %W[ -W0 - -I#{HOMEBREW_LIBRARY_PATH}/test/lib + -I#{HOMEBREW_LIBRARY_PATH}/test/support/lib -rconfig ] if ENV["HOMEBREW_TESTS_COVERAGE"] @@ -125,7 +125,7 @@ class IntegrationCommandTestCase < Homebrew::TestCase content = <<-EOS.undent desc "Some test" homepage "https://example.com/#{name}" - url "file://#{File.expand_path("../..", __FILE__)}/tarballs/testball-0.1.tbz" + url "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz" sha256 "#{TESTBALL_SHA256}" option "with-foo", "Build with foo" @@ -195,6 +195,6 @@ class IntegrationCommandTestCase < Homebrew::TestCase end def testball - "#{File.expand_path("../..", __FILE__)}/testball.rb" + "#{TEST_FIXTURE_DIR}/testball.rb" end end diff --git a/Library/Homebrew/test/helper/shutup.rb b/Library/Homebrew/test/support/helper/shutup.rb index fa5f08d31..fa5f08d31 100644 --- a/Library/Homebrew/test/helper/shutup.rb +++ b/Library/Homebrew/test/support/helper/shutup.rb diff --git a/Library/Homebrew/test/lib/config.rb b/Library/Homebrew/test/support/lib/config.rb index 4fe62d409..f6fdb4ecb 100644 --- a/Library/Homebrew/test/lib/config.rb +++ b/Library/Homebrew/test/support/lib/config.rb @@ -14,7 +14,7 @@ TEST_TMPDIR = ENV.fetch("HOMEBREW_TEST_TMPDIR") do |k| end # Paths pointing into the Homebrew code base that persist across test runs -HOMEBREW_LIBRARY_PATH = Pathname.new(File.expand_path("../../..", __FILE__)) +HOMEBREW_LIBRARY_PATH = Pathname.new(File.expand_path("../../../..", __FILE__)) HOMEBREW_SHIMS_PATH = HOMEBREW_LIBRARY_PATH.parent+"Homebrew/shims" HOMEBREW_LOAD_PATH = [File.expand_path("..", __FILE__), HOMEBREW_LIBRARY_PATH].join(":") @@ -31,7 +31,7 @@ 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") +TEST_FIXTURE_DIR = HOMEBREW_LIBRARY_PATH.join("test", "support", "fixtures") TESTBALL_SHA1 = "be478fd8a80fe7f29196d6400326ac91dad68c37".freeze TESTBALL_SHA256 = "91e3f7930c98d7ccfb288e115ed52d06b0e5bc16fec7dce8bdda86530027067b".freeze diff --git a/Library/Homebrew/test/lib/integration_mocks.rb b/Library/Homebrew/test/support/lib/integration_mocks.rb index 6effb0cde..6effb0cde 100644 --- a/Library/Homebrew/test/lib/integration_mocks.rb +++ b/Library/Homebrew/test/support/lib/integration_mocks.rb diff --git a/Library/Homebrew/test/test/ENV_test.rb b/Library/Homebrew/test/test/ENV_test.rb index e38c75c6e..1736d34af 100644 --- a/Library/Homebrew/test/test/ENV_test.rb +++ b/Library/Homebrew/test/test/ENV_test.rb @@ -1,6 +1,7 @@ require "testing_env" require "extend/ENV" -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestEnv < IntegrationCommandTestCase def test_env diff --git a/Library/Homebrew/test/test/analytics_test.rb b/Library/Homebrew/test/test/analytics_test.rb index 00e0593db..266c5bd09 100644 --- a/Library/Homebrew/test/test/analytics_test.rb +++ b/Library/Homebrew/test/test/analytics_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestAnalytics < IntegrationCommandTestCase def test_analytics diff --git a/Library/Homebrew/test/test/bottle_test.rb b/Library/Homebrew/test/test/bottle_test.rb index 48727cfd9..5fdba0af8 100644 --- a/Library/Homebrew/test/test/bottle_test.rb +++ b/Library/Homebrew/test/test/bottle_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestBottle < IntegrationCommandTestCase def test_bottle diff --git a/Library/Homebrew/test/test/bundle_test.rb b/Library/Homebrew/test/test/bundle_test.rb index 6b040df1d..ea18d5f84 100644 --- a/Library/Homebrew/test/test/bundle_test.rb +++ b/Library/Homebrew/test/test/bundle_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestBundle < IntegrationCommandTestCase def test_bundle diff --git a/Library/Homebrew/test/test/cache_formula_test.rb b/Library/Homebrew/test/test/cache_formula_test.rb index f4e37e2a2..c64ce9809 100644 --- a/Library/Homebrew/test/test/cache_formula_test.rb +++ b/Library/Homebrew/test/test/cache_formula_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCacheFormula < IntegrationCommandTestCase def test_cache_formula diff --git a/Library/Homebrew/test/test/cache_test.rb b/Library/Homebrew/test/test/cache_test.rb index cd7a5e2fa..f8c035676 100644 --- a/Library/Homebrew/test/test/cache_test.rb +++ b/Library/Homebrew/test/test/cache_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCache < IntegrationCommandTestCase def test_cache diff --git a/Library/Homebrew/test/test/cask_test.rb b/Library/Homebrew/test/test/cask_test.rb index 6cae6d54b..ad7a2a0a0 100644 --- a/Library/Homebrew/test/test/cask_test.rb +++ b/Library/Homebrew/test/test/cask_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCask < IntegrationCommandTestCase def test_cask diff --git a/Library/Homebrew/test/test/cat_test.rb b/Library/Homebrew/test/test/cat_test.rb index 4cfd19c3d..df64188d6 100644 --- a/Library/Homebrew/test/test/cat_test.rb +++ b/Library/Homebrew/test/test/cat_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCat < IntegrationCommandTestCase def test_cat diff --git a/Library/Homebrew/test/test/cellar_formula_test.rb b/Library/Homebrew/test/test/cellar_formula_test.rb index 7c458be9d..6c3063ca3 100644 --- a/Library/Homebrew/test/test/cellar_formula_test.rb +++ b/Library/Homebrew/test/test/cellar_formula_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCellarFormula < IntegrationCommandTestCase def test_cellar_formula diff --git a/Library/Homebrew/test/test/cellar_test.rb b/Library/Homebrew/test/test/cellar_test.rb index b793c5342..32cdb1af5 100644 --- a/Library/Homebrew/test/test/cellar_test.rb +++ b/Library/Homebrew/test/test/cellar_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCellar < IntegrationCommandTestCase def test_cellar diff --git a/Library/Homebrew/test/test/checksum_verification_test.rb b/Library/Homebrew/test/test/checksum_verification_test.rb index e25d08b83..9017b528d 100644 --- a/Library/Homebrew/test/test/checksum_verification_test.rb +++ b/Library/Homebrew/test/test/checksum_verification_test.rb @@ -12,7 +12,7 @@ class ChecksumVerificationTests < Homebrew::TestCase def formula(&block) super do - url "file://#{TEST_DIRECTORY}/tarballs/testball-0.1.tbz" + url "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz" instance_eval(&block) end end diff --git a/Library/Homebrew/test/test/cleaner_test.rb b/Library/Homebrew/test/test/cleaner_test.rb index 450a78d86..ac108421c 100644 --- a/Library/Homebrew/test/test/cleaner_test.rb +++ b/Library/Homebrew/test/test/cleaner_test.rb @@ -17,8 +17,8 @@ class CleanerTests < Homebrew::TestCase def test_clean_file @f.bin.mkpath @f.lib.mkpath - cp "#{TEST_DIRECTORY}/mach/a.out", @f.bin - cp Dir["#{TEST_DIRECTORY}/mach/*.dylib"], @f.lib + cp "#{TEST_FIXTURE_DIR}/mach/a.out", @f.bin + cp Dir["#{TEST_FIXTURE_DIR}/mach/*.dylib"], @f.lib Cleaner.new(@f).clean diff --git a/Library/Homebrew/test/test/cleanup_test.rb b/Library/Homebrew/test/test/cleanup_test.rb index dffcd12f2..fef249fcb 100644 --- a/Library/Homebrew/test/test/cleanup_test.rb +++ b/Library/Homebrew/test/test/cleanup_test.rb @@ -1,9 +1,10 @@ require "testing_env" -require "testball" +require "test/support/fixtures/testball" require "cleanup" require "fileutils" require "pathname" -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCleanup < IntegrationCommandTestCase def test_cleanup diff --git a/Library/Homebrew/test/test/command_test.rb b/Library/Homebrew/test/test/command_test.rb index d05184631..620a014b9 100644 --- a/Library/Homebrew/test/test/command_test.rb +++ b/Library/Homebrew/test/test/command_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCommand < IntegrationCommandTestCase def test_command diff --git a/Library/Homebrew/test/test/commands_test.rb b/Library/Homebrew/test/test/commands_test.rb index ef138049c..cbb446ae3 100644 --- a/Library/Homebrew/test/test/commands_test.rb +++ b/Library/Homebrew/test/test/commands_test.rb @@ -2,7 +2,8 @@ require "testing_env" require "cmd/command" require "cmd/commands" require "fileutils" -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCommands < IntegrationCommandTestCase def test_commands diff --git a/Library/Homebrew/test/test/config_test.rb b/Library/Homebrew/test/test/config_test.rb index 33a293735..1a793cc6b 100644 --- a/Library/Homebrew/test/test/config_test.rb +++ b/Library/Homebrew/test/test/config_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestConfig < IntegrationCommandTestCase def test_config diff --git a/Library/Homebrew/test/test/create_test.rb b/Library/Homebrew/test/test/create_test.rb index 5f194ea02..26a325a22 100644 --- a/Library/Homebrew/test/test/create_test.rb +++ b/Library/Homebrew/test/test/create_test.rb @@ -1,8 +1,9 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCreate < IntegrationCommandTestCase def test_create - url = "file://#{TEST_DIRECTORY}/tarballs/testball-0.1.tbz" + url = "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz" cmd("create", url, "HOMEBREW_EDITOR" => "/bin/cat") formula_file = CoreTap.new.formula_dir/"testball.rb" diff --git a/Library/Homebrew/test/test/custom_command_test.rb b/Library/Homebrew/test/test/custom_command_test.rb index bc27e2121..71bfafd9b 100644 --- a/Library/Homebrew/test/test/custom_command_test.rb +++ b/Library/Homebrew/test/test/custom_command_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCustomCommand < IntegrationCommandTestCase def test_custom_command diff --git a/Library/Homebrew/test/test/deps_test.rb b/Library/Homebrew/test/test/deps_test.rb index 83cc9aa6a..44803af5e 100644 --- a/Library/Homebrew/test/test/deps_test.rb +++ b/Library/Homebrew/test/test/deps_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestDeps < IntegrationCommandTestCase def test_deps diff --git a/Library/Homebrew/test/test/desc_test.rb b/Library/Homebrew/test/test/desc_test.rb index 075ea991a..7428c0792 100644 --- a/Library/Homebrew/test/test/desc_test.rb +++ b/Library/Homebrew/test/test/desc_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestDesc < IntegrationCommandTestCase def test_desc diff --git a/Library/Homebrew/test/test/doctor_test.rb b/Library/Homebrew/test/test/doctor_test.rb index ccb909dce..be1098d22 100644 --- a/Library/Homebrew/test/test/doctor_test.rb +++ b/Library/Homebrew/test/test/doctor_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestDoctor < IntegrationCommandTestCase def test_doctor diff --git a/Library/Homebrew/test/test/edit_test.rb b/Library/Homebrew/test/test/edit_test.rb index 8d1437173..c78db3bd8 100644 --- a/Library/Homebrew/test/test/edit_test.rb +++ b/Library/Homebrew/test/test/edit_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestEdit < IntegrationCommandTestCase def test_edit diff --git a/Library/Homebrew/test/test/fetch_test.rb b/Library/Homebrew/test/test/fetch_test.rb index 7b57c6246..e049db554 100644 --- a/Library/Homebrew/test/test/fetch_test.rb +++ b/Library/Homebrew/test/test/fetch_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestFetch < IntegrationCommandTestCase def test_fetch diff --git a/Library/Homebrew/test/test/formula_installer_bottle_test.rb b/Library/Homebrew/test/test/formula_installer_bottle_test.rb index d83c856b7..6a891f159 100644 --- a/Library/Homebrew/test/test/formula_installer_bottle_test.rb +++ b/Library/Homebrew/test/test/formula_installer_bottle_test.rb @@ -3,8 +3,8 @@ require "formula" require "formula_installer" require "keg" require "tab" -require "testball" -require "testball_bottle" +require "test/support/fixtures/testball" +require "test/support/fixtures/testball_bottle" class InstallBottleTests < Homebrew::TestCase def temporary_bottle_install(formula) diff --git a/Library/Homebrew/test/test/formula_installer_test.rb b/Library/Homebrew/test/test/formula_installer_test.rb index 18bd910a6..652548bd7 100644 --- a/Library/Homebrew/test/test/formula_installer_test.rb +++ b/Library/Homebrew/test/test/formula_installer_test.rb @@ -3,8 +3,8 @@ require "formula" require "formula_installer" require "keg" require "tab" -require "testball" -require "testball_bottle" +require "test/support/fixtures/testball" +require "test/support/fixtures/testball_bottle" class InstallTests < Homebrew::TestCase def temporary_install(formula) diff --git a/Library/Homebrew/test/test/formula_test.rb b/Library/Homebrew/test/test/formula_test.rb index 4aa835590..eef60a3e5 100644 --- a/Library/Homebrew/test/test/formula_test.rb +++ b/Library/Homebrew/test/test/formula_test.rb @@ -1,5 +1,5 @@ require "testing_env" -require "testball" +require "test/support/fixtures/testball" require "formula" class FormulaTests < Homebrew::TestCase diff --git a/Library/Homebrew/test/test/formulary_test.rb b/Library/Homebrew/test/test/formulary_test.rb index 690ff089a..3d88c8407 100644 --- a/Library/Homebrew/test/test/formulary_test.rb +++ b/Library/Homebrew/test/test/formulary_test.rb @@ -18,11 +18,11 @@ class FormularyFactoryTest < Homebrew::TestCase def setup @name = "testball_bottle" @path = CoreTap.new.formula_dir/"#{@name}.rb" - @bottle_dir = Pathname.new("#{TEST_DIRECTORY}/bottles") + @bottle_dir = Pathname.new("#{TEST_FIXTURE_DIR}/bottles") @bottle = @bottle_dir/"testball_bottle-0.1.#{Utils::Bottles.tag}.bottle.tar.gz" @path.write <<-EOS.undent class #{Formulary.class_s(@name)} < Formula - url "file://#{File.expand_path("..", __FILE__)}/tarballs/testball-0.1.tbz" + url "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz" sha256 TESTBALL_SHA256 bottle do diff --git a/Library/Homebrew/test/test/help_test.rb b/Library/Homebrew/test/test/help_test.rb index 9c14f9b78..8c9a4bb08 100644 --- a/Library/Homebrew/test/test/help_test.rb +++ b/Library/Homebrew/test/test/help_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestHelp < IntegrationCommandTestCase def test_help diff --git a/Library/Homebrew/test/test/home_test.rb b/Library/Homebrew/test/test/home_test.rb index 9c26353be..9116442b7 100644 --- a/Library/Homebrew/test/test/home_test.rb +++ b/Library/Homebrew/test/test/home_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestHome < IntegrationCommandTestCase def test_home diff --git a/Library/Homebrew/test/test/info_test.rb b/Library/Homebrew/test/test/info_test.rb index 35f9183e1..a4186a5e9 100644 --- a/Library/Homebrew/test/test/info_test.rb +++ b/Library/Homebrew/test/test/info_test.rb @@ -1,7 +1,8 @@ require "testing_env" require "cmd/info" require "formula" -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestInfo < IntegrationCommandTestCase def test_info diff --git a/Library/Homebrew/test/test/install_test.rb b/Library/Homebrew/test/test/install_test.rb index 7135dddb2..313125931 100644 --- a/Library/Homebrew/test/test/install_test.rb +++ b/Library/Homebrew/test/test/install_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestInstall < IntegrationCommandTestCase def test_install diff --git a/Library/Homebrew/test/test/irb_test.rb b/Library/Homebrew/test/test/irb_test.rb index bf35b6524..77ca4a90d 100644 --- a/Library/Homebrew/test/test/irb_test.rb +++ b/Library/Homebrew/test/test/irb_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestIrb < IntegrationCommandTestCase def test_irb diff --git a/Library/Homebrew/test/test/leaves_test.rb b/Library/Homebrew/test/test/leaves_test.rb index 2a9bbadd9..ef25a4b6e 100644 --- a/Library/Homebrew/test/test/leaves_test.rb +++ b/Library/Homebrew/test/test/leaves_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestLeaves < IntegrationCommandTestCase def test_leaves diff --git a/Library/Homebrew/test/test/link_test.rb b/Library/Homebrew/test/test/link_test.rb index 3f0507072..ecabe0c67 100644 --- a/Library/Homebrew/test/test/link_test.rb +++ b/Library/Homebrew/test/test/link_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestLink < IntegrationCommandTestCase def test_link diff --git a/Library/Homebrew/test/test/linkapps_test.rb b/Library/Homebrew/test/test/linkapps_test.rb index b7c4cb811..a0b33a543 100644 --- a/Library/Homebrew/test/test/linkapps_test.rb +++ b/Library/Homebrew/test/test/linkapps_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestLinkapps < IntegrationCommandTestCase def test_linkapps diff --git a/Library/Homebrew/test/test/list_test.rb b/Library/Homebrew/test/test/list_test.rb index 1ffdb4528..26aab741f 100644 --- a/Library/Homebrew/test/test/list_test.rb +++ b/Library/Homebrew/test/test/list_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestList < IntegrationCommandTestCase def test_list diff --git a/Library/Homebrew/test/test/log_formula_test.rb b/Library/Homebrew/test/test/log_formula_test.rb index 34509bf72..26c10d381 100644 --- a/Library/Homebrew/test/test/log_formula_test.rb +++ b/Library/Homebrew/test/test/log_formula_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestLogFormula < IntegrationCommandTestCase def test_log_formula diff --git a/Library/Homebrew/test/test/log_test.rb b/Library/Homebrew/test/test/log_test.rb index b20a098fd..c9eb73d97 100644 --- a/Library/Homebrew/test/test/log_test.rb +++ b/Library/Homebrew/test/test/log_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestLog < IntegrationCommandTestCase def test_log diff --git a/Library/Homebrew/test/test/migrate_test.rb b/Library/Homebrew/test/test/migrate_test.rb index 53b32777a..c267629a3 100644 --- a/Library/Homebrew/test/test/migrate_test.rb +++ b/Library/Homebrew/test/test/migrate_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestMigrate < IntegrationCommandTestCase def test_migrate diff --git a/Library/Homebrew/test/test/migrator_test.rb b/Library/Homebrew/test/test/migrator_test.rb index cefb8b7a3..8a2b6ad63 100644 --- a/Library/Homebrew/test/test/migrator_test.rb +++ b/Library/Homebrew/test/test/migrator_test.rb @@ -1,6 +1,6 @@ require "testing_env" require "migrator" -require "testball" +require "test/support/fixtures/testball" require "tab" require "keg" diff --git a/Library/Homebrew/test/test/missing_test.rb b/Library/Homebrew/test/test/missing_test.rb index 565f413da..9ad0ab0b8 100644 --- a/Library/Homebrew/test/test/missing_test.rb +++ b/Library/Homebrew/test/test/missing_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestMissing < IntegrationCommandTestCase def setup diff --git a/Library/Homebrew/test/test/options_test.rb b/Library/Homebrew/test/test/options_test.rb index bfde7a9b6..43ea26b97 100644 --- a/Library/Homebrew/test/test/options_test.rb +++ b/Library/Homebrew/test/test/options_test.rb @@ -1,6 +1,7 @@ require "testing_env" require "options" -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestOptions < IntegrationCommandTestCase def test_options diff --git a/Library/Homebrew/test/test/os/mac/mach_test.rb b/Library/Homebrew/test/test/os/mac/mach_test.rb index 404a21d60..a42f7316b 100644 --- a/Library/Homebrew/test/test/os/mac/mach_test.rb +++ b/Library/Homebrew/test/test/os/mac/mach_test.rb @@ -41,7 +41,7 @@ class MachOPathnameTests < Homebrew::TestCase end def test_mach_o_executable - pn = Pathname.new("#{TEST_DIRECTORY}/mach/a.out") + pn = Pathname.new("#{TEST_FIXTURE_DIR}/mach/a.out") assert_predicate pn, :universal? refute_predicate pn, :i386? refute_predicate pn, :x86_64? @@ -93,7 +93,7 @@ class MachOPathnameTests < Homebrew::TestCase end def test_non_mach_o - pn = Pathname.new("#{TEST_DIRECTORY}/tarballs/testball-0.1.tbz") + pn = Pathname.new("#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz") refute_predicate pn, :universal? refute_predicate pn, :i386? refute_predicate pn, :x86_64? diff --git a/Library/Homebrew/test/test/outdated_test.rb b/Library/Homebrew/test/test/outdated_test.rb index cc0f024c8..03c2293d8 100644 --- a/Library/Homebrew/test/test/outdated_test.rb +++ b/Library/Homebrew/test/test/outdated_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestOutdated < IntegrationCommandTestCase def test_outdated diff --git a/Library/Homebrew/test/test/patching_test.rb b/Library/Homebrew/test/test/patching_test.rb index 18b848b10..ac14c8e1e 100644 --- a/Library/Homebrew/test/test/patching_test.rb +++ b/Library/Homebrew/test/test/patching_test.rb @@ -2,12 +2,12 @@ require "testing_env" require "formula" class PatchingTests < Homebrew::TestCase - TESTBALL_URL = "file://#{TEST_DIRECTORY}/tarballs/testball-0.1.tbz".freeze - TESTBALL_PATCHES_URL = "file://#{TEST_DIRECTORY}/tarballs/testball-0.1-patches.tgz".freeze - PATCH_URL_A = "file://#{TEST_DIRECTORY}/patches/noop-a.diff".freeze - PATCH_URL_B = "file://#{TEST_DIRECTORY}/patches/noop-b.diff".freeze - PATCH_A_CONTENTS = File.read "#{TEST_DIRECTORY}/patches/noop-a.diff" - PATCH_B_CONTENTS = File.read "#{TEST_DIRECTORY}/patches/noop-b.diff" + TESTBALL_URL = "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz".freeze + TESTBALL_PATCHES_URL = "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1-patches.tgz".freeze + PATCH_URL_A = "file://#{TEST_FIXTURE_DIR}/patches/noop-a.diff".freeze + PATCH_URL_B = "file://#{TEST_FIXTURE_DIR}/patches/noop-b.diff".freeze + PATCH_A_CONTENTS = File.read "#{TEST_FIXTURE_DIR}/patches/noop-a.diff" + PATCH_B_CONTENTS = File.read "#{TEST_FIXTURE_DIR}/patches/noop-b.diff" APPLY_A = "noop-a.diff".freeze APPLY_B = "noop-b.diff".freeze APPLY_C = "noop-c.diff".freeze diff --git a/Library/Homebrew/test/test/pin_unpin_test.rb b/Library/Homebrew/test/test/pin_unpin_test.rb index 37682d45e..9603620a3 100644 --- a/Library/Homebrew/test/test/pin_unpin_test.rb +++ b/Library/Homebrew/test/test/pin_unpin_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPinUnpin < IntegrationCommandTestCase def test_pin_unpin diff --git a/Library/Homebrew/test/test/prefix_formula_test.rb b/Library/Homebrew/test/test/prefix_formula_test.rb index d76a966d7..e51de2b6f 100644 --- a/Library/Homebrew/test/test/prefix_formula_test.rb +++ b/Library/Homebrew/test/test/prefix_formula_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPrefixFormula < IntegrationCommandTestCase def test_prefix_formula diff --git a/Library/Homebrew/test/test/prefix_test.rb b/Library/Homebrew/test/test/prefix_test.rb index 4aa63fa07..1b2114807 100644 --- a/Library/Homebrew/test/test/prefix_test.rb +++ b/Library/Homebrew/test/test/prefix_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPrefix < IntegrationCommandTestCase def test_prefix diff --git a/Library/Homebrew/test/test/prune_test.rb b/Library/Homebrew/test/test/prune_test.rb index 293a3746d..b81062112 100644 --- a/Library/Homebrew/test/test/prune_test.rb +++ b/Library/Homebrew/test/test/prune_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPrune < IntegrationCommandTestCase def test_prune diff --git a/Library/Homebrew/test/test/pull_offline_test.rb b/Library/Homebrew/test/test/pull_offline_test.rb index 2716af346..1429ca62e 100644 --- a/Library/Homebrew/test/test/pull_offline_test.rb +++ b/Library/Homebrew/test/test/pull_offline_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPullOffline < IntegrationCommandTestCase def test_pull_offline diff --git a/Library/Homebrew/test/test/pull_test.rb b/Library/Homebrew/test/test/pull_test.rb index 9707ff8a8..f772454ba 100644 --- a/Library/Homebrew/test/test/pull_test.rb +++ b/Library/Homebrew/test/test/pull_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPull < IntegrationCommandTestCase def test_pull diff --git a/Library/Homebrew/test/test/readall_test.rb b/Library/Homebrew/test/test/readall_test.rb index d0c078e49..cbb304ca1 100644 --- a/Library/Homebrew/test/test/readall_test.rb +++ b/Library/Homebrew/test/test/readall_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestReadall < IntegrationCommandTestCase def test_readall diff --git a/Library/Homebrew/test/test/reinstall_pinned_test.rb b/Library/Homebrew/test/test/reinstall_pinned_test.rb index c9cb8a849..36f5cfd74 100644 --- a/Library/Homebrew/test/test/reinstall_pinned_test.rb +++ b/Library/Homebrew/test/test/reinstall_pinned_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestReinstallPinned < IntegrationCommandTestCase def test_reinstall_pinned diff --git a/Library/Homebrew/test/test/reinstall_test.rb b/Library/Homebrew/test/test/reinstall_test.rb index d07a96051..501830102 100644 --- a/Library/Homebrew/test/test/reinstall_test.rb +++ b/Library/Homebrew/test/test/reinstall_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestReinstall < IntegrationCommandTestCase def test_reinstall diff --git a/Library/Homebrew/test/test/repository_test.rb b/Library/Homebrew/test/test/repository_test.rb index 2029876ad..352ab1d42 100644 --- a/Library/Homebrew/test/test/repository_test.rb +++ b/Library/Homebrew/test/test/repository_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestRepository < IntegrationCommandTestCase def test_repository diff --git a/Library/Homebrew/test/test/search_test.rb b/Library/Homebrew/test/test/search_test.rb index 8310d1c2b..95e555bf2 100644 --- a/Library/Homebrew/test/test/search_test.rb +++ b/Library/Homebrew/test/test/search_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestSearch < IntegrationCommandTestCase def test_search diff --git a/Library/Homebrew/test/test/services_test.rb b/Library/Homebrew/test/test/services_test.rb index b5ccb7c77..94fba4675 100644 --- a/Library/Homebrew/test/test/services_test.rb +++ b/Library/Homebrew/test/test/services_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestServices < IntegrationCommandTestCase def test_services diff --git a/Library/Homebrew/test/test/sh_test.rb b/Library/Homebrew/test/test/sh_test.rb index 449b7b5b3..67593b17e 100644 --- a/Library/Homebrew/test/test/sh_test.rb +++ b/Library/Homebrew/test/test/sh_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestSh < IntegrationCommandTestCase def test_sh diff --git a/Library/Homebrew/test/test/switch_test.rb b/Library/Homebrew/test/test/switch_test.rb index 88fdf85b9..766d24494 100644 --- a/Library/Homebrew/test/test/switch_test.rb +++ b/Library/Homebrew/test/test/switch_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestSwitch < IntegrationCommandTestCase def test_switch diff --git a/Library/Homebrew/test/test/tab_test.rb b/Library/Homebrew/test/test/tab_test.rb index 2c756cf68..76c9aacc9 100644 --- a/Library/Homebrew/test/test/tab_test.rb +++ b/Library/Homebrew/test/test/tab_test.rb @@ -218,7 +218,7 @@ class TabLoadingTests < Homebrew::TestCase @f = formula { url "foo-1.0" } @f.prefix.mkpath @path = @f.prefix.join(Tab::FILENAME) - @path.write Pathname.new(TEST_DIRECTORY).join("fixtures", "receipt.json").read + @path.write TEST_FIXTURE_DIR.join("receipt.json").read end def teardown diff --git a/Library/Homebrew/test/test/tap_new_test.rb b/Library/Homebrew/test/test/tap_new_test.rb index 636024b0a..57ad4a08e 100644 --- a/Library/Homebrew/test/test/tap_new_test.rb +++ b/Library/Homebrew/test/test/tap_new_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestTapNew < IntegrationCommandTestCase def test_tap_readme diff --git a/Library/Homebrew/test/test/tap_test.rb b/Library/Homebrew/test/test/tap_test.rb index 71836aee9..94597cdb3 100644 --- a/Library/Homebrew/test/test/tap_test.rb +++ b/Library/Homebrew/test/test/tap_test.rb @@ -1,5 +1,6 @@ require "testing_env" -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestTap < IntegrationCommandTestCase def test_tap diff --git a/Library/Homebrew/test/test/test_formula_test.rb b/Library/Homebrew/test/test/test_formula_test.rb index b3889d6a2..cab4db740 100644 --- a/Library/Homebrew/test/test/test_formula_test.rb +++ b/Library/Homebrew/test/test/test_formula_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestTestFormula < IntegrationCommandTestCase def test_test_formula @@ -13,7 +14,7 @@ class IntegrationCommandTestTestFormula < IntegrationCommandTestCase head "https://github.com/example/testball2.git" devel do - url "file://#{File.expand_path("..", __FILE__)}/tarballs/testball-0.1.tbz" + url "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz" sha256 "#{TESTBALL_SHA256}" end diff --git a/Library/Homebrew/test/test/uninstall_test.rb b/Library/Homebrew/test/test/uninstall_test.rb index d86db0e80..ffc6f0db7 100644 --- a/Library/Homebrew/test/test/uninstall_test.rb +++ b/Library/Homebrew/test/test/uninstall_test.rb @@ -1,4 +1,4 @@ -require "helper/integration_command_test_case" +require "test/support/helper/integration_command_test_case" require "cmd/uninstall" class UninstallTests < Homebrew::TestCase diff --git a/Library/Homebrew/test/test/unlink_test.rb b/Library/Homebrew/test/test/unlink_test.rb index 091bd8c45..a307dc638 100644 --- a/Library/Homebrew/test/test/unlink_test.rb +++ b/Library/Homebrew/test/test/unlink_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestUnlink < IntegrationCommandTestCase def test_unlink diff --git a/Library/Homebrew/test/test/unlinkapps_test.rb b/Library/Homebrew/test/test/unlinkapps_test.rb index 2de4e3ff8..2dbbd84e9 100644 --- a/Library/Homebrew/test/test/unlinkapps_test.rb +++ b/Library/Homebrew/test/test/unlinkapps_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestUnlinkapps < IntegrationCommandTestCase def test_unlinkapps diff --git a/Library/Homebrew/test/test/unpack_test.rb b/Library/Homebrew/test/test/unpack_test.rb index de1452a29..e044e713b 100644 --- a/Library/Homebrew/test/test/unpack_test.rb +++ b/Library/Homebrew/test/test/unpack_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestUnpack < IntegrationCommandTestCase def test_unpack diff --git a/Library/Homebrew/test/test/upgrade_test.rb b/Library/Homebrew/test/test/upgrade_test.rb index 73618293b..7c74ca70e 100644 --- a/Library/Homebrew/test/test/upgrade_test.rb +++ b/Library/Homebrew/test/test/upgrade_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestUpgrade < IntegrationCommandTestCase def test_upgrade diff --git a/Library/Homebrew/test/test/uses_test.rb b/Library/Homebrew/test/test/uses_test.rb index b0e79ef2d..494ce4d6e 100644 --- a/Library/Homebrew/test/test/uses_test.rb +++ b/Library/Homebrew/test/test/uses_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestUses < IntegrationCommandTestCase def test_uses diff --git a/Library/Homebrew/test/test/version_test.rb b/Library/Homebrew/test/test/version_test.rb index ca37e3567..a783eda69 100644 --- a/Library/Homebrew/test/test/version_test.rb +++ b/Library/Homebrew/test/test/version_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestVersion < IntegrationCommandTestCase def test_version diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb index d441b4f1c..76b943164 100644 --- a/Library/Homebrew/test/testing_env.rb +++ b/Library/Homebrew/test/testing_env.rb @@ -1,5 +1,5 @@ $:.unshift File.expand_path("../..", __FILE__) -$:.unshift File.expand_path("../lib", __FILE__) +$:.unshift File.expand_path("../support/lib", __FILE__) require "simplecov" if ENV["HOMEBREW_TESTS_COVERAGE"] require "global" @@ -9,9 +9,6 @@ require "formulary" (HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-core/Formula").mkpath %w[cache formula_cache locks cellar logs temp].each { |d| HOMEBREW_PREFIX.parent.join(d).mkpath } -# Test fixtures and files can be found relative to this path -TEST_DIRECTORY = File.dirname(File.expand_path(__FILE__)) - begin require "rubygems" require "minitest/autorun" @@ -43,7 +40,9 @@ module Homebrew module FSLeakLogger def self.included(klass) require "find" - @@log = File.open(HOMEBREW_LIBRARY_PATH/"tmp/fs_leak.log", "w") + logdir = HOMEBREW_LIBRARY_PATH.join("tmp") + logdir.mkdir unless logdir.directory? + @@log = File.open(logdir.join("fs_leak.log"), "w") klass.make_my_diffs_pretty! end @@ -63,8 +62,8 @@ module Homebrew end class TestCase < ::Minitest::Test - require "test/helper/env" - require "test/helper/shutup" + require "test/support/helper/env" + require "test/support/helper/shutup" include Test::Helper::Env include Test::Helper::Shutup @@ -107,11 +106,11 @@ module Homebrew end def dylib_path(name) - Pathname.new("#{TEST_DIRECTORY}/mach/#{name}.dylib") + Pathname.new("#{TEST_FIXTURE_DIR}/mach/#{name}.dylib") end def bundle_path(name) - Pathname.new("#{TEST_DIRECTORY}/mach/#{name}.bundle") + Pathname.new("#{TEST_FIXTURE_DIR}/mach/#{name}.bundle") end # Use a stubbed {Formulary::FormulaLoader} to make a given formula be found |
