aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generator_lookup_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-07-01 12:55:19 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-07-01 12:55:19 -0700
commite7312105c73c20b286ebf17b16808001803e2c61 (patch)
tree3e23282353ffa6e6fc1ca53afc2e0b35f51a6274 /railties/test/generator_lookup_test.rb
parent54f48517708d16e92bfc6bab6255f6299ca80af0 (diff)
parent1026d7706ffb467eac3cee8142d964bc2d30baa8 (diff)
downloadrails-e7312105c73c20b286ebf17b16808001803e2c61.tar.gz
rails-e7312105c73c20b286ebf17b16808001803e2c61.tar.bz2
rails-e7312105c73c20b286ebf17b16808001803e2c61.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/test/generator_lookup_test.rb')
-rw-r--r--railties/test/generator_lookup_test.rb8
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