diff options
| -rw-r--r-- | actionmailer/lib/action_mailer/railtie.rb | 5 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/railtie.rb | 5 | ||||
| -rw-r--r-- | railties/lib/rails/engine.rb | 4 | ||||
| -rw-r--r-- | railties/test/railties/railtie_test.rb | 2 |
4 files changed, 3 insertions, 13 deletions
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb index 779486fc96..c5f18c7911 100644 --- a/actionmailer/lib/action_mailer/railtie.rb +++ b/actionmailer/lib/action_mailer/railtie.rb @@ -16,11 +16,6 @@ module ActionMailer ActionMailer::Base.logger ||= Rails.logger end - initializer "action_mailer.add_view_paths" do |app| - views = app.config.paths.app.views.to_a - ActionMailer::Base.prepend_view_path(views) - end - initializer "action_mailer.set_configs" do |app| app.config.action_mailer.each do |k,v| ActionMailer::Base.send "#{k}=", v diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index a18b63fb13..07c6b8f2b6 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -27,11 +27,6 @@ module ActionController ActionController::Base.cache_store ||= RAILS_CACHE end - initializer "action_controller.add_view_paths" do |app| - views = app.config.paths.app.views.to_a - ActionController::Base.prepend_view_path(views) - end - initializer "action_controller.set_helpers_path" do |app| ActionController::Base.helpers_path = app.config.paths.app.helpers.to_a end diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 07218dcfa8..79183480a3 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -97,8 +97,8 @@ module Rails initializer :add_view_paths do views = paths.app.views.to_a - ActionController::Base.prepend_view_path(views) if defined?(ActionController) - ActionMailer::Base.prepend_view_path(views) if defined?(ActionMailer) + ActionController::Base.prepend_view_path(views) if defined?(ActionController::Base) + ActionMailer::Base.prepend_view_path(views) if defined?(ActionMailer::Base) end initializer :add_metals do |app| diff --git a/railties/test/railties/railtie_test.rb b/railties/test/railties/railtie_test.rb index 9eb4e9993a..9fefb285b4 100644 --- a/railties/test/railties/railtie_test.rb +++ b/railties/test/railties/railtie_test.rb @@ -54,7 +54,7 @@ module RailtiesTest test "railtie can add log subscribers" do begin class Foo < Rails::Railtie ; log_subscriber(Rails::LogSubscriber.new) ; end - assert_kind_of Rails::LogSubscriber, Rails::LogSubscriber.log_subscribers[:foo] + assert_kind_of Rails::LogSubscriber, Rails::LogSubscriber.log_subscribers[0] ensure Rails::LogSubscriber.log_subscribers.clear end |