diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 44863ab..48d20b3 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -341,7 +341,7 @@ Run `rake gems:install` to install the missing gems. def load_view_paths ActionView::PathSet::Path.eager_load_templates! if configuration.cache_classes - ActionMailer::Base.template_root.load + ActionMailer::Base.template_root.load if configuration.frameworks.include?(:action_mailer) ActionController::Base.view_paths.load end diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb index dee7abe..3e09fd0 100644 --- a/railties/test/initializer_test.rb +++ b/railties/test/initializer_test.rb @@ -136,6 +136,16 @@ uses_mocha 'framework paths' do end end + def test_action_mailer_load_paths_set_only_if_action_mailer_in_use + @config.frameworks = [:action_controller] + initializer = Rails::Initializer.new @config + initializer.send :require_frameworks + + assert_nothing_raised NameError do + initializer.send :load_view_paths + end + end + protected def assert_framework_path(path)