X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c18e39cc056b5f689906d3aa9b5227f72b91d552..fc6a4d442c1afb519264dbf15e64a4977a68b840:/test/test_helper.rb diff --git a/test/test_helper.rb b/test/test_helper.rb index 04837f390..9354e6646 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -115,12 +115,6 @@ module ActiveSupport assert_equal a.tags, b.tags, "tags on node #{a.id}" end - ## - # set request headers for HTTP basic authentication - def basic_authorization(user, pass) - @request.env["HTTP_AUTHORIZATION"] = format("Basic %{auth}", :auth => Base64.encode64("#{user}:#{pass}")) - end - ## # return request header for HTTP Basic Authorization def basic_authorization_header(user, pass) @@ -165,17 +159,13 @@ module ActiveSupport end ## - # set request header for HTTP Accept - def http_accept_format(format) - @request.env["HTTP_ACCEPT"] = format + # return request header for HTTP Accept + def accept_format_header(format) + { "Accept" => format } end ## - # set request readers to ask for a particular error format - def error_format(format) - @request.env["HTTP_X_ERROR_FORMAT"] = format - end - + # return request header to ask for a particular error format def error_format_header(f) { "X-Error-Format" => f } end