Merge branch 'master' of git://github.com/rails/rails

1 files changed, 5 insertions, 3 deletions

diff --git a/railties/test/generator_lookup_test.rb b/railties/test/generator_lookup_test.rb
index b650f304ed..b67087e5ea 100644
--- a/railties/test/generator_lookup_test.rb
+++ b/railties/test/generator_lookup_test.rb
@@ -7,9 +7,11 @@ class GeneratorLookupTest < Test::Unit::TestCase
     # We need to add our testing plugin directory to the plugin paths so
     # the locator knows where to look for our plugins
     @configuration.plugin_paths += @fixture_dirs.map{|fd| plugin_fixture_path(fd)}
-    @initializer = Rails::Initializer.new(@configuration)
-    @initializer.add_plugin_load_paths
-    @initializer.load_plugins
+    @initializer = Rails::Initializer.default
+    @initializer.config = @configuration
+    @initializer.run(:add_plugin_load_paths)
+    @initializer.run(:load_plugins)
+    @initializer.run(:set_root_path)
     load 'rails_generator.rb'
     require 'rails_generator/scripts'
   end