Prefer direct requires

1 files changed, 16 insertions, 4 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8bca86c416..bf2398b9e0 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -14,10 +14,22 @@ end
 
 require "bundler"
 
-Dir["#{File.expand_path("../support", __FILE__)}/*.rb"].each do |file|
-  file = file.gsub(%r{\A#{Regexp.escape File.expand_path("..", __FILE__)}/}, "")
-  require file unless file.end_with?("hax.rb")
-end
+require_relative "support/builders"
+require_relative "support/command_execution"
+require_relative "support/helpers"
+require_relative "support/indexes"
+require_relative "support/manpages"
+require_relative "support/matchers"
+require_relative "support/path"
+require_relative "support/permissions"
+require_relative "support/platforms"
+require_relative "support/requirement_checker"
+require_relative "support/rubygems_ext"
+require_relative "support/silent_logger"
+require_relative "support/sometimes"
+require_relative "support/streams"
+require_relative "support/sudo"
+require_relative "support/the_bundle"
 
 $debug = false