refactoring tests

Author: shubhangi-google

google-cloud-storage/test/google/cloud/storage/bucket_encryption_test.rb

@@ -163,12 +163,7 @@
       returned_bucket_gapi.encryption = bucket_gapi.encryption.dup
       returned_bucket_gapi.encryption.google_managed_encryption_enforcement_config = patch_bucket_gapi.encryption.google_managed_encryption_enforcement_config
 
-      mock.expect :update_bucket, returned_bucket_gapi do |name, patch_obj, **kwargs|
-        cm_config = patch_obj.encryption.customer_managed_encryption_enforcement_config
-        cs_config = patch_obj.encryption.customer_supplied_encryption_enforcement_config
-        gm_config = patch_obj.encryption.google_managed_encryption_enforcement_config
-  
-      end
+      mock.expect(:update_bucket, returned_bucket_gapi) { |name,**| name == bucket_name}
 
       bucket.service.mocked_service = mock
       _(bucket.customer_managed_encryption_enforcement_config.restriction_mode).must_equal "FullyRestricted"
@@ -178,7 +173,6 @@
       bucket.update do |b|
         b.google_managed_encryption_enforcement_config = incoming_config
       end
-      # bucket.update_bucket_encryption_enforcement_config incoming_config
       _(bucket.customer_managed_encryption_enforcement_config.restriction_mode).must_equal "FullyRestricted"
       _(bucket.customer_supplied_encryption_enforcement_config.restriction_mode).must_equal "NotRestricted"
       _(bucket.google_managed_encryption_enforcement_config.restriction_mode).must_equal "FullyRestricted"
@@ -206,23 +200,12 @@
       initial_bucket_gapi = bucket_gapi.dup
       initial_bucket_gapi.encryption = bucket_encryption.dup
       initial_bucket_gapi.encryption.default_kms_key_name = kms_key
-
       bucket_with_configs_and_key = Google::Cloud::Storage::Bucket.from_gapi initial_bucket_gapi, storage.service
 
       returned_bucket_gapi = bucket_gapi.dup
       returned_bucket_gapi.encryption = Google::Apis::StorageV1::Bucket::Encryption.new default_kms_key_name: kms_key
 
-      mock.expect :update_bucket, returned_bucket_gapi do |name, patch_obj, **kwargs|
-        cm_config = patch_obj.encryption.customer_managed_encryption_enforcement_config
-        cs_config = patch_obj.encryption.customer_supplied_encryption_enforcement_config
-        gm_config = patch_obj.encryption.google_managed_encryption_enforcement_config
-
-        name == bucket_name &&
-          (cm_config == {} || cm_config.nil?) &&
-          (cs_config == {} || cs_config.nil?) &&
-          (gm_config == {} || gm_config.nil?) &&
-          patch_obj.encryption.default_kms_key_name == kms_key
-      end
+      mock.expect(:update_bucket, returned_bucket_gapi) { |name, patch_obj, **| name == bucket_name && patch_obj.encryption.default_kms_key_name == kms_key }
 
       bucket_with_configs_and_key.service.mocked_service = mock
 

google-cloud-storage/test/helper.rb

@@ -245,21 +245,21 @@ def download_http_resp gzip: nil
   end
 
   def customer_managed_encryption
-     Google::Apis::StorageV1::Bucket::Encryption::CustomerManagedEncryptionEnforcementConfig.new(
+    Google::Apis::StorageV1::Bucket::Encryption::CustomerManagedEncryptionEnforcementConfig.new(
       restriction_mode: "FullyRestricted"
-     )   
+    )
   end
 
   def customer_supplied_encryption
     Google::Apis::StorageV1::Bucket::Encryption::CustomerSuppliedEncryptionEnforcementConfig.new(
       restriction_mode: "NotRestricted"
-     )
+    )
   end
 
   def google_managed_encryption
     Google::Apis::StorageV1::Bucket::Encryption::GoogleManagedEncryptionEnforcementConfig.new(
       restriction_mode: "NotRestricted"
-     )
+    )
   end
 
   def encryption_gapi key_name: nil