diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-06-07 18:30:18 -0400 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-06-07 18:30:18 -0400 |
| commit | a16fd961310d4df5bd20df5fe64b2f764d8aa471 (patch) | |
| tree | 0e54acc2ae35e985cd8c8175f051e281acbd4595 /actionpack/test/controller/new_base/render_rjs_test.rb | |
| parent | 735027e58d3000bd5d939e39deabfecef83ee20c (diff) | |
| parent | d6953cbfd3b6e06eceba715c60e288b6d7db0d49 (diff) | |
| download | rails-a16fd961310d4df5bd20df5fe64b2f764d8aa471.tar.gz rails-a16fd961310d4df5bd20df5fe64b2f764d8aa471.tar.bz2 rails-a16fd961310d4df5bd20df5fe64b2f764d8aa471.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/test/controller/new_base/render_rjs_test.rb')
| -rw-r--r-- | actionpack/test/controller/new_base/render_rjs_test.rb | 3 |
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') %>", |