diff options
| author | Markus Reiter | 2016-08-21 04:48:35 +0200 |
|---|---|---|
| committer | Markus Reiter | 2016-08-21 05:07:38 +0200 |
| commit | 39e9506557aa584de5152528871728a2728685c7 (patch) | |
| tree | d252c58815e751ca53079b0a6189fefb8ba74061 /Library/Homebrew/cask | |
| parent | 7c7e2d00af9d8a05f4736c368804713fba61a422 (diff) | |
| download | brew-39e9506557aa584de5152528871728a2728685c7.tar.bz2 | |
Refactor `shutup`.
Diffstat (limited to 'Library/Homebrew/cask')
| -rw-r--r-- | Library/Homebrew/cask/spec/spec_helper.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/cask/spec/support/shutup_helper.rb | 18 | ||||
| -rw-r--r-- | Library/Homebrew/cask/test/test_helper.rb | 19 |
3 files changed, 5 insertions, 36 deletions
diff --git a/Library/Homebrew/cask/spec/spec_helper.rb b/Library/Homebrew/cask/spec/spec_helper.rb index e86e20027..a826cfcf0 100644 --- a/Library/Homebrew/cask/spec/spec_helper.rb +++ b/Library/Homebrew/cask/spec/spec_helper.rb @@ -22,6 +22,8 @@ $LOAD_PATH.push(project_root.join("lib").to_s) ENV["HOMEBREW_NO_EMOJI"] = "1" ENV["HOMEBREW_CASK_OPTS"] = nil +require "test/helper/shutup" + Dir["#{project_root}/spec/support/*.rb"].each(&method(:require)) # from Homebrew. Provides expects method. @@ -63,5 +65,5 @@ Hbc.caskroom = Hbc.homebrew_prefix.join("TestCaskroom") RSpec.configure do |config| config.order = :random - config.include ShutupHelper + config.include(Test::Helper::Shutup) end diff --git a/Library/Homebrew/cask/spec/support/shutup_helper.rb b/Library/Homebrew/cask/spec/support/shutup_helper.rb deleted file mode 100644 index 98dde01a6..000000000 --- a/Library/Homebrew/cask/spec/support/shutup_helper.rb +++ /dev/null @@ -1,18 +0,0 @@ -module ShutupHelper - def shutup - if ENV.key?("VERBOSE_TESTS") - yield - else - begin - tmperr = $stderr.clone - tmpout = $stdout.clone - $stderr.reopen "/dev/null", "w" - $stdout.reopen "/dev/null", "w" - yield - ensure - $stderr.reopen tmperr - $stdout.reopen tmpout - end - end - end -end diff --git a/Library/Homebrew/cask/test/test_helper.rb b/Library/Homebrew/cask/test/test_helper.rb index 528ca69cf..fdbd8af0e 100644 --- a/Library/Homebrew/cask/test/test_helper.rb +++ b/Library/Homebrew/cask/test/test_helper.rb @@ -23,23 +23,8 @@ $LOAD_PATH.push(project_root.join("lib").to_s) ENV["HOMEBREW_NO_EMOJI"] = "1" ENV["HOMEBREW_CASK_OPTS"] = nil -# TODO: temporary, copied from old Homebrew, this method is now moved inside a class -def shutup - if ENV.key?("VERBOSE_TESTS") - yield - else - begin - tmperr = $stderr.clone - tmpout = $stdout.clone - $stderr.reopen "/dev/null", "w" - $stdout.reopen "/dev/null", "w" - yield - ensure - $stderr.reopen tmperr - $stdout.reopen tmpout - end - end -end +require "test/helper/shutup" +include Test::Helper::Shutup def sudo(*args) %w[/usr/bin/sudo -E --] + Array(args).flatten |