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

[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 6ea875a9d482b8f911b07497f299b21c166fead8..ecffe3c46781e9edfac50e1208300489986e3e13 100644 (file)
--- 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
 
     # simple diff to change a node, way and relation by removing
     # their tags

-    diff = <<CHANGESET.strip_heredoc
+    diff = <<~CHANGESET

       <osmChange>
        <modify>
         <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
       <osmChange>
        <modify>
         <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>


@@ -32,13 +32,13 @@ class CompressedRequestsTest < ActionDispatch::IntegrationTest
         </relation>
        </modify>
       </osmChange>
         </relation>
        </modify>
       </osmChange>

-CHANGESET
+    CHANGESET

 
     # upload it
     post "/api/0.6/changeset/#{changeset.id}/upload",
          :params => diff,
          :headers => {
 
     # 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")),
+           "HTTP_AUTHORIZATION" => format("Basic %<auth>s", :auth => Base64.encode64("#{user.display_name}:test")),

            "HTTP_CONTENT_TYPE" => "application/xml"
          }
     assert_response :success,
            "HTTP_CONTENT_TYPE" => "application/xml"
          }
     assert_response :success,


@@ -65,7 +65,7 @@ CHANGESET
 
     # simple diff to change a node, way and relation by removing
     # their tags
 
     # simple diff to change a node, way and relation by removing
     # their tags

-    diff = <<CHANGESET.strip_heredoc
+    diff = <<~CHANGESET

       <osmChange>
        <modify>
         <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
       <osmChange>
        <modify>
         <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>


@@ -81,13 +81,13 @@ CHANGESET
         </relation>
        </modify>
       </osmChange>
         </relation>
        </modify>
       </osmChange>

-CHANGESET
+    CHANGESET

 
     # upload it
     post "/api/0.6/changeset/#{changeset.id}/upload",
          :params => gzip_content(diff),
          :headers => {
 
     # 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")),
+           "HTTP_AUTHORIZATION" => format("Basic %<auth>s", :auth => Base64.encode64("#{user.display_name}:test")),

            "HTTP_CONTENT_ENCODING" => "gzip",
            "HTTP_CONTENT_TYPE" => "application/xml"
          }
            "HTTP_CONTENT_ENCODING" => "gzip",
            "HTTP_CONTENT_TYPE" => "application/xml"
          }


@@ -115,7 +115,7 @@ CHANGESET
 
     # simple diff to change a node, way and relation by removing
     # their tags
 
     # simple diff to change a node, way and relation by removing
     # their tags

-    diff = <<CHANGESET.strip_heredoc
+    diff = <<~CHANGESET

       <osmChange>
        <modify>
         <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
       <osmChange>
        <modify>
         <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>


@@ -131,13 +131,13 @@ CHANGESET
         </relation>
        </modify>
       </osmChange>
         </relation>
        </modify>
       </osmChange>

-CHANGESET
+    CHANGESET

 
     # upload it
     post "/api/0.6/changeset/#{changeset.id}/upload",
          :params => deflate_content(diff),
          :headers => {
 
     # 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")),
+           "HTTP_AUTHORIZATION" => format("Basic %<auth>s", :auth => Base64.encode64("#{user.display_name}:test")),

            "HTTP_CONTENT_ENCODING" => "deflate",
            "HTTP_CONTENT_TYPE" => "application/xml"
          }
            "HTTP_CONTENT_ENCODING" => "deflate",
            "HTTP_CONTENT_TYPE" => "application/xml"
          }


@@ -158,7 +158,7 @@ CHANGESET
     post "/api/0.6/changeset/#{changeset.id}/upload",
          :params => "",
          :headers => {
     post "/api/0.6/changeset/#{changeset.id}/upload",
          :params => "",
          :headers => {

-           "HTTP_AUTHORIZATION" => format("Basic %{auth}", :auth => Base64.encode64("#{user.display_name}:test")),
+           "HTTP_AUTHORIZATION" => format("Basic %<auth>s", :auth => Base64.encode64("#{user.display_name}:test")),

            "HTTP_CONTENT_ENCODING" => "unknown",
            "HTTP_CONTENT_TYPE" => "application/xml"
          }
            "HTTP_CONTENT_ENCODING" => "unknown",
            "HTTP_CONTENT_TYPE" => "application/xml"
          }