diff options
| author | Markus Reiter | 2016-11-17 03:36:21 +0100 |
|---|---|---|
| committer | GitHub | 2016-11-17 03:36:21 +0100 |
| commit | e6933b90dc750dc9aadb3bfb6acf1bf395942d57 (patch) | |
| tree | 0da872ad2906fad53f176e05056181e0c6ccceaa /Library/Homebrew/cask | |
| parent | edf042ee97f80955b077724119e717a51eb25e29 (diff) | |
| parent | 7457af2b231528e1287281f6cfe651600d5f3f5d (diff) | |
| download | brew-e6933b90dc750dc9aadb3bfb6acf1bf395942d57.tar.bz2 | |
Merge pull request #1364 from reitermarkus/reorder-tests
Reorder and rename test files.
Diffstat (limited to 'Library/Homebrew/cask')
| -rw-r--r-- | Library/Homebrew/cask/spec/spec_helper.rb | 6 | ||||
| -rw-r--r-- | Library/Homebrew/cask/test/test_helper.rb | 6 |
2 files changed, 6 insertions, 6 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 |