diff options
| author | Samuel E. Giddins <segiddins@segiddins.me> | 2015-07-15 19:03:35 -0700 |
|---|---|---|
| committer | Samuel E. Giddins <segiddins@segiddins.me> | 2015-07-15 19:03:35 -0700 |
| commit | f2dd60a902f2eadf1fee9f1c7bb92fae7861f073 (patch) | |
| tree | 58cbca0ddb332798ed49896d6ecfe68cfcf2617a | |
| parent | 81265d1741949ae00ada0530b44ecfe4cfe10416 (diff) | |
| download | bundler-f2dd60a902f2eadf1fee9f1c7bb92fae7861f073.tar.gz | |
Update specs for moving bin/bundle to exe/bundle
| -rw-r--r-- | spec/commands/exec_spec.rb | 2 | ||||
| -rw-r--r-- | spec/support/helpers.rb | 2 | ||||
| -rw-r--r-- | spec/support/rubygems_ext.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb index 9884eee6..d6138518 100644 --- a/spec/commands/exec_spec.rb +++ b/spec/commands/exec_spec.rb @@ -60,7 +60,7 @@ describe "bundle exec" do it "handles --keep-file-descriptors" do require 'tempfile' - bundle_bin = File.expand_path('../../../bin/bundle', __FILE__) + bundle_bin = File.expand_path('../../../exe/bundle', __FILE__) command = Tempfile.new("io-test") command.sync = true diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb index 07126cff..12bfaaa2 100644 --- a/spec/support/helpers.rb +++ b/spec/support/helpers.rb @@ -81,7 +81,7 @@ module Spec expect_err = options.delete(:expect_err) options["no-color"] = true unless options.key?("no-color") - bundle_bin = File.expand_path('../../../bin/bundle_ruby', __FILE__) + bundle_bin = File.expand_path('../../../exe/bundle_ruby', __FILE__) requires = options.delete(:requires) || [] requires << File.expand_path('../fakeweb/'+options.delete(:fakeweb)+'.rb', __FILE__) if options.key?(:fakeweb) diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb index 47f660f0..0d0e35c4 100644 --- a/spec/support/rubygems_ext.rb +++ b/spec/support/rubygems_ext.rb @@ -8,7 +8,7 @@ module Spec ENV['BUNDLE_PATH'] = nil ENV['GEM_HOME'] = ENV['GEM_PATH'] = Path.base_system_gems.to_s - ENV['PATH'] = ["#{Path.root}/bin", "#{Path.system_gem_path}/bin", ENV['PATH']].join(File::PATH_SEPARATOR) + ENV['PATH'] = ["#{Path.root}/exe", "#{Path.system_gem_path}/bin", ENV['PATH']].join(File::PATH_SEPARATOR) unless File.exist?("#{Path.base_system_gems}") FileUtils.mkdir_p(Path.base_system_gems) |