diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 61f1c715c872782b46ce9bc0bd9018c829b12e3d..698189bd469a1f6869a84a31c45107696b53e3ca 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -41,7 +41,7 @@ class Base < Metal module ImplicitRender def send_action(*) ret = super - default_render unless performed? + default_render unless response_body ret end diff --git a/actionpack/test/template/body_parts_test.rb b/actionpack/test/template/body_parts_test.rb index bac67c1a7d3fc8407e8543b16e569c31ff493dd8..defe85107e7891a00b719d6153c80e7b285781e5 100644 --- a/actionpack/test/template/body_parts_test.rb +++ b/actionpack/test/template/body_parts_test.rb @@ -4,7 +4,7 @@ class BodyPartsTest < ActionController::TestCase RENDERINGS = [Object.new, Object.new, Object.new] class TestController < ActionController::Base - def performed?() true end + def response_body() "" end def index RENDERINGS.each do |rendering|