Add some basic render_test to AbstractController.

3 files changed, 10 insertions, 8 deletions

diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index f4f1d41360..8293e79b0a 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -195,7 +195,7 @@ module AbstractController
     def _determine_template(options)
       super
 
-      return if (options.key?(:text) || options.key?(:inline) || options.key?(:partial)) && !options.key?(:layout)
+      return unless (options.keys & [:text, :inline, :partial]).empty? || options.key?(:layout)
       layout = options.key?(:layout) ? options[:layout] : :default
       options[:_layout] = _layout_for_option(layout, options[:_template].details)
     end
diff --git a/actionpack/lib/abstract_controller/rendering_controller.rb b/actionpack/lib/abstract_controller/rendering_controller.rb
index 07deda77a2..0aae2b18e9 100644
--- a/actionpack/lib/abstract_controller/rendering_controller.rb
+++ b/actionpack/lib/abstract_controller/rendering_controller.rb
@@ -118,9 +118,6 @@ module AbstractController
         options[:_template_name] = options[:template]
       elsif options.key?(:file)
         options[:_template_name] = options[:file]
-      elsif !options.key?(:partial)
-        options[:_template_name] ||= options[:action]
-        options[:_prefix] = _prefix
       end
 
       name = (options[:_template_name] || action_name).to_s
@@ -138,10 +135,6 @@ module AbstractController
       view_paths.exists?(name, details, options[:_prefix], options[:_partial])
     end
 
-    def _prefix
-      self.class.name.underscore
-    end
-
     def with_template_cache(name)
       yield
     end
diff --git a/actionpack/lib/action_controller/metal/rendering_controller.rb b/actionpack/lib/action_controller/metal/rendering_controller.rb
index 9e8bc82385..c5ade26702 100644
--- a/actionpack/lib/action_controller/metal/rendering_controller.rb
+++ b/actionpack/lib/action_controller/metal/rendering_controller.rb
@@ -65,6 +65,15 @@ module ActionController
         controller_path
       end
 
+      def _determine_template(options)
+        if (options.keys & [:partial, :file, :template, :text, :inline]).empty?
+          options[:_template_name] ||= options[:action]
+          options[:_prefix] = _prefix
+        end
+
+        super
+      end
+
       def format_for_text
         formats.first
       end