diff options
| author | Markus Reiter | 2016-10-18 16:24:30 +0200 |
|---|---|---|
| committer | Markus Reiter | 2016-10-18 16:24:30 +0200 |
| commit | a92dc724b0b6b5bb2cb2660cb9c3ff6992eb039e (patch) | |
| tree | 591c4a02436e0635982e3beb41e267d94c844785 /Library/Homebrew/cask | |
| parent | 2da012d84d81dad61b7a5e071c9f827c822a6fed (diff) | |
| download | brew-a92dc724b0b6b5bb2cb2660cb9c3ff6992eb039e.tar.bz2 | |
Set `HOMEBREW_NO_EMOJI` and `HOMEBREW_CASK_OPTS` in `cask-tests`.
Diffstat (limited to 'Library/Homebrew/cask')
| -rwxr-xr-x | Library/Homebrew/cask/cmd/brew-cask-tests.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/cask/spec/spec_helper.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/cask/test/test_helper.rb | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/Library/Homebrew/cask/cmd/brew-cask-tests.rb b/Library/Homebrew/cask/cmd/brew-cask-tests.rb index 7ae71020e..ce62b5d84 100755 --- a/Library/Homebrew/cask/cmd/brew-cask-tests.rb +++ b/Library/Homebrew/cask/cmd/brew-cask-tests.rb @@ -10,6 +10,8 @@ end repo_root = Pathname(__FILE__).realpath.parent.parent repo_root.cd do ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1" + ENV["HOMEBREW_NO_EMOJI"] = "1" + ENV.delete("HOMEBREW_CASK_OPTS") Homebrew.install_gem_setup_path! "bundler" unless quiet_system("bundle", "check") diff --git a/Library/Homebrew/cask/spec/spec_helper.rb b/Library/Homebrew/cask/spec/spec_helper.rb index aff214745..7dadc6b5c 100644 --- a/Library/Homebrew/cask/spec/spec_helper.rb +++ b/Library/Homebrew/cask/spec/spec_helper.rb @@ -16,10 +16,6 @@ require "global" # add Homebrew-Cask to load path $LOAD_PATH.push(project_root.join("lib").to_s) -# force some environment variables -ENV["HOMEBREW_NO_EMOJI"] = "1" -ENV["HOMEBREW_CASK_OPTS"] = nil - require "test/helper/shutup" Dir["#{project_root}/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 47c1b4cdb..40e718ad5 100644 --- a/Library/Homebrew/cask/test/test_helper.rb +++ b/Library/Homebrew/cask/test/test_helper.rb @@ -17,10 +17,6 @@ require "global" # add Homebrew-Cask to load path $LOAD_PATH.push(project_root.join("lib").to_s) -# force some environment variables -ENV["HOMEBREW_NO_EMOJI"] = "1" -ENV["HOMEBREW_CASK_OPTS"] = nil - require "test/helper/shutup" include Test::Helper::Shutup |