kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Merge pull request #15182 from zuhao/refactor_actionpack_respond_with_test_2 

Un-define :to_json for Customer class after stubbing.
This commit is contained in:
Yves Senn 2014-05-20 08:58:17 +02:00
parent 00d1b132c0 f0440205f6
commit 7591e8c1a7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
actionpack/test/controller/mime/respond_with_test.rb
View File

@ -2,6 +2,10 @@ require 'abstract_unit'
require 'controller/fake_models' require 'controller/fake_models'
class RespondWithController < ActionController::Base class RespondWithController < ActionController::Base
class CustomerWithJson < Customer
def to_json; super; end
end
respond_to :html, :json, :touch respond_to :html, :json, :touch
respond_to :xml, :except => :using_resource_with_block respond_to :xml, :except => :using_resource_with_block
respond_to :js, :only => [ :using_resource_with_block, :using_resource, 'using_hash_resource' ] respond_to :js, :only => [ :using_resource_with_block, :using_resource, 'using_hash_resource' ]
@ -38,6 +42,10 @@ class RespondWithController < ActionController::Base
respond_with(resource, :location => "http://test.host/", :status => :created) respond_with(resource, :location => "http://test.host/", :status => :created)
end end
def using_resource_with_json
respond_with(CustomerWithJson.new("david", request.delete? ? nil : 13))
end
def using_invalid_resource_with_template def using_invalid_resource_with_template
respond_with(resource) respond_with(resource)
end end
@ -380,9 +388,8 @@ class RespondWithControllerTest < ActionController::TestCase
end end
def test_using_resource_for_put_with_json_yields_no_content_on_success def test_using_resource_for_put_with_json_yields_no_content_on_success
Customer.any_instance.stubs(:to_json).returns('{"name": "David"}')
@request.accept = "application/json" @request.accept = "application/json"
put :using_resource put :using_resource_with_json
assert_equal "application/json", @response.content_type assert_equal "application/json", @response.content_type
assert_equal 204, @response.status assert_equal 204, @response.status
assert_equal "", @response.body assert_equal "", @response.body
@ -431,10 +438,9 @@ class RespondWithControllerTest < ActionController::TestCase
end end
def test_using_resource_for_delete_with_json_yields_no_content_on_success def test_using_resource_for_delete_with_json_yields_no_content_on_success
Customer.any_instance.stubs(:to_json).returns('{"name": "David"}')
Customer.any_instance.stubs(:destroyed?).returns(true) Customer.any_instance.stubs(:destroyed?).returns(true)
@request.accept = "application/json" @request.accept = "application/json"
delete :using_resource delete :using_resource_with_json
assert_equal "application/json", @response.content_type assert_equal "application/json", @response.content_type
assert_equal 204, @response.status assert_equal 204, @response.status
assert_equal "", @response.body assert_equal "", @response.body