diff options
| author | Markus Reiter | 2017-01-26 00:52:21 +0100 |
|---|---|---|
| committer | Markus Reiter | 2017-02-03 17:27:36 +0100 |
| commit | b7658539696ed7a36dabacf9a34492ce87d31542 (patch) | |
| tree | 6d374bccf7eb59c4de598ab19ddbeed72fd2704c /Library/Homebrew/test/support | |
| parent | f35c6c8cf1c79a01ff5176e14f17f92e40c8c69a (diff) | |
| download | brew-b7658539696ed7a36dabacf9a34492ce87d31542.tar.bz2 | |
Use constant array of constants in `Homebrew::TestCase`.
Diffstat (limited to 'Library/Homebrew/test/support')
| -rw-r--r-- | Library/Homebrew/test/support/helper/test_case.rb | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/Library/Homebrew/test/support/helper/test_case.rb b/Library/Homebrew/test/support/helper/test_case.rb index 7d7ff52d9..d1600f9f9 100644 --- a/Library/Homebrew/test/support/helper/test_case.rb +++ b/Library/Homebrew/test/support/helper/test_case.rb @@ -12,16 +12,18 @@ module Homebrew TEST_SHA1 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze TEST_SHA256 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze + TEST_DIRECTORIES = [ + CoreTap.instance.path/"Formula", + HOMEBREW_CACHE, + HOMEBREW_CACHE_FORMULA, + HOMEBREW_CELLAR, + HOMEBREW_LOCK_DIR, + HOMEBREW_LOGS, + HOMEBREW_TEMP, + ].freeze + def setup - [ - HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-core/Formula", - HOMEBREW_CACHE, - HOMEBREW_CACHE_FORMULA, - HOMEBREW_LOCK_DIR, - HOMEBREW_CELLAR, - HOMEBREW_LOGS, - HOMEBREW_TEMP, - ].each(&:mkpath) + TEST_DIRECTORIES.each(&:mkpath) super @@ -35,15 +37,10 @@ module Homebrew Tab.clear_cache - coretap = CoreTap.new - paths_to_delete = [ + FileUtils.rm_rf [ + TEST_DIRECTORIES.map(&:children), HOMEBREW_LINKED_KEGS, HOMEBREW_PINNED_KEGS, - HOMEBREW_CELLAR.children, - HOMEBREW_CACHE.children, - HOMEBREW_LOCK_DIR.children, - HOMEBREW_LOGS.children, - HOMEBREW_TEMP.children, HOMEBREW_PREFIX/".git", HOMEBREW_PREFIX/"bin", HOMEBREW_PREFIX/"share", @@ -55,12 +52,10 @@ module Homebrew HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-services", HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-shallow", HOMEBREW_REPOSITORY/".git", - coretap.path/".git", - coretap.alias_dir, - coretap.formula_dir.children, - coretap.path/"formula_renames.json", - ].flatten - FileUtils.rm_rf paths_to_delete + CoreTap.instance.path/".git", + CoreTap.instance.alias_dir, + CoreTap.instance.path/"formula_renames.json", + ] super end |