Merge branch 'rc/fix_leaky_constants_4' into 'master'

Fixes for RSpec/LeakyConstantDeclaration

See merge request gitlab-org/gitlab!30664

.rubocop.yml

@@ -335,10 +335,76 @@ RSpec/AnyInstanceOf:
 RSpec/ImplicitSubject:
   Enabled: false
 
+# WIP See https://gitlab.com/gitlab-org/gitlab/-/issues/211580
 RSpec/LeakyConstantDeclaration:
   Enabled: true
   Exclude:
-    - 'spec/**/*.rb'
+    - 'spec/db/schema_spec.rb'
+    - 'spec/graphql/gitlab_schema_spec.rb'
+    - 'spec/helpers/visibility_level_helper_spec.rb'
+    - 'spec/initializers/secret_token_spec.rb'
+    - 'spec/lib/declarative_policy_spec.rb'
+    - 'spec/lib/feature_spec.rb'
+    - 'spec/lib/gitlab/background_migration/migrate_issue_trackers_sensitive_data_spec.rb'
+    - 'spec/lib/gitlab/ci/build/credentials/factory_spec.rb'
+    - 'spec/lib/gitlab/ci/config/entry/retry_spec.rb'
+    - 'spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb'
+    - 'spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb'
+    - 'spec/lib/gitlab/config/entry/factory_spec.rb'
+    - 'spec/lib/gitlab/config/entry/simplifiable_spec.rb'
+    - 'spec/lib/gitlab/database/migration_helpers_spec.rb'
+    - 'spec/lib/gitlab/database/obsolete_ignored_columns_spec.rb'
+    - 'spec/lib/gitlab/database/with_lock_retries_spec.rb'
+    - 'spec/lib/gitlab/git/diff_collection_spec.rb'
+    - 'spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb'
+    - 'spec/lib/gitlab/health_checks/master_check_spec.rb'
+    - 'spec/lib/gitlab/import_export/attribute_configuration_spec.rb'
+    - 'spec/lib/gitlab/import_export/import_test_coverage_spec.rb'
+    - 'spec/lib/gitlab/import_export/project/relation_factory_spec.rb'
+    - 'spec/lib/gitlab/jira_import/issues_importer_spec.rb'
+    - 'spec/lib/gitlab/no_cache_headers_spec.rb'
+    - 'spec/lib/gitlab/path_regex_spec.rb'
+    - 'spec/lib/gitlab/quick_actions/dsl_spec.rb'
+    - 'spec/lib/gitlab/sidekiq_middleware/client_metrics_spec.rb'
+    - 'spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb'
+    - 'spec/lib/gitlab/sidekiq_middleware_spec.rb'
+    - 'spec/lib/gitlab/view/presenter/factory_spec.rb'
+    - 'spec/lib/marginalia_spec.rb'
+    - 'spec/lib/omni_auth/strategies/jwt_spec.rb'
+    - 'spec/lib/system_check/simple_executor_spec.rb'
+    - 'spec/lib/system_check_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/migrations/cleanup_optimistic_locking_nulls_pt2_fixed_spec.rb'
+    - 'spec/models/clusters/cluster_spec.rb'
+    - 'spec/models/concerns/batch_destroy_dependent_associations_spec.rb'
+    - 'spec/models/concerns/blocks_json_serialization_spec.rb'
+    - 'spec/models/concerns/bulk_insert_safe_spec.rb'
+    - 'spec/models/concerns/bulk_insertable_associations_spec.rb'
+    - 'spec/models/concerns/mentionable_spec.rb'
+    - 'spec/models/concerns/reactive_caching_spec.rb'
+    - 'spec/models/concerns/triggerable_hooks_spec.rb'
+    - 'spec/models/repository_spec.rb'
+    - 'spec/models/tree_spec.rb'
+    - 'spec/policies/merge_request_policy_spec.rb'
+    - 'spec/requests/api/graphql/tasks/task_completion_status_spec.rb'
+    - 'spec/requests/api/statistics_spec.rb'
+    - 'spec/rubocop/cop/rspec/env_assignment_spec.rb'
+    - 'spec/serializers/commit_entity_spec.rb'
+    - 'spec/services/ci/retry_build_service_spec.rb'
+    - 'spec/services/clusters/applications/check_installation_progress_service_spec.rb'
+    - 'spec/services/clusters/applications/check_uninstall_progress_service_spec.rb'
+    - 'spec/services/clusters/applications/check_upgrade_progress_service_spec.rb'
+    - 'spec/services/clusters/applications/ingress_modsecurity_usage_service_spec.rb'
+    - 'spec/services/issues/resolve_discussions_spec.rb'
+    - 'spec/services/metrics/dashboard/clone_dashboard_service_spec.rb'
+    - 'spec/support/shared_contexts/spam_constants.rb'
+    - 'spec/support/shared_examples/quick_actions/issuable/issuable_quick_actions_shared_examples.rb'
+    - 'spec/support_specs/helpers/active_record/query_recorder_spec.rb'
+    - 'spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb'
+    - 'spec/uploaders/content_type_whitelist_spec.rb'
+    - 'spec/uploaders/records_uploads_spec.rb'
 
 RSpec/EmptyLineAfterHook:
   Enabled: false

spec/config/application_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Gitlab::Application do # rubocop:disable RSpec/FilePath
   using RSpec::Parameterized::TableSyntax
 
-  FILTERED_PARAM = ActiveSupport::ParameterFilter::FILTERED
+  filtered_param = ActiveSupport::ParameterFilter::FILTERED
 
   context 'when parameters are logged' do
     describe 'rails does not leak confidential parameters' do
@@ -19,11 +19,11 @@ describe Gitlab::Application do # rubocop:disable RSpec/FilePath
       where(:input_url, :output_query) do
         '/'                                      | {}
         '/?safe=1'                               | { 'safe' => '1' }
-        '/?private_token=secret'                 | { 'private_token' => FILTERED_PARAM }
-        '/?mixed=1&private_token=secret'         | { 'mixed' => '1', 'private_token' => FILTERED_PARAM }
-        '/?note=secret&noteable=1&prefix_note=2' | { 'note' => FILTERED_PARAM, 'noteable' => '1', 'prefix_note' => '2' }
-        '/?note[note]=secret&target_type=1'      | { 'note' => FILTERED_PARAM, 'target_type' => '1' }
-        '/?safe[note]=secret&target_type=1'      | { 'safe' => { 'note' => FILTERED_PARAM }, 'target_type' => '1' }
+        '/?private_token=secret'                 | { 'private_token' => filtered_param }
+        '/?mixed=1&private_token=secret'         | { 'mixed' => '1', 'private_token' => filtered_param }
+        '/?note=secret&noteable=1&prefix_note=2' | { 'note' => filtered_param, 'noteable' => '1', 'prefix_note' => '2' }
+        '/?note[note]=secret&target_type=1'      | { 'note' => filtered_param, 'target_type' => '1' }
+        '/?safe[note]=secret&target_type=1'      | { 'safe' => { 'note' => filtered_param }, 'target_type' => '1' }
       end
 
       with_them do

spec/features/merge_request/user_resolves_conflicts_spec.rb

@@ -183,14 +183,14 @@ describe 'Merge request > User resolves conflicts', :js do
     end
   end
 
-  UNRESOLVABLE_CONFLICTS = {
+  unresolvable_conflicts = {
     'conflict-too-large' => 'when the conflicts contain a large file',
     'conflict-binary-file' => 'when the conflicts contain a binary file',
     'conflict-missing-side' => 'when the conflicts contain a file edited in one branch and deleted in another',
     'conflict-non-utf8' => 'when the conflicts contain a non-UTF-8 file'
   }.freeze
 
-  UNRESOLVABLE_CONFLICTS.each do |source_branch, description|
+  unresolvable_conflicts.each do |source_branch, description|
     context description do
       let(:merge_request) { create_merge_request(source_branch) }
 

spec/features/milestones/user_creates_milestone_spec.rb

@@ -14,13 +14,13 @@ describe "User creates milestone", :js do
   end
 
   it "creates milestone" do
-    TITLE = "v2.3".freeze
+    title = "v2.3".freeze
 
-    fill_in("Title", with: TITLE)
+    fill_in("Title", with: title)
     fill_in("Description", with: "# Description header")
     click_button("Create milestone")
 
-    expect(page).to have_content(TITLE)
+    expect(page).to have_content(title)
       .and have_content("Issues")
       .and have_header_with_correct_id_and_link(1, "Description header", "description-header")
 

spec/features/milestones/user_views_milestone_spec.rb

@@ -14,13 +14,13 @@ describe "User views milestone" do
   end
 
   it "avoids N+1 database queries" do
-    ISSUE_PARAMS = { project: project, assignees: [user], author: user, milestone: milestone, labels: labels }.freeze
+    issue_params = { project: project, assignees: [user], author: user, milestone: milestone, labels: labels }.freeze
 
-    create(:labeled_issue, ISSUE_PARAMS)
+    create(:labeled_issue, issue_params)
 
     control = ActiveRecord::QueryRecorder.new { visit_milestone }
 
-    create(:labeled_issue, ISSUE_PARAMS)
+    create(:labeled_issue, issue_params)
 
     expect { visit_milestone }.not_to exceed_query_limit(control)
   end

spec/features/projects/branches/user_creates_branch_spec.rb

@@ -16,18 +16,18 @@ describe "User creates branch", :js do
   end
 
   it "creates new branch" do
-    BRANCH_NAME = "deploy_keys".freeze
+    branch_name = "deploy_keys".freeze
 
-    create_branch(BRANCH_NAME)
+    create_branch(branch_name)
 
-    expect(page).to have_content(BRANCH_NAME)
+    expect(page).to have_content(branch_name)
   end
 
   context "when branch name is invalid" do
     it "does not create new branch" do
-      INVALID_BRANCH_NAME = "1.0 stable".freeze
+      invalid_branch_name = "1.0 stable".freeze
 
-      fill_in("branch_name", with: INVALID_BRANCH_NAME)
+      fill_in("branch_name", with: invalid_branch_name)
       page.find("body").click # defocus the branch_name input
 
       select_branch("master")

spec/features/projects/commit/comments/user_edits_comments_spec.rb

@@ -19,7 +19,7 @@ describe "User edits a comment on a commit", :js do
   end
 
   it "edits comment" do
-    NEW_COMMENT_TEXT = "+1 Awesome!".freeze
+    new_comment_text = "+1 Awesome!".freeze
 
     page.within(".main-notes-list") do
       note = find(".note")
@@ -31,14 +31,14 @@ describe "User edits a comment on a commit", :js do
     page.find(".current-note-edit-form textarea")
 
     page.within(".current-note-edit-form") do
-      fill_in("note[note]", with: NEW_COMMENT_TEXT)
+      fill_in("note[note]", with: new_comment_text)
       click_button("Save comment")
     end
 
     wait_for_requests
 
     page.within(".note") do
-      expect(page).to have_content(NEW_COMMENT_TEXT)
+      expect(page).to have_content(new_comment_text)
     end
   end
 end

spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb

@@ -88,18 +88,18 @@ describe "User interacts with deploy keys", :js do
     end
 
     it "adds new key" do
-      DEPLOY_KEY_TITLE = attributes_for(:key)[:title]
-      DEPLOY_KEY_BODY  = attributes_for(:key)[:key]
+      deploy_key_title = attributes_for(:key)[:title]
+      deploy_key_body  = attributes_for(:key)[:key]
 
-      fill_in("deploy_key_title", with: DEPLOY_KEY_TITLE)
-      fill_in("deploy_key_key",   with: DEPLOY_KEY_BODY)
+      fill_in("deploy_key_title", with: deploy_key_title)
+      fill_in("deploy_key_key",   with: deploy_key_body)
 
       click_button("Add key")
 
       expect(current_path).to eq(project_settings_repository_path(project))
 
       page.within(".deploy-keys") do
-        expect(page).to have_content(DEPLOY_KEY_TITLE)
+        expect(page).to have_content(deploy_key_title)
       end
     end
   end