Remove all calls to Rails::Initializer from boot.rb

This is starting a refactor of the rails initialization process. The boot.rb file will not remain the same.
	

3 files changed, 25 insertions, 20 deletions

diff --git a/railties/test/boot_test.rb b/railties/test/boot_test.rb
index f8f6d8f225..1280d27ffe 100644
--- a/railties/test/boot_test.rb
+++ b/railties/test/boot_test.rb
@@ -48,13 +48,6 @@ class BootTest < Test::Unit::TestCase
     Rails::GemBoot.any_instance.expects(:run).returns('result')
     assert_equal 'result', Rails.boot!
   end
-
-  def test_run_loads_initializer_and_sets_load_path
-    boot = Rails::Boot.new
-    boot.expects(:load_initializer)
-    Rails::Initializer.expects(:run).with(:set_load_path)
-    boot.run
-  end
 end
 
 class VendorBootTest < Test::Unit::TestCase
@@ -63,7 +56,7 @@ class VendorBootTest < Test::Unit::TestCase
   def test_load_initializer_requires_from_vendor_rails
     boot = VendorBoot.new
     boot.expects(:require).with("rails")
-    Rails::Initializer.expects(:run).with(:install_gem_spec_stubs)
+    boot.expects(:install_gem_spec_stubs)
     Rails::GemDependency.expects(:add_frozen_gem_path)
     boot.load_initializer
   end
diff --git a/railties/test/initializer/boot_test.rb b/railties/test/initializer/boot_test.rb
new file mode 100644
index 0000000000..5ee3c45b21
--- /dev/null
+++ b/railties/test/initializer/boot_test.rb
@@ -0,0 +1,16 @@
+require "isolation/abstract_unit"
+
+module BootTests
+  class GemBooting < Test::Unit::TestCase
+    include ActiveSupport::Testing::Isolation
+
+    def setup
+      # build_app
+      # boot_rails
+    end
+
+    test "booting rails sets the load paths correctly" do
+      # This test is pending reworking the boot process
+    end
+  end
+end
\ No newline at end of file
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index bc1b43acaa..869e8429cf 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -97,20 +97,16 @@ module TestHelpers
     end
 
     def boot_rails
-      # return if defined?(RAILS)
-      # TODO: Get this working with boot.rb
-      $:.unshift "#{RAILS_FRAMEWORK_ROOT}/railties/lib"
-      Object.class_eval <<-RUBY
-        RAILS_ROOT = "#{app_path}"
-        module ::Rails
-          def self.vendor_rails?
-            true
-          end
+      # 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
+          booter.run
         end
       RUBY
-      require "rails"
-      Rails::Initializer.run(:install_gem_spec_stubs)
-      Rails::GemDependency.add_frozen_gem_path
     end
   end
 end