Refactor Responder to only calculate available mime types. Those are sent to the controller that knows what to do with it (render a block or call default render).

Signed-off-by: Yehuda Katz <wycats@gmail.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 93ca34c41c..bee327998b 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -436,9 +436,9 @@ class MimeControllerTest < ActionController::TestCase
   def test_render_action_for_html
     @controller.instance_eval do
       def render(*args)
-        unless args.empty?
-          @action = args.first[:action] || action_name
-        end
+        @action = args.first[:action] unless args.empty?
+        @action ||= action_name
+
         response.body = "#{@action} - #{@template.formats}"
       end
     end