diff options
author | Prem Sichanugrist <s@sikachu.com> | 2012-02-03 11:47:47 -0500 |
---|---|---|
committer | Prem Sichanugrist <s@sikachu.com> | 2012-02-03 14:26:34 -0500 |
commit | 567ac65b423c30c24aa6c0c0522858e3c240eb26 (patch) | |
tree | 4b94f14e9987ba0174a24054f4ff67dd9151561d /actionpack/test/controller/mime_responds_test.rb | |
parent | 4ca633e4663b62653ee017e5fd02dd86f06d1200 (diff) | |
download | rails-567ac65b423c30c24aa6c0c0522858e3c240eb26.tar.gz rails-567ac65b423c30c24aa6c0c0522858e3c240eb26.tar.bz2 rails-567ac65b423c30c24aa6c0c0522858e3c240eb26.zip |
Fix override API response bug in respond_with
Default responder was only using the given respond block when user
requested for HTML format, or JSON/XML format with valid resource. This
fix the responder so that it will use the given block regardless of the
validity of the resource. Note that in this case you'll have to check
for object's validity by yourself in the controller.
Fixes #4796
Diffstat (limited to 'actionpack/test/controller/mime_responds_test.rb')
-rw-r--r-- | actionpack/test/controller/mime_responds_test.rb | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb index 76a8c89e60..7c4fb59c15 100644 --- a/actionpack/test/controller/mime_responds_test.rb +++ b/actionpack/test/controller/mime_responds_test.rb @@ -597,6 +597,19 @@ class RenderJsonRespondWithController < RespondWithController format.json { render :json => RenderJsonTestException.new('boom') } end end + + def create + resource = ValidatedCustomer.new(params[:name], 1) + respond_with(resource) do |format| + format.json do + if resource.errors.empty? + render :json => { :valid => true } + else + render :json => { :valid => false } + end + end + end + end end class EmptyRespondWithController < ActionController::Base @@ -968,6 +981,18 @@ class RespondWithControllerTest < ActionController::TestCase assert_match(/"error":"RenderJsonTestException"/, @response.body) end + def test_api_response_with_valid_resource_respect_override_block + @controller = RenderJsonRespondWithController.new + post :create, :name => "sikachu", :format => :json + assert_equal '{"valid":true}', @response.body + end + + def test_api_response_with_invalid_resource_respect_override_block + @controller = RenderJsonRespondWithController.new + post :create, :name => "david", :format => :json + assert_equal '{"valid":false}', @response.body + end + def test_no_double_render_is_raised @request.accept = "text/html" assert_raise ActionView::MissingTemplate do |