diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-19 18:37:19 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-19 18:37:19 -0700 |
| commit | acb1624f2732a4fcfa006c3e8694020635baba6b (patch) | |
| tree | a1bbf079477b906c8fa31dfbfb94b7647544ccb7 /actionpack/test/controller | |
| parent | 7ab30599a6c0ca44d68ca10383b07ba4a8bd75b4 (diff) | |
| parent | 1f9d234a6b567e68d97e71da6f19bd126e7f7058 (diff) | |
| download | rails-acb1624f2732a4fcfa006c3e8694020635baba6b.tar.gz rails-acb1624f2732a4fcfa006c3e8694020635baba6b.tar.bz2 rails-acb1624f2732a4fcfa006c3e8694020635baba6b.zip | |
Merge commit 'josevalim/fixes'
Conflicts:
railties/test/generators/app_generator_test.rb
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/mime_responds_test.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb index a79648396c..b070f925d4 100644 --- a/actionpack/test/controller/mime_responds_test.rb +++ b/actionpack/test/controller/mime_responds_test.rb @@ -760,6 +760,14 @@ class RespondWithControllerTest < ActionController::TestCase assert_equal "Resource name is david", @response.body end + def test_using_resource_with_responder + RespondWithController.responder = proc { |c, r, o| c.render :text => "Resource name is #{r.first.name}" } + get :using_resource + assert_equal "Resource name is david", @response.body + ensure + RespondWithController.responder = ActionController::Responder + end + def test_not_acceptable @request.accept = "application/xml" get :using_defaults |