From e1fdc8bba3e427435927685e77937b3a478aa416 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Fri, 16 Oct 2009 18:10:12 -0700
Subject: Remove config.gem in favor of using the bundler. This makes
 config/boot.rb obsolete.

	The bundler library is at: http://github.com/wycats/bundler/ and is a rubygem.
---
 railties/test/isolation/abstract_unit.rb | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'railties/test/isolation')

diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 750ec5d319..aafc9f68bb 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -114,16 +114,19 @@ module TestHelpers
     end
 
     def boot_rails
-      # TMP mega hax to prevent boot.rb from actually booting
-      Object.class_eval <<-RUBY, __FILE__, __LINE__+1
-        module Rails
-          Initializer = 'lol'
-          require "#{app_path}/config/boot"
-          remove_const(:Initializer)
-          booter = VendorBoot.new('#{app_path}')
-          booter.run
-        end
-      RUBY
+      %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
-- 
cgit v1.2.3