aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/new_base
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-06-07 22:22:54 +0200
committerJosé Valim <jose.valim@gmail.com>2010-06-07 22:22:54 +0200
commit981f81275be8e0f38a35c397b41a209b0e14973c (patch)
tree97c8d6fb0c04394fa36f181b97df30e078789122 /actionpack/test/controller/new_base
parent50031bf932bca7c2e0dc96e2a13d4e4db9af6a50 (diff)
downloadrails-981f81275be8e0f38a35c397b41a209b0e14973c.tar.gz
rails-981f81275be8e0f38a35c397b41a209b0e14973c.tar.bz2
rails-981f81275be8e0f38a35c397b41a209b0e14973c.zip
Fix case when rendering a partial inside RJS with inherited layout [#4786 state:resolved]
Diffstat (limited to 'actionpack/test/controller/new_base')
-rw-r--r--actionpack/test/controller/new_base/render_rjs_test.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/test/controller/new_base/render_rjs_test.rb b/actionpack/test/controller/new_base/render_rjs_test.rb
index b602b9f8e9..74bf865b54 100644
--- a/actionpack/test/controller/new_base/render_rjs_test.rb
+++ b/actionpack/test/controller/new_base/render_rjs_test.rb
@@ -2,7 +2,10 @@ require 'abstract_unit'
module RenderRjs
class BasicController < ActionController::Base
+ layout "application", :only => :index_respond_to
+
self.view_paths = [ActionView::FixtureResolver.new(
+ "layouts/application.html.erb" => "",
"render_rjs/basic/index.js.rjs" => "page[:customer].replace_html render(:partial => 'customer')",
"render_rjs/basic/index_html.js.rjs" => "page[:customer].replace_html :partial => 'customer'",
"render_rjs/basic/index_no_js.js.erb" => "<%= render(:partial => 'developer') %>",