diff options
Diffstat (limited to 'spec/bundler/spec_helper.rb')
-rw-r--r-- | spec/bundler/spec_helper.rb | 46 |
1 files changed, 16 insertions, 30 deletions
diff --git a/spec/bundler/spec_helper.rb b/spec/bundler/spec_helper.rb index 58d498e070..ba21d22fbd 100644 --- a/spec/bundler/spec_helper.rb +++ b/spec/bundler/spec_helper.rb @@ -1,7 +1,9 @@ # frozen_string_literal: true -$:.unshift File.expand_path("..", __FILE__) -$:.unshift File.expand_path("../../lib", __FILE__) +require_relative "support/path" + +$:.unshift Spec::Path.spec_dir.to_s +$:.unshift Spec::Path.lib_dir.to_s require "bundler/psyched_yaml" require "bundler/vendored_fileutils" @@ -15,10 +17,16 @@ end require "bundler" require "rspec" -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/filters" +require_relative "support/helpers" +require_relative "support/indexes" +require_relative "support/matchers" +require_relative "support/parallel" +require_relative "support/permissions" +require_relative "support/platforms" +require_relative "support/sometimes" +require_relative "support/sudo" $debug = false @@ -34,7 +42,6 @@ RSpec.configure do |config| config.include Spec::Indexes config.include Spec::Matchers config.include Spec::Path - config.include Spec::Rubygems config.include Spec::Platforms config.include Spec::Sudo config.include Spec::Permissions @@ -52,28 +59,6 @@ RSpec.configure do |config| config.bisect_runner = :shell - if ENV["BUNDLER_SUDO_TESTS"] && Spec::Sudo.present? - config.filter_run :sudo => true - else - config.filter_run_excluding :sudo => true - end - - if ENV["BUNDLER_REALWORLD_TESTS"] - config.filter_run :realworld => true - else - config.filter_run_excluding :realworld => true - end - - git_version = Bundler::Source::Git::GitProxy.new(nil, nil, nil).version - - config.filter_run_excluding :rubygems => RequirementChecker.against(Gem::VERSION) - config.filter_run_excluding :git => RequirementChecker.against(git_version) - config.filter_run_excluding :bundler => RequirementChecker.against(Bundler::VERSION.split(".")[0]) - config.filter_run_excluding :ruby_repo => !ENV["GEM_COMMAND"].nil? - config.filter_run_excluding :no_color_tty => Gem.win_platform? || !ENV["GITHUB_ACTION"].nil? - - config.filter_run_when_matching :focus unless ENV["CI"] - original_wd = Dir.pwd original_env = ENV.to_hash @@ -95,6 +80,7 @@ RSpec.configure do |config| end config.before :suite do + require_relative "support/rubygems_ext" Spec::Rubygems.setup ENV["RUBYOPT"] = "#{ENV["RUBYOPT"]} -r#{Spec::Path.spec_dir}/support/hax.rb" ENV["BUNDLE_SPEC_RUN"] = "true" @@ -122,7 +108,7 @@ RSpec.configure do |config| in_app_root @command_executions = [] - example.run + Bundler.ui.silence { example.run } all_output = @command_executions.map(&:to_s_verbose).join("\n\n") if example.exception && !all_output.empty? |