Bundle for railties tests too

3 files changed, 30 insertions, 22 deletions

diff --git a/ci/ci_build.rb b/ci/ci_build.rb
index 3b06c9c7ce..6574481c19 100755
--- a/ci/ci_build.rb
+++ b/ci/ci_build.rb
@@ -80,7 +80,7 @@ cd "#{root_dir}/railties" do
   puts
   puts "[CruiseControl] Building RailTies"
   puts
-  build_results[:railties] = system 'rake'
+  build_results[:railties] = system 'gem bundle && rake'
 end
 
 
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index 8010481609..7977b45a57 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -1,14 +1,14 @@
 ORIG_ARGV = ARGV.dup
 
-require 'rubygems'
-gem 'rack', '~> 1.0.0'
-gem 'rack-test', '~> 0.5.0'
+bundled = "#{File.dirname(__FILE__)}/../vendor/gems/environment"
+if File.exist?("#{bundled}.rb")
+  require bundled
+else
+  %w(activesupport activemodel activerecord actionpack actionmailer activeresource).each do |lib|
+    $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../#{lib}/lib"
+  end
+end
 
-$:.unshift File.dirname(__FILE__) + "/../../activesupport/lib"
-$:.unshift File.dirname(__FILE__) + "/../../activerecord/lib"
-$:.unshift File.dirname(__FILE__) + "/../../actionpack/lib"
-$:.unshift File.dirname(__FILE__) + "/../../actionmailer/lib"
-$:.unshift File.dirname(__FILE__) + "/../../activeresource/lib"
 $:.unshift File.dirname(__FILE__) + "/../lib"
 $:.unshift File.dirname(__FILE__) + "/../builtin/rails_info"
 
@@ -25,4 +25,4 @@ require 'rails'
 
 Rails::Initializer.run do |config|
   config.root = File.dirname(__FILE__)
-end
\ No newline at end of file
+end
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index aafc9f68bb..557292e7d3 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -114,18 +114,26 @@ module TestHelpers
     end
 
     def boot_rails
-      %w(
-        actionmailer/lib
-        actionpack/lib
-        activemodel/lib
-        activerecord/lib
-        activeresource/lib
-        activesupport/lib
-        railties/lib
-        railties
-      ).reverse_each do |path|
-        path = File.expand_path("../../../../#{path}", __FILE__)
-        $:.unshift(path)
+      bundled = "#{File.dirname(__FILE__)}/../../vendor/gems/environment"
+      if File.exist?("#{bundled}.rb")
+        require bundled
+        %w(railties railties/lib).each do |path|
+          $LOAD_PATH.unshift File.expand_path("../../../../#{path}", __FILE__)
+        end
+      else
+        %w(
+          actionmailer/lib
+          actionpack/lib
+          activemodel/lib
+          activerecord/lib
+          activeresource/lib
+          activesupport/lib
+          railties/lib
+          railties
+        ).reverse_each do |path|
+          path = File.expand_path("../../../../#{path}", __FILE__)
+          $:.unshift(path)
+        end
       end
     end
   end