make sure to merge the original responder options into the given options to preserve location

This commit is contained in:
Tony Pitale
2013-03-15 03:54:35 -04:00
parent 6408b73e3c
commit d3c6596990
2 changed files with 10 additions and 1 deletions

View File

@@ -143,6 +143,10 @@ class ResponderTest < ActionController::TestCase
respond_with JsonSerializable.new, :options => true
end
def render_json_with_serializer_but_without_location
respond_with JsonSerializable.new, :location => nil
end
def render_json_with_serializer_and_scope_option
@current_user = Struct.new(:as_json).new(:current_user => true)
scope = Struct.new(:as_json).new(:current_user => false)
@@ -301,6 +305,11 @@ class ResponderTest < ActionController::TestCase
assert_match '"options":true', @response.body
end
def test_render_json_with_serializer_but_without_location
post :render_json_with_serializer_but_without_location
assert_equal nil, @response.location
end
def test_render_json_with_serializer_and_scope_option
get :render_json_with_serializer_and_scope_option
assert_match '"scope":{"current_user":false}', @response.body