From 992c2db76cd6cd6aa9a6ba3711a6ea1ad8910062 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Thu, 8 Oct 2009 18:12:28 -0700 Subject: Finish porting over the initializers to the app object and fix all the tests --- railties/test/plugin_loader_test.rb | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'railties/test/plugin_loader_test.rb') diff --git a/railties/test/plugin_loader_test.rb b/railties/test/plugin_loader_test.rb index 99301347b6..0b43c49bb2 100644 --- a/railties/test/plugin_loader_test.rb +++ b/railties/test/plugin_loader_test.rb @@ -5,10 +5,13 @@ $:.unshift File.dirname(__FILE__) + "/../../actionmailer/lib" require 'action_controller' require 'action_mailer' -# Mocks out the configuration -module Rails - def self.configuration - Rails::Configuration.new +# TODO: Rewrite all these tests +class FakeInitializerSlashApplication + attr_reader :config + alias configuration config + + def initialize + @config = Rails::Configuration.new end end @@ -18,10 +21,10 @@ class TestPluginLoader < Test::Unit::TestCase def setup reset_load_path! - @configuration = Rails::Configuration.new + @initializer = FakeInitializerSlashApplication.new + @configuration = @initializer.config + Rails.application = @initializer @configuration.plugin_paths << plugin_fixture_root_path - @initializer = Rails::Initializer.default - @initializer.config = @configuration @valid_plugin_path = plugin_fixture_path('default/stubby') @empty_plugin_path = plugin_fixture_path('default/empty') -- cgit v1.2.3