diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-05-30 07:51:02 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-05-30 07:51:02 +0000 |
| commit | f57ee365e154ce6d15cd168112d94a9a8ff27094 (patch) | |
| tree | 54948d6d27c59b5b85734eed660a78cf4ea772cb /actionpack/test/controller/send_file_test.rb | |
| parent | 613260606b006427e9ca8871ef0f2e294940c03d (diff) | |
| download | rails-f57ee365e154ce6d15cd168112d94a9a8ff27094.tar.gz rails-f57ee365e154ce6d15cd168112d94a9a8ff27094.tar.bz2 rails-f57ee365e154ce6d15cd168112d94a9a8ff27094.zip | |
render(:text), render(:partial), and render(:nothing) always default to :layout => false. This also fixes send_file, which was applying a layout if one existed for the current action.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1369 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/send_file_test.rb')
| -rw-r--r-- | actionpack/test/controller/send_file_test.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb index d18d15b18a..b7674bda60 100644 --- a/actionpack/test/controller/send_file_test.rb +++ b/actionpack/test/controller/send_file_test.rb @@ -10,6 +10,7 @@ end class SendFileController < ActionController::Base include TestFileUtils + layout "layouts/standard" # to make sure layouts don't interfere attr_writer :options def options() @options ||= {} end @@ -20,6 +21,7 @@ class SendFileController < ActionController::Base def rescue_action(e) raise end end +SendFileController.template_root = File.dirname(__FILE__) + "/../fixtures/" class SendFileTest < Test::Unit::TestCase include TestFileUtils |