Merge remote-tracking branch 'upstream/pull/5153'

[rails.git] / test / integration / compressed_requests_test.rb

diff --git a/test/integration/compressed_requests_test.rb b/test/integration/compressed_requests_test.rb
index 55db373d00963dfb4655cd636860f8d955978076..3f6f13cc9ae39a38058a4dd27c15363e8cb3f92b 100644 (file)
--- a/test/integration/compressed_requests_test.rb
+++ b/test/integration/compressed_requests_test.rb
@@ -37,10 +37,9 @@ class CompressedRequestsTest < ActionDispatch::IntegrationTest
     # upload it
     post "/api/0.6/changeset/#{changeset.id}/upload",
          :params => diff,
     # 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"
            "HTTP_CONTENT_TYPE" => "application/xml"

-         }
+         )

     assert_response :success,
                     "can't upload an uncompressed diff to changeset: #{@response.body}"
 
     assert_response :success,
                     "can't upload an uncompressed diff to changeset: #{@response.body}"
 


@@ -86,11 +85,10 @@ class CompressedRequestsTest < ActionDispatch::IntegrationTest
     # upload it
     post "/api/0.6/changeset/#{changeset.id}/upload",
          :params => gzip_content(diff),
     # 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"
            "HTTP_CONTENT_ENCODING" => "gzip",
            "HTTP_CONTENT_TYPE" => "application/xml"

-         }
+         )

     assert_response :success,
                     "can't upload a gzip compressed diff to changeset: #{@response.body}"
 
     assert_response :success,
                     "can't upload a gzip compressed diff to changeset: #{@response.body}"
 


@@ -136,11 +134,10 @@ class CompressedRequestsTest < ActionDispatch::IntegrationTest
     # upload it
     post "/api/0.6/changeset/#{changeset.id}/upload",
          :params => deflate_content(diff),
     # 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"
            "HTTP_CONTENT_ENCODING" => "deflate",
            "HTTP_CONTENT_TYPE" => "application/xml"

-         }
+         )

     assert_response :success,
                     "can't upload a deflate compressed diff to changeset: #{@response.body}"
 
     assert_response :success,
                     "can't upload a deflate compressed diff to changeset: #{@response.body}"
 


@@ -157,11 +154,10 @@ class CompressedRequestsTest < ActionDispatch::IntegrationTest
     # upload it
     post "/api/0.6/changeset/#{changeset.id}/upload",
          :params => "",
     # 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"
            "HTTP_CONTENT_ENCODING" => "unknown",
            "HTTP_CONTENT_TYPE" => "application/xml"

-         }
+         )

     assert_response :unsupported_media_type
   end
 
     assert_response :unsupported_media_type
   end