Fix syntax error in S3 service test on Ruby < 2.5

https://buildkite.com/rails/rails/builds/71913#bc3011fb-51cd-4037-bbaf-45ef91d3786a/914-931
rails · Oct 3, 2020 · 2a3f8a2 · 2a3f8a2
1 parent 5d0e5f0
commit 2a3f8a2
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/activestorage/test/service/s3_service_test.rb b/activestorage/test/service/s3_service_test.rb
@@ -32,26 +32,28 @@ class ActiveStorage::Service::S3ServiceTest < ActiveSupport::TestCase
     end
 
     test "directly uploading file larger than the provided content-length does not work" do
-      key      = SecureRandom.base58(24)
-      data     = "Some text that is longer than the specified content length"
-      checksum = Digest::MD5.base64digest(data)
-      url      = @service.url_for_direct_upload(key, expires_in: 5.minutes, content_type: "text/plain", content_length: data.size - 1, checksum: checksum)
-
-      uri = URI.parse url
-      request = Net::HTTP::Put.new uri.request_uri
-      request.body = data
-      request.add_field "Content-Type", "text/plain"
-      request.add_field "Content-MD5", checksum
-      upload_result = Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
-        http.request request
-      end
+      begin
+        key      = SecureRandom.base58(24)
+        data     = "Some text that is longer than the specified content length"
+        checksum = Digest::MD5.base64digest(data)
+        url      = @service.url_for_direct_upload(key, expires_in: 5.minutes, content_type: "text/plain", content_length: data.size - 1, checksum: checksum)
 
-      assert_equal "403", upload_result.code
-      assert_raises ActiveStorage::FileNotFoundError do
-        @service.download(key)
+        uri = URI.parse url
+        request = Net::HTTP::Put.new uri.request_uri
+        request.body = data
+        request.add_field "Content-Type", "text/plain"
+        request.add_field "Content-MD5", checksum
+        upload_result = Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+          http.request request
+        end
+
+        assert_equal "403", upload_result.code
+        assert_raises ActiveStorage::FileNotFoundError do
+          @service.download(key)
+        end
+      ensure
+        @service.delete key
       end
-    ensure
-      @service.delete key
     end
 
     test "upload a zero byte file" do