diff options
| author | Carl Lerche <carllerche@mac.com> | 2010-01-31 16:33:06 -0800 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-01-31 19:13:43 -0800 |
| commit | 9f01dff9c203821bf4ac6d7b885f1d6b018d5c79 (patch) | |
| tree | 5e7c4be2aec0f7e2bff6eac4e066a16dc4e269ad /railties | |
| parent | 9bd0422dd7b4fc9f3bebf6301b144c6a5f35c26b (diff) | |
| download | rails-9f01dff9c203821bf4ac6d7b885f1d6b018d5c79.tar.gz rails-9f01dff9c203821bf4ac6d7b885f1d6b018d5c79.tar.bz2 rails-9f01dff9c203821bf4ac6d7b885f1d6b018d5c79.zip | |
Get rails tests running on bundler 0.9
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/Rakefile | 5 | ||||
| -rw-r--r-- | railties/test/abstract_unit.rb | 12 | ||||
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 26 |
3 files changed, 10 insertions, 33 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index b8f5e81b85..ea0b8ef8fb 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -1,7 +1,4 @@ -begin - require File.expand_path('../../vendor/gems/environment', __FILE__) -rescue LoadError -end +require File.expand_path('../../load_paths', __FILE__) require 'rake' require 'rake/testtask' diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb index 77ef82856a..aa66dbb9be 100644 --- a/railties/test/abstract_unit.rb +++ b/railties/test/abstract_unit.rb @@ -1,15 +1,7 @@ ORIG_ARGV = ARGV.dup -root = File.expand_path('../../..', __FILE__) -begin - require "#{root}/vendor/gems/environment" -rescue LoadError - %w(activesupport activemodel activerecord actionpack actionmailer activeresource railties).each do |lib| - $:.unshift "#{root}/#{lib}/lib" - end -end - -$:.unshift "#{root}/railties/builtin/rails_info" +require File.expand_path("../../../load_paths", __FILE__) +$:.unshift File.expand_path("../../builtin/rails_info", __FILE__) require 'stringio' require 'test/unit' diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 940585836c..ff4ee6332b 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -183,23 +183,7 @@ module TestHelpers end def boot_rails - root = File.expand_path('../../../..', __FILE__) - begin - require "#{root}/vendor/gems/environment" - rescue LoadError - %w( - actionmailer/lib - actionpack/lib - activemodel/lib - activerecord/lib - activeresource/lib - activesupport/lib - railties/lib - railties - ).reverse_each do |path| - $:.unshift "#{root}/#{path}" - end - end + require File.expand_path('../../../../load_paths', __FILE__) end end end @@ -220,14 +204,18 @@ Module.new do end FileUtils.mkdir(tmp_path) - environment = File.expand_path('../../../../vendor/gems/environment', __FILE__) + environment = File.expand_path('../../../../load_paths', __FILE__) if File.exist?("#{environment}.rb") require_environment = "-r #{environment}" end `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails #{tmp_path('app_template')}` File.open("#{tmp_path}/app_template/config/boot.rb", 'w') do |f| - f.puts "require '#{environment}'" if require_environment + if require_environment + f.puts "Dir.chdir('#{File.dirname(environment)}') do" + f.puts " require '#{environment}'" + f.puts "end" + end f.puts "require 'rails/all'" end end |