Merge branch 'leaky-constant-fix-21' into 'master'

Use variable in place of constant

See merge request gitlab-org/gitlab!32066

.rubocop.yml

@@ -375,7 +375,6 @@ RSpec/LeakyConstantDeclaration:
     - 'spec/lib/system_check/simple_executor_spec.rb'
     - 'spec/mailers/notify_spec.rb'
     - 'spec/migrations/20191125114345_add_admin_mode_protected_path_spec.rb'
-    - 'spec/migrations/encrypt_plaintext_attributes_on_application_settings_spec.rb'
     - 'spec/models/concerns/batch_destroy_dependent_associations_spec.rb'
     - 'spec/models/concerns/bulk_insert_safe_spec.rb'
     - 'spec/models/concerns/bulk_insertable_associations_spec.rb'

changelogs/unreleased/leaky-constant-fix-21.yml

+---
+title: Fix leaky constant issue in application settings encrypt spec
+merge_request: 32066
+author: Rajendra Kadam
+type: fixed

spec/migrations/encrypt_plaintext_attributes_on_application_settings_spec.rb

@@ -8,7 +8,7 @@ describe EncryptPlaintextAttributesOnApplicationSettings do
   let(:application_settings) { table(:application_settings) }
   let(:plaintext) { 'secret-token' }
 
-  PLAINTEXT_ATTRIBUTES = %w[
+  plaintext_attributes = %w[
     akismet_api_key
     elasticsearch_aws_secret_access_key
     recaptcha_private_key
@@ -21,7 +21,7 @@ describe EncryptPlaintextAttributesOnApplicationSettings do
     it 'encrypts token and saves it' do
       application_setting = application_settings.create
       application_setting.update_columns(
-        PLAINTEXT_ATTRIBUTES.each_with_object({}) do |plaintext_attribute, attributes|
+        plaintext_attributes.each_with_object({}) do |plaintext_attribute, attributes|
           attributes[plaintext_attribute] = plaintext
         end
       )
@@ -29,7 +29,7 @@ describe EncryptPlaintextAttributesOnApplicationSettings do
       migration.up
 
       application_setting.reload
-      PLAINTEXT_ATTRIBUTES.each do |plaintext_attribute|
+      plaintext_attributes.each do |plaintext_attribute|
         expect(application_setting[plaintext_attribute]).not_to be_nil
         expect(application_setting["encrypted_#{plaintext_attribute}"]).not_to be_nil
         expect(application_setting["encrypted_#{plaintext_attribute}_iv"]).not_to be_nil
@@ -40,7 +40,7 @@ describe EncryptPlaintextAttributesOnApplicationSettings do
   describe '#down' do
     it 'decrypts encrypted token and saves it' do
       application_setting = application_settings.create(
-        PLAINTEXT_ATTRIBUTES.each_with_object({}) do |plaintext_attribute, attributes|
+        plaintext_attributes.each_with_object({}) do |plaintext_attribute, attributes|
           attributes[plaintext_attribute] = plaintext
         end
       )
@@ -48,7 +48,7 @@ describe EncryptPlaintextAttributesOnApplicationSettings do
       migration.down
 
       application_setting.reload
-      PLAINTEXT_ATTRIBUTES.each do |plaintext_attribute|
+      plaintext_attributes.each do |plaintext_attribute|
         expect(application_setting[plaintext_attribute]).to eq(plaintext)
         expect(application_setting["encrypted_#{plaintext_attribute}"]).to be_nil
         expect(application_setting["encrypted_#{plaintext_attribute}_iv"]).to be_nil