aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-21 16:35:40 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-21 16:35:40 -0700
commit6923b392b740f2346326634532b40cf24a0f26ef (patch)
tree55a6486563e8d9a408c1dd8c7628e85c88af570e /actionpack/test/controller
parente773d0e68ac64bd26d86860a9a8e0048e2b6bb48 (diff)
downloadrails-6923b392b740f2346326634532b40cf24a0f26ef.tar.gz
rails-6923b392b740f2346326634532b40cf24a0f26ef.tar.bz2
rails-6923b392b740f2346326634532b40cf24a0f26ef.zip
Added the :rjs render option
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/render_other_test.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/test/controller/render_other_test.rb b/actionpack/test/controller/render_other_test.rb
index ddbdd2d213..3c52b7036d 100644
--- a/actionpack/test/controller/render_other_test.rb
+++ b/actionpack/test/controller/render_other_test.rb
@@ -103,6 +103,14 @@ class TestController < ActionController::Base
end
private
+ def default_render
+ if @alternate_default_render
+ @alternate_default_render.call
+ else
+ super
+ end
+ end
+
def determine_layout
case action_name
when "render_js_with_explicit_template",