diff options
| -rw-r--r-- | railties/lib/initializer.rb | 10 | ||||
| -rw-r--r-- | railties/test/plugin_loader_test.rb | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 3adc3b9ce5..37bec7a272 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -1,4 +1,8 @@ require "pathname" +require 'railties_path' +require 'rails/version' +require 'rails/gem_dependency' +require 'rails/rack' module Rails class Configuration @@ -12,9 +16,9 @@ module Rails @framework_paths = [] @load_once_paths = [] @after_initialize_blocks = [] - @frameworks = [] @plugin_paths = [] @loaded_plugins = [] + @frameworks = default_frameworks @plugin_loader = default_plugin_loader @plugin_locators = default_plugin_locators @gems = default_gems @@ -46,6 +50,10 @@ module Rails ActionController::Dispatcher.middleware end + def default_frameworks + [ :active_record, :action_controller, :action_view, :action_mailer, :active_resource ] + end + def default_plugin_loader require 'rails/plugin/loader' Plugin::Loader diff --git a/railties/test/plugin_loader_test.rb b/railties/test/plugin_loader_test.rb index c647d7b478..873e000222 100644 --- a/railties/test/plugin_loader_test.rb +++ b/railties/test/plugin_loader_test.rb @@ -20,7 +20,8 @@ class TestPluginLoader < Test::Unit::TestCase @configuration = Rails::Configuration.new @configuration.plugin_paths << plugin_fixture_root_path - @initializer = Rails::Initializer.new(@configuration) + @initializer = Rails::Initializer.default + @initializer.config = @configuration @valid_plugin_path = plugin_fixture_path('default/stubby') @empty_plugin_path = plugin_fixture_path('default/empty') |