Check for ActionMailer and ActionController before attempting to eager load their view paths

Signed-off-by: Joshua Peek <josh@joshpeek.com>

2 files changed, 22 insertions, 3 deletions

diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 44863ab026..32411e8928 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -341,8 +341,8 @@ 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
-      ActionController::Base.view_paths.load
+      ActionMailer::Base.template_root.load if configuration.frameworks.include?(:action_mailer)
+      ActionController::Base.view_paths.load if configuration.frameworks.include?(:action_controller)
     end
 
     # Eager load application classes
diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb
index dee7abe05f..07303a510e 100644
--- a/railties/test/initializer_test.rb
+++ b/railties/test/initializer_test.rb
@@ -136,8 +136,27 @@ uses_mocha 'framework paths' do
       end
     end
 
-    protected
+    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
 
+    def test_action_controller_load_paths_set_only_if_action_controller_in_use
+      @config.frameworks = []
+      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)
         assert @config.framework_paths.include?(path),
           "<#{path.inspect}> not found among <#{@config.framework_paths.inspect}>"