diff --git a/Library/Homebrew/cask/cmd/brew-cask-tests.rb b/Library/Homebrew/cask/cmd/brew-cask-tests.rb index 7ae71020ed1ccf393e68324301f88ae95806c4d9..ce62b5d84e1fbf5c5f1dd87c3c0d70947ed980dd 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 aff21474511f28b41e49d6b6b465bc29b850ba2b..7dadc6b5c2be0ee516ab6374224d19a99a67a767 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 47c1b4cdb3714fb38d31c39b54ea81125e959326..40e718ad50dfa848e72e85d475504c7ef0f550f0 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