Have all the tests running off a single Gemfile

4 files changed, 15 insertions, 52 deletions

diff --git a/railties/Gemfile b/railties/Gemfile
deleted file mode 100644
index c441d69ded..0000000000
--- a/railties/Gemfile
+++ /dev/null
@@ -1,13 +0,0 @@
-Gem.sources.each { |uri| source uri }
-sibling = "#{File.dirname(__FILE__)}/.."
-
-gem "mocha"
-
-gem "arel", :git => "git://github.com/rails/arel.git"
-gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git", :branch => "rack-1.0"
-gem "rack-mount", :git => "git://github.com/josh/rack-mount.git"
-gem "rack-test", "~> 0.5.0"
-
-%w(activesupport activemodel actionpack actionmailer activerecord activeresource).each do |lib|
-  gem lib, '3.0.pre', :vendored_at => "#{sibling}/#{lib}"
-end
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index 7977b45a57..47013d7797 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -1,16 +1,15 @@
 ORIG_ARGV = ARGV.dup
 
-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"
+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 File.dirname(__FILE__) + "/../lib"
-$:.unshift File.dirname(__FILE__) + "/../builtin/rails_info"
+$:.unshift "#{root}/railties/builtin/rails_info"
 
 require 'stringio'
 require 'test/unit'
diff --git a/railties/test/application/initializer_test.rb b/railties/test/application/initializer_test.rb
index f42954079b..719520bf68 100644
--- a/railties/test/application/initializer_test.rb
+++ b/railties/test/application/initializer_test.rb
@@ -82,26 +82,6 @@ module ApplicationTests
       end
     end
 
-    test "action_pack is added to the load path if action_controller is required" do
-      Rails::Initializer.run do |config|
-        config.root = app_path
-        config.frameworks = [:action_controller]
-      end
-      Rails.initialize!
-
-      assert $:.include?("#{framework_path}/actionpack/lib")
-    end
-
-    test "action_pack is added to the load path if action_view is required" do
-      Rails::Initializer.run do |config|
-        config.root = app_path
-        config.frameworks = [:action_view]
-      end
-      Rails.initialize!
-
-      assert $:.include?("#{framework_path}/actionpack/lib")
-    end
-
     test "after_initialize block works correctly" do
       Rails::Initializer.run do |config|
         config.root = app_path
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 557292e7d3..11cabb2c0b 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -6,7 +6,6 @@
 #
 # It is also good to know what is the bare minimum to get
 # Rails booted up.
-
 require 'fileutils'
 
 # TODO: Remove rubygems when possible
@@ -82,6 +81,7 @@ module TestHelpers
     def build_app(options = {})
       FileUtils.rm_rf(app_path)
       FileUtils.cp_r(tmp_path('app_template'), app_path)
+      FileUtils.ln_s(RAILS_FRAMEWORK_ROOT, app_path('vendor/rails'))
 
       # Delete the initializers unless requested
       unless options[:initializers]
@@ -114,13 +114,10 @@ module TestHelpers
     end
 
     def boot_rails
-      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
+      root = File.expand_path('../../../..', __FILE__)
+      begin
+        require "#{root}/vendor/gems/environment"
+      rescue LoadError
         %w(
           actionmailer/lib
           actionpack/lib
@@ -131,8 +128,7 @@ module TestHelpers
           railties/lib
           railties
         ).reverse_each do |path|
-          path = File.expand_path("../../../../#{path}", __FILE__)
-          $:.unshift(path)
+          $:.unshift "#{root}/#{path}"
         end
       end
     end
@@ -155,5 +151,6 @@ Module.new do
   end
 
   FileUtils.mkdir(tmp_path)
-  `#{Gem.ruby} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails #{tmp_path('app_template')}`
+  root = File.expand_path('../../../..', __FILE__)
+  `#{Gem.ruby} -r #{root}/vendor/gems/environment #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails #{tmp_path('app_template')}`
 end