diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-11 01:23:29 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-11 01:23:29 +0000 |
| commit | 1c16649b4895012eac76f3a7f22f3382b0034a97 (patch) | |
| tree | 6674f67a9ea89529b02164a08e076e51b82a1bf1 /actionpack/test/controller/new_render_test.rb | |
| parent | 8152695b809aa47177ab5d5db43d93d8f55ee52a (diff) | |
| download | rails-1c16649b4895012eac76f3a7f22f3382b0034a97.tar.gz rails-1c16649b4895012eac76f3a7f22f3382b0034a97.tar.bz2 rails-1c16649b4895012eac76f3a7f22f3382b0034a97.zip | |
Added better support for using the same actions to output for different sources depending on the Accept header [DHH] Added Base#render(:xml => xml) that works just like Base#render(:text => text), but sets the content-type to text/xml and the charset to UTF-8 [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3838 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/new_render_test.rb')
| -rw-r--r-- | actionpack/test/controller/new_render_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb index 2701b6a462..8359e190a0 100644 --- a/actionpack/test/controller/new_render_test.rb +++ b/actionpack/test/controller/new_render_test.rb @@ -544,14 +544,14 @@ EOS def test_update_page get :update_page assert_template nil - assert_equal 'text/javascript', @response.headers['Content-Type'] + assert_equal 'text/javascript; charset=UTF-8', @response.headers['Content-Type'] assert_equal 2, @response.body.split($/).length end def test_update_page_with_instance_variables get :update_page_with_instance_variables assert_template nil - assert_equal 'text/javascript', @response.headers['Content-Type'] + assert_equal 'text/javascript; charset=UTF-8', @response.headers['Content-Type'] assert_match /balance/, @response.body assert_match /\$37/, @response.body end |