aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorMarkus Reiter2017-01-30 01:00:20 +0100
committerMarkus Reiter2017-02-03 17:27:36 +0100
commit77401b787f96f4a50788188cdbb5d2c8fb51a852 (patch)
tree79088aba32f226d9e92da3a9ec2ab5e8ec09f277 /Library/Homebrew
parent98b6766f4e93b324a6e695c3daf0fe313b4433e6 (diff)
downloadbrew-77401b787f96f4a50788188cdbb5d2c8fb51a852.tar.bz2
Reorder `testing_env`.
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/test/testing_env.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
index d5bb849ee..999fa1013 100644
--- a/Library/Homebrew/test/testing_env.rb
+++ b/Library/Homebrew/test/testing_env.rb
@@ -1,18 +1,18 @@
-$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_LIBRARY"]}/Homebrew"))
-$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_LIBRARY"]}/Homebrew/test/support/lib"))
-
-require "simplecov" if ENV["HOMEBREW_TESTS_COVERAGE"]
-require "global"
-
begin
require "minitest/autorun"
require "minitest/reporters"
Minitest::Reporters.use! Minitest::Reporters::DefaultReporter.new(color: true)
- require "parallel_tests/test/runtime_logger"
require "mocha/setup"
+ require "parallel_tests/test/runtime_logger"
+ require "simplecov" if ENV["HOMEBREW_TESTS_COVERAGE"]
rescue LoadError
- abort "Run `bundle install` or install the mocha and minitest gems before running the tests"
+ abort "Run `bundle install` before running the tests."
end
+$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_LIBRARY"]}/Homebrew"))
+$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_LIBRARY"]}/Homebrew/test/support/lib"))
+
+require "global"
+
require "test/support/helper/test_case"
require "test/support/helper/integration_command_test_case"