diff --git a/spec/bundler/commands/console_spec.rb b/spec/bundler/commands/console_spec.rb index 1a38ce29d5..aa76096e3d 100644 --- a/spec/bundler/commands/console_spec.rb +++ b/spec/bundler/commands/console_spec.rb @@ -45,17 +45,6 @@ RSpec.describe "bundle console", :bundler => "< 3", :readline => true do G end - around :each do |example| - require 'tmpdir' - Dir.mktmpdir("bundler_commands_console") do |dir| - xdg_config_home_backup = ENV.delete("XDG_CONFIG_HOME") - ENV["XDG_CONFIG_HOME"] = dir - example.run - ensure - ENV["XDG_CONFIG_HOME"] = xdg_config_home_backup - end - end - it "starts IRB with the default group loaded" do bundle "console" do |input, _, _| input.puts("puts RACK") diff --git a/spec/bundler/spec_helper.rb b/spec/bundler/spec_helper.rb index db1055c295..99be2f4df8 100644 --- a/spec/bundler/spec_helper.rb +++ b/spec/bundler/spec_helper.rb @@ -4,6 +4,7 @@ require "bundler/psyched_yaml" require "bundler/vendored_fileutils" require "bundler/vendored_uri" require "digest" +require "tmpdir" if File.expand_path(__FILE__) =~ %r{([^\w/\.:\-])} abort "The bundler specs cannot be run from a path that contains special characters (particularly #{$1.inspect})" @@ -110,6 +111,16 @@ RSpec.configure do |config| end end + config.around :each do |example| + Dir.mktmpdir("bundler_commands_console") do |dir| + xdg_config_home_backup = ENV.delete("XDG_CONFIG_HOME") + ENV["XDG_CONFIG_HOME"] = dir + example.run + ensure + ENV["XDG_CONFIG_HOME"] = xdg_config_home_backup + end + end + config.after :suite do FileUtils.rm_r Spec::Path.pristine_system_gem_path end