refactor

Author: shubhangi-google

google-cloud-storage/acceptance/storage/bucket_test.rb

@@ -268,12 +268,9 @@
   end
 
   it "omits Accept-Encoding: gzip header for file uploads" do
-    # Verify the service's global headers do not contain the gzip encoding
     global_headers = storage.service.service.request_options.header || {}
     _(global_headers["Accept-Encoding"]).wont_equal "gzip"
 
-    # By uploading a JSON file, we simulate the bug condition.
-    # If the header were sent globally, the server might return gzipped JSON metadata, causing a parse error.
     uploaded = bucket.create_file StringIO.new('{"metadata":"test"}'), "test-upload-metadata.json", content_type: "application/json"
 
     _(uploaded.name).must_equal "test-upload-metadata.json"

google-cloud-storage/acceptance/storage/file_test.rb

@@ -43,13 +43,9 @@
   end
 
   it "does not send Accept-Encoding: gzip globally during file uploads" do
-    # Verify the service's global headers do not contain the gzip encoding
     global_headers = storage.service.service.request_options.header || {}
     _(global_headers["Accept-Encoding"]).wont_equal "gzip"
 
-    # By uploading a JSON file, we simulate the bug condition.
-    # If the header was sent, the server might return gzipped JSON metadata,
-    # which the upload method wouldn't know how to parse, causing an error.
     uploaded = bucket.create_file StringIO.new('{"metadata":"test"}'), "upload-metadata.json", content_type: "application/json"
     _(uploaded.name).must_equal "upload-metadata.json"
     uploaded.delete

google-cloud-storage/lib/google/cloud/storage/service.rb

@@ -585,8 +585,7 @@ def download_file bucket_name, file_path, target_path, generation: nil,
                           key: nil, range: nil, user_project: nil, options: {}
           options = key_options(key).merge(options)
           options = range_header options, range
-          options[:header] ||= {}
-          options[:header]["Accept-Encoding"] = "gzip"
+          options[:header] = (options[:header] || {}).merge("Accept-Encoding" => "gzip")
 
           execute do
             service.get_object \