diff options
| -rw-r--r-- | Library/Homebrew/extend/ARGV.rb | 3 | ||||
| -rw-r--r-- | Library/Homebrew/test/spec_helper.rb | 21 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index 0825b13a7..8cc2ccbc0 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -133,9 +133,8 @@ module HomebrewArgvExtension end end - # self documenting perhaps? def include?(arg) - @n=index arg + !(@n = index(arg)).nil? end def next diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index 9a4dbe026..193de6b8f 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -31,22 +31,23 @@ TEST_DIRECTORIES = [ RSpec.configure do |config| config.order = :random + config.include(Test::Helper::Shutup) config.include(Test::Helper::Fixtures) config.include(Test::Helper::Formula) - config.before(:each) do |example| - if example.metadata[:needs_macos] - skip "Not on macOS." unless OS.mac? - end - if example.metadata[:needs_official_cmd_taps] - skip "Needs official command Taps." unless ENV["HOMEBREW_TEST_OFFICIAL_CMD_TAPS"] - end + config.before(:each, :needs_official_cmd_taps) do + skip "Needs official command Taps." unless ENV["HOMEBREW_TEST_OFFICIAL_CMD_TAPS"] + end - if example.metadata[:needs_python] - skip "Python not installed." unless which("python") - end + config.before(:each, :needs_macos) do + skip "Not on macOS." unless OS.mac? + end + + config.before(:each, :needs_python) do + skip "Python not installed." unless which("python") end + config.around(:each) do |example| begin TEST_DIRECTORIES.each(&:mkpath) |