diff options
author | Carlhuda <carlhuda@engineyard.com> | 2010-02-16 14:47:22 -0800 |
---|---|---|
committer | Carlhuda <carlhuda@engineyard.com> | 2010-02-16 14:47:22 -0800 |
commit | c4ad73c30d74904c851ada8132970da798c86aa9 (patch) | |
tree | a51bd493c5d4cc070269e81f2d76a492310d8c3c /spec | |
parent | c731f79af1dd6bf83a3facc0421dc6e4ccfc0e1c (diff) | |
download | bundler-c4ad73c30d74904c851ada8132970da798c86aa9.tar.gz |
Fix Bundler on 1.9
Diffstat (limited to 'spec')
-rw-r--r-- | spec/runtime/environment_rb_spec.rb | 1 | ||||
-rw-r--r-- | spec/spec_helper.rb | 4 | ||||
-rw-r--r-- | spec/support/helpers.rb | 2 | ||||
-rw-r--r-- | spec/support/rubygems_ext.rb (renamed from spec/support/rubygems.rb) | 0 |
4 files changed, 5 insertions, 2 deletions
diff --git a/spec/runtime/environment_rb_spec.rb b/spec/runtime/environment_rb_spec.rb index c172fc3e..c7a3ba0c 100644 --- a/spec/runtime/environment_rb_spec.rb +++ b/spec/runtime/environment_rb_spec.rb @@ -16,6 +16,7 @@ describe "environment.rb file" do it "does not pull in system gems" do run <<-R, :lite_runtime => true require 'rubygems' + begin; require 'rack' rescue LoadError diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 58f35c7b..0c8e1b92 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -10,7 +10,9 @@ Dir["#{File.expand_path('../support', __FILE__)}/*.rb"].each do |file| require file end -$debug = false +$debug = false +$show_err = false + Spec::Rubygems.setup FileUtils.rm_rf(Spec::Path.gem_repo1) diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb index ac259cec..7083fabd 100644 --- a/spec/support/helpers.rb +++ b/spec/support/helpers.rb @@ -44,7 +44,7 @@ module Spec gemfile = File.expand_path('../../../bin/bundle', __FILE__) input, out, err, waitthread = Open3.popen3("#{Gem.ruby} -I#{lib} #{gemfile} #{cmd}#{args}") @err = err.read.strip - puts @err if $debug && !err.empty? + puts @err if $show_err && !@err.empty? @out = out.read.strip @exitstatus = nil @exitstatus = waitthread.value.to_i if waitthread diff --git a/spec/support/rubygems.rb b/spec/support/rubygems_ext.rb index 7c534c3a..7c534c3a 100644 --- a/spec/support/rubygems.rb +++ b/spec/support/rubygems_ext.rb |