mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fix bug where ActiveResource::HttpMock would overwrite Accept/Content-Type header to application/xml [#4939 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
This commit is contained in:
parent
6788db824a
commit
176c386409
2 changed files with 85 additions and 2 deletions
|
@ -148,16 +148,28 @@ module ActiveResource
|
||||||
attr_accessor :path, :method, :body, :headers
|
attr_accessor :path, :method, :body, :headers
|
||||||
|
|
||||||
def initialize(method, path, body = nil, headers = {})
|
def initialize(method, path, body = nil, headers = {})
|
||||||
@method, @path, @body, @headers = method, path, body, headers.merge(ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[method] => 'application/xml')
|
@method, @path, @body, @headers = method, path, body, headers
|
||||||
end
|
end
|
||||||
|
|
||||||
def ==(req)
|
def ==(req)
|
||||||
path == req.path && method == req.method && headers == req.headers
|
path == req.path && method == req.method && headers_match?(req)
|
||||||
end
|
end
|
||||||
|
|
||||||
def to_s
|
def to_s
|
||||||
"<#{method.to_s.upcase}: #{path} [#{headers}] (#{body})>"
|
"<#{method.to_s.upcase}: #{path} [#{headers}] (#{body})>"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def headers_match?(req)
|
||||||
|
# Ignore format header on equality if it's not defined
|
||||||
|
format_header = ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[method]
|
||||||
|
if headers[format_header].present? || req.headers[format_header].blank?
|
||||||
|
headers == req.headers
|
||||||
|
else
|
||||||
|
headers.dup.merge(format_header => req.headers[format_header]) == req.headers
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class Response
|
class Response
|
||||||
|
|
71
activeresource/test/cases/http_mock_test.rb
Normal file
71
activeresource/test/cases/http_mock_test.rb
Normal file
|
@ -0,0 +1,71 @@
|
||||||
|
require 'abstract_unit'
|
||||||
|
|
||||||
|
class HttpMockTest < ActiveSupport::TestCase
|
||||||
|
setup do
|
||||||
|
@http = ActiveResource::HttpMock.new("http://example.com")
|
||||||
|
end
|
||||||
|
|
||||||
|
FORMAT_HEADER = ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES
|
||||||
|
|
||||||
|
[:post, :put, :get, :delete, :head].each do |method|
|
||||||
|
test "responds to simple #{method} request" do
|
||||||
|
ActiveResource::HttpMock.respond_to do |mock|
|
||||||
|
mock.send(method, "/people/1", {FORMAT_HEADER[method] => "application/xml"}, "Response")
|
||||||
|
end
|
||||||
|
|
||||||
|
assert_equal "Response", request(method, "/people/1", FORMAT_HEADER[method] => "application/xml").body
|
||||||
|
end
|
||||||
|
|
||||||
|
test "adds format header by default to #{method} request" do
|
||||||
|
ActiveResource::HttpMock.respond_to do |mock|
|
||||||
|
mock.send(method, "/people/1", {}, "Response")
|
||||||
|
end
|
||||||
|
|
||||||
|
assert_equal "Response", request(method, "/people/1", FORMAT_HEADER[method] => "application/xml").body
|
||||||
|
end
|
||||||
|
|
||||||
|
test "respond only when headers match header by default to #{method} request" do
|
||||||
|
ActiveResource::HttpMock.respond_to do |mock|
|
||||||
|
mock.send(method, "/people/1", {"X-Header" => "X"}, "Response")
|
||||||
|
end
|
||||||
|
|
||||||
|
assert_equal "Response", request(method, "/people/1", "X-Header" => "X").body
|
||||||
|
assert_raise(ActiveResource::InvalidRequestError) { request(method, "/people/1") }
|
||||||
|
end
|
||||||
|
|
||||||
|
test "does not overwrite format header to #{method} request" do
|
||||||
|
ActiveResource::HttpMock.respond_to do |mock|
|
||||||
|
mock.send(method, "/people/1", {FORMAT_HEADER[method] => "application/json"}, "Response")
|
||||||
|
end
|
||||||
|
|
||||||
|
assert_equal "Response", request(method, "/people/1", FORMAT_HEADER[method] => "application/json").body
|
||||||
|
end
|
||||||
|
|
||||||
|
test "ignores format header when there is only one response to same url in a #{method} request" do
|
||||||
|
ActiveResource::HttpMock.respond_to do |mock|
|
||||||
|
mock.send(method, "/people/1", {}, "Response")
|
||||||
|
end
|
||||||
|
|
||||||
|
assert_equal "Response", request(method, "/people/1", FORMAT_HEADER[method] => "application/json").body
|
||||||
|
assert_equal "Response", request(method, "/people/1", FORMAT_HEADER[method] => "application/xml").body
|
||||||
|
end
|
||||||
|
|
||||||
|
test "responds correctly when format header is given to #{method} request" do
|
||||||
|
ActiveResource::HttpMock.respond_to do |mock|
|
||||||
|
mock.send(method, "/people/1", {FORMAT_HEADER[method] => "application/xml"}, "XML")
|
||||||
|
mock.send(method, "/people/1", {FORMAT_HEADER[method] => "application/json"}, "Json")
|
||||||
|
end
|
||||||
|
|
||||||
|
assert_equal "XML", request(method, "/people/1", FORMAT_HEADER[method] => "application/xml").body
|
||||||
|
assert_equal "Json", request(method, "/people/1", FORMAT_HEADER[method] => "application/json").body
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def request(method, path, headers = {}, body = nil)
|
||||||
|
if [:put, :post].include? method
|
||||||
|
@http.send(method, path, body, headers)
|
||||||
|
else
|
||||||
|
@http.send(method, path, headers)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in a new issue