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

29 files changed, 8 insertions, 4 deletions

diff --git a/Library/Homebrew/test/fixtures/cask/AppWithBinary.zip b/Library/Homebrew/test/fixtures/cask/AppWithBinary.zip
new file mode 100644
index 000000000..4a5b318ba
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/AppWithBinary.zip
diff --git a/Library/Homebrew/test/fixtures/cask/AppWithEmbeddedBinary.zip b/Library/Homebrew/test/fixtures/cask/AppWithEmbeddedBinary.zip
new file mode 100644
index 000000000..7c708038c
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/AppWithEmbeddedBinary.zip
diff --git a/Library/Homebrew/test/fixtures/cask/MyFancyApp.zip b/Library/Homebrew/test/fixtures/cask/MyFancyApp.zip
new file mode 100644
index 000000000..ba09ee681
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/MyFancyApp.zip
diff --git a/Library/Homebrew/test/fixtures/cask/MyFancyPkg.zip b/Library/Homebrew/test/fixtures/cask/MyFancyPkg.zip
new file mode 100644
index 000000000..ec4f97f07
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/MyFancyPkg.zip
diff --git a/Library/Homebrew/test/fixtures/cask/NestedApp.dmg.zip b/Library/Homebrew/test/fixtures/cask/NestedApp.dmg.zip
new file mode 100644
index 000000000..ae6686c7e
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/NestedApp.dmg.zip
diff --git a/Library/Homebrew/test/fixtures/cask/caffeine-suite.zip b/Library/Homebrew/test/fixtures/cask/caffeine-suite.zip
new file mode 100644
index 000000000..c38f771ae
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/caffeine-suite.zip
diff --git a/Library/Homebrew/test/fixtures/cask/caffeine.zip b/Library/Homebrew/test/fixtures/cask/caffeine.zip
new file mode 100644
index 000000000..99d61bbfb
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/caffeine.zip
diff --git a/Library/Homebrew/test/fixtures/cask/caffeines-subdir.zip b/Library/Homebrew/test/fixtures/cask/caffeines-subdir.zip
new file mode 100644
index 000000000..ce5064d09
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/caffeines-subdir.zip
diff --git a/Library/Homebrew/test/fixtures/cask/caffeines.zip b/Library/Homebrew/test/fixtures/cask/caffeines.zip
new file mode 100644
index 000000000..372fcc522
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/caffeines.zip
diff --git a/Library/Homebrew/test/fixtures/cask/container.7z b/Library/Homebrew/test/fixtures/cask/container.7z
new file mode 100644
index 000000000..30dbe24f7
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/container.7z
diff --git a/Library/Homebrew/test/fixtures/cask/container.air b/Library/Homebrew/test/fixtures/cask/container.air
new file mode 100644
index 000000000..64005aea3
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/container.air
diff --git a/Library/Homebrew/test/fixtures/cask/container.bz2 b/Library/Homebrew/test/fixtures/cask/container.bz2
new file mode 100755
index 000000000..6ec60f31f
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/container.bz2
diff --git a/Library/Homebrew/test/fixtures/cask/container.cab b/Library/Homebrew/test/fixtures/cask/container.cab
new file mode 100644
index 000000000..edc741aa1
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/container.cab
diff --git a/Library/Homebrew/test/fixtures/cask/container.dmg b/Library/Homebrew/test/fixtures/cask/container.dmg
new file mode 100644
index 000000000..3b3cbf51c
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/container.dmg
diff --git a/Library/Homebrew/test/fixtures/cask/container.gz b/Library/Homebrew/test/fixtures/cask/container.gz
new file mode 100755
index 000000000..67ede6b96
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/container.gz
diff --git a/Library/Homebrew/test/fixtures/cask/container.lzma b/Library/Homebrew/test/fixtures/cask/container.lzma
new file mode 100755
index 000000000..2ff7ccee7
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/container.lzma
diff --git a/Library/Homebrew/test/fixtures/cask/container.pkg b/Library/Homebrew/test/fixtures/cask/container.pkg
new file mode 100644
index 000000000..274f27e7a
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/container.pkg
diff --git a/Library/Homebrew/test/fixtures/cask/container.rar b/Library/Homebrew/test/fixtures/cask/container.rar
new file mode 100644
index 000000000..7477c3bb4
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/container.rar
diff --git a/Library/Homebrew/test/fixtures/cask/container.sit b/Library/Homebrew/test/fixtures/cask/container.sit
new file mode 100755
index 000000000..3e29d21dc
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/container.sit
diff --git a/Library/Homebrew/test/fixtures/cask/container.tar.gz b/Library/Homebrew/test/fixtures/cask/container.tar.gz
new file mode 100644
index 000000000..c464fb413
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/container.tar.gz
diff --git a/Library/Homebrew/test/fixtures/cask/container.xar b/Library/Homebrew/test/fixtures/cask/container.xar
new file mode 100644
index 000000000..563a5ba1e
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/container.xar
diff --git a/Library/Homebrew/test/fixtures/cask/container.xz b/Library/Homebrew/test/fixtures/cask/container.xz
new file mode 100755
index 000000000..74db22090
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/container.xz
diff --git a/Library/Homebrew/test/fixtures/cask/empty_directory/.gitignore b/Library/Homebrew/test/fixtures/cask/empty_directory/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/empty_directory/.gitignore
diff --git a/Library/Homebrew/test/fixtures/cask/naked_executable b/Library/Homebrew/test/fixtures/cask/naked_executable
new file mode 100755
index 000000000..039e4d006
--- /dev/null
+++ b/Library/Homebrew/test/fixtures/cask/naked_executable
@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 0
diff --git a/Library/Homebrew/test/fixtures/cask/transmission-2.61.dmg b/Library/Homebrew/test/fixtures/cask/transmission-2.61.dmg
new file mode 100644
index 000000000..e72afe027
--- /dev/null
+++ b/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 98144d71e..4fe62d409 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 a12983e4c..4aa835590 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 e41f76e27..93c88d64b 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 b3ae865a5..6b6cec6ce 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