Merge branch 'self-assign-cop' into 'master'

Fix Style/SelfAssignment cop

See merge request gitlab-org/gitlab!41079

.rubocop_todo.yml

@@ -818,14 +818,6 @@ Style/RescueModifier:
 Style/RescueStandardError:
   Enabled: false
 
-# Offense count: 4
-# Cop supports --auto-correct.
-Style/SelfAssignment:
-  Exclude:
-    - 'app/models/concerns/bulk_member_access_load.rb'
-    - 'app/serializers/base_serializer.rb'
-    - 'spec/support/import_export/configuration_helper.rb'
-
 # Offense count: 50
 # Cop supports --auto-correct.
 # Configuration parameters: AllowIfMethodIsEmpty.

app/models/concerns/bulk_member_access_load.rb

@@ -22,7 +22,7 @@ module BulkMemberAccessLoad
       end
 
       # Look up only the IDs we need
-      resource_ids = resource_ids - access.keys
+      resource_ids -= access.keys
 
       return access if resource_ids.empty?
 

app/serializers/base_serializer.rb

@@ -9,7 +9,7 @@ class BaseSerializer
   end
 
   def represent(resource, opts = {}, entity_class = nil)
-    entity_class = entity_class || self.class.entity_class
+    entity_class ||= self.class.entity_class
 
     entity_class
       .represent(resource, opts.merge(request: @request))

changelogs/unreleased/self-assign-cop.yml

+---
+title: Fix Style/SelfAssignment cop
+merge_request: 41079
+author: Rajendra Kadam
+type: fixed

spec/support/import_export/configuration_helper.rb

@@ -44,8 +44,8 @@ module ConfigurationHelper
     import_export_config = config_hash(config)
     excluded_attributes = import_export_config[:excluded_attributes][relation_name.to_sym]
     included_attributes = import_export_config[:included_attributes][relation_name.to_sym]
-    attributes = attributes - Gitlab::Json.parse(excluded_attributes.to_json) if excluded_attributes
-    attributes = attributes & Gitlab::Json.parse(included_attributes.to_json) if included_attributes
+    attributes -= Gitlab::Json.parse(excluded_attributes.to_json) if excluded_attributes
+    attributes &= Gitlab::Json.parse(included_attributes.to_json) if included_attributes
 
     attributes
   end