X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/424b6ef1cf760c4a3e27ac1e6f612ae42a9cd493..fef9aceb675c2f8609e7fb3adf348581d87cbb81:/test/integration/compressed_requests_test.rb?ds=sidebyside diff --git a/test/integration/compressed_requests_test.rb b/test/integration/compressed_requests_test.rb index 6ea875a9d..3f6f13cc9 100644 --- a/test/integration/compressed_requests_test.rb +++ b/test/integration/compressed_requests_test.rb @@ -16,7 +16,7 @@ class CompressedRequestsTest < ActionDispatch::IntegrationTest # simple diff to change a node, way and relation by removing # their tags - diff = < @@ -32,15 +32,14 @@ class CompressedRequestsTest < ActionDispatch::IntegrationTest -CHANGESET + CHANGESET # upload it post "/api/0.6/changeset/#{changeset.id}/upload", :params => diff, - :headers => { - "HTTP_AUTHORIZATION" => format("Basic %{auth}", :auth => Base64.encode64("#{user.display_name}:test")), + :headers => bearer_authorization_header(user).merge( "HTTP_CONTENT_TYPE" => "application/xml" - } + ) assert_response :success, "can't upload an uncompressed diff to changeset: #{@response.body}" @@ -65,7 +64,7 @@ CHANGESET # simple diff to change a node, way and relation by removing # their tags - diff = < @@ -81,16 +80,15 @@ CHANGESET -CHANGESET + CHANGESET # upload it post "/api/0.6/changeset/#{changeset.id}/upload", :params => gzip_content(diff), - :headers => { - "HTTP_AUTHORIZATION" => format("Basic %{auth}", :auth => Base64.encode64("#{user.display_name}:test")), + :headers => bearer_authorization_header(user).merge( "HTTP_CONTENT_ENCODING" => "gzip", "HTTP_CONTENT_TYPE" => "application/xml" - } + ) assert_response :success, "can't upload a gzip compressed diff to changeset: #{@response.body}" @@ -115,7 +113,7 @@ CHANGESET # simple diff to change a node, way and relation by removing # their tags - diff = < @@ -131,16 +129,15 @@ CHANGESET -CHANGESET + CHANGESET # upload it post "/api/0.6/changeset/#{changeset.id}/upload", :params => deflate_content(diff), - :headers => { - "HTTP_AUTHORIZATION" => format("Basic %{auth}", :auth => Base64.encode64("#{user.display_name}:test")), + :headers => bearer_authorization_header(user).merge( "HTTP_CONTENT_ENCODING" => "deflate", "HTTP_CONTENT_TYPE" => "application/xml" - } + ) assert_response :success, "can't upload a deflate compressed diff to changeset: #{@response.body}" @@ -157,11 +154,10 @@ CHANGESET # upload it post "/api/0.6/changeset/#{changeset.id}/upload", :params => "", - :headers => { - "HTTP_AUTHORIZATION" => format("Basic %{auth}", :auth => Base64.encode64("#{user.display_name}:test")), + :headers => bearer_authorization_header(user).merge( "HTTP_CONTENT_ENCODING" => "unknown", "HTTP_CONTENT_TYPE" => "application/xml" - } + ) assert_response :unsupported_media_type end