Merge branch '276734-deprecate-use-of-rubocop-cop_helper' into 'master'

Deprecate use of rubocop cop_helper

See merge request gitlab-org/gitlab!51005

.rubocop.yml

@@ -48,6 +48,11 @@ Cop/StaticTranslationDefinition:
     - 'spec/**/*'
     - 'ee/spec/**/*'
 
+InternalAffairs/DeprecateCopHelper:
+  Enabled: true
+  Include:
+    - spec/rubocop/**/*.rb
+
 Lint/LastKeywordArgument:
   Enabled: true
   Safe: false

.rubocop_manual_todo.yml

@@ -29,6 +29,110 @@ FactoryBot/InlineAssociation:
     - 'spec/factories/uploads.rb'
     - 'spec/factories/wiki_pages.rb'
 
+InternalAffairs/DeprecateCopHelper:
+  Exclude:
+    - 'spec/rubocop/code_reuse_helpers_spec.rb'
+    - 'spec/rubocop/qa_helpers_spec.rb'
+    - 'spec/rubocop/migration_helpers_spec.rb'
+    - 'spec/rubocop/cop/group_public_or_visible_to_user_spec.rb'
+    - 'spec/rubocop/cop/static_translation_definition_spec.rb'
+    - 'spec/rubocop/cop/lint/last_keyword_argument_spec.rb'
+    - 'spec/rubocop/cop/usage_data/large_table_spec.rb'
+    - 'spec/rubocop/cop/usage_data/distinct_count_by_large_foreign_key_spec.rb'
+    - 'spec/rubocop/cop/filename_length_spec.rb'
+    - 'spec/rubocop/cop/put_project_routes_under_scope_spec.rb'
+    - 'spec/rubocop/cop/gitlab/rails_logger_spec.rb'
+    - 'spec/rubocop/cop/gitlab/module_with_instance_variables_spec.rb'
+    - 'spec/rubocop/cop/gitlab/avoid_uploaded_file_from_params_spec.rb'
+    - 'spec/rubocop/cop/gitlab/duplicate_spec_location_spec.rb'
+    - 'spec/rubocop/cop/gitlab/bulk_insert_spec.rb'
+    - 'spec/rubocop/cop/gitlab/intersect_spec.rb'
+    - 'spec/rubocop/cop/gitlab/json_spec.rb'
+    - 'spec/rubocop/cop/gitlab/httparty_spec.rb'
+    - 'spec/rubocop/cop/gitlab/policy_rule_boolean_spec.rb'
+    - 'spec/rubocop/cop/gitlab/except_spec.rb'
+    - 'spec/rubocop/cop/gitlab/const_get_inherit_false_spec.rb'
+    - 'spec/rubocop/cop/gitlab/change_timezone_spec.rb'
+    - 'spec/rubocop/cop/gitlab/predicate_memoization_spec.rb'
+    - 'spec/rubocop/cop/gitlab/union_spec.rb'
+    - 'spec/rubocop/cop/gitlab/finder_with_find_by_spec.rb'
+    - 'spec/rubocop/cop/ruby_interpolation_in_translation_spec.rb'
+    - 'spec/rubocop/cop/active_record_association_reload_spec.rb'
+    - 'spec/rubocop/cop/ban_catch_throw_spec.rb'
+    - 'spec/rubocop/cop/avoid_break_from_strong_memoize_spec.rb'
+    - 'spec/rubocop/cop/avoid_becomes_spec.rb'
+    - 'spec/rubocop/cop/qa/ambiguous_page_object_name_spec.rb'
+    - 'spec/rubocop/cop/qa/element_with_pattern_spec.rb'
+    - 'spec/rubocop/cop/inject_enterprise_edition_module_spec.rb'
+    - 'spec/rubocop/cop/code_reuse/finder_spec.rb'
+    - 'spec/rubocop/cop/code_reuse/worker_spec.rb'
+    - 'spec/rubocop/cop/code_reuse/service_class_spec.rb'
+    - 'spec/rubocop/cop/code_reuse/presenter_spec.rb'
+    - 'spec/rubocop/cop/code_reuse/serializer_spec.rb'
+    - 'spec/rubocop/cop/avoid_keyword_arguments_in_sidekiq_workers_spec.rb'
+    - 'spec/rubocop/cop/default_scope_spec.rb'
+    - 'spec/rubocop/cop/graphql/resolver_type_spec.rb'
+    - 'spec/rubocop/cop/graphql/descriptions_spec.rb'
+    - 'spec/rubocop/cop/graphql/json_type_spec.rb'
+    - 'spec/rubocop/cop/graphql/gid_expected_type_spec.rb'
+    - 'spec/rubocop/cop/graphql/authorize_types_spec.rb'
+    - 'spec/rubocop/cop/graphql/id_type_spec.rb'
+    - 'spec/rubocop/cop/scalability/bulk_perform_with_context_spec.rb'
+    - 'spec/rubocop/cop/scalability/idempotent_worker_spec.rb'
+    - 'spec/rubocop/cop/scalability/cron_worker_context_spec.rb'
+    - 'spec/rubocop/cop/scalability/file_uploads_spec.rb'
+    - 'spec/rubocop/cop/api/grape_array_missing_coerce_spec.rb'
+    - 'spec/rubocop/cop/api/base_spec.rb'
+    - 'spec/rubocop/cop/destroy_all_spec.rb'
+    - 'spec/rubocop/cop/safe_params_spec.rb'
+    - 'spec/rubocop/cop/include_sidekiq_worker_spec.rb'
+    - 'spec/rubocop/cop/rspec/factories_in_migration_specs_spec.rb'
+    - 'spec/rubocop/cop/rspec/timecop_freeze_spec.rb'
+    - 'spec/rubocop/cop/rspec/any_instance_of_spec.rb'
+    - 'spec/rubocop/cop/rspec/factory_bot/inline_association_spec.rb'
+    - 'spec/rubocop/cop/rspec/top_level_describe_path_spec.rb'
+    - 'spec/rubocop/cop/rspec/be_success_matcher_spec.rb'
+    - 'spec/rubocop/cop/rspec/htt_party_basic_auth_spec.rb'
+    - 'spec/rubocop/cop/rspec/modify_sidekiq_middleware_spec.rb'
+    - 'spec/rubocop/cop/rspec/expect_gitlab_tracking_spec.rb'
+    - 'spec/rubocop/cop/rspec/have_gitlab_http_status_spec.rb'
+    - 'spec/rubocop/cop/rspec/timecop_travel_spec.rb'
+    - 'spec/rubocop/cop/rspec/env_assignment_spec.rb'
+    - 'spec/rubocop/cop/performance/ar_exists_and_present_blank_spec.rb'
+    - 'spec/rubocop/cop/performance/ar_count_each_spec.rb'
+    - 'spec/rubocop/cop/performance/readlines_each_spec.rb'
+    - 'spec/rubocop/cop/project_path_helper_spec.rb'
+    - 'spec/rubocop/cop/migration/safer_boolean_column_spec.rb'
+    - 'spec/rubocop/cop/migration/remove_index_spec.rb'
+    - 'spec/rubocop/cop/migration/add_index_spec.rb'
+    - 'spec/rubocop/cop/migration/drop_table_spec.rb'
+    - 'spec/rubocop/cop/migration/hash_index_spec.rb'
+    - 'spec/rubocop/cop/migration/datetime_spec.rb'
+    - 'spec/rubocop/cop/migration/add_column_with_default_spec.rb'
+    - 'spec/rubocop/cop/migration/prevent_strings_spec.rb'
+    - 'spec/rubocop/cop/migration/add_timestamps_spec.rb'
+    - 'spec/rubocop/cop/migration/add_concurrent_index_spec.rb'
+    - 'spec/rubocop/cop/migration/update_column_in_batches_spec.rb'
+    - 'spec/rubocop/cop/migration/complex_indexes_require_name_spec.rb'
+    - 'spec/rubocop/cop/migration/refer_to_index_by_name_spec.rb'
+    - 'spec/rubocop/cop/migration/schedule_async_spec.rb'
+    - 'spec/rubocop/cop/migration/timestamps_spec.rb'
+    - 'spec/rubocop/cop/migration/remove_concurrent_index_spec.rb'
+    - 'spec/rubocop/cop/migration/add_columns_to_wide_tables_spec.rb'
+    - 'spec/rubocop/cop/migration/with_lock_retries_disallowed_method_spec.rb'
+    - 'spec/rubocop/cop/migration/add_reference_spec.rb'
+    - 'spec/rubocop/cop/migration/remove_column_spec.rb'
+    - 'spec/rubocop/cop/migration/create_table_with_foreign_keys_spec.rb'
+    - 'spec/rubocop/cop/migration/add_concurrent_foreign_key_spec.rb'
+    - 'spec/rubocop/cop/migration/with_lock_retries_with_change_spec.rb'
+    - 'spec/rubocop/cop/migration/add_limit_to_text_columns_spec.rb'
+    - 'spec/rubocop/cop/avoid_return_from_blocks_spec.rb'
+    - 'spec/rubocop/cop/avoid_route_redirect_leading_slash_spec.rb'
+    - 'spec/rubocop/cop/put_group_routes_under_scope_spec.rb'
+    - 'spec/rubocop/cop/sidekiq_options_queue_spec.rb'
+    - 'spec/rubocop/cop/ignored_columns_spec.rb'
+    - 'spec/rubocop/cop/prefer_class_methods_over_module_spec.rb'
+
 Rails/SaveBang:
   Exclude:
     - 'ee/spec/controllers/projects/merge_requests_controller_spec.rb'

Gemfile

@@ -372,7 +372,7 @@ group :development, :test do
   gem 'spring', '~> 2.1.0'
   gem 'spring-commands-rspec', '~> 1.0.4'
 
-  gem 'gitlab-styles', '~> 5.3.0', require: false
+  gem 'gitlab-styles', '~> 5.4.0', require: false
 
   gem 'scss_lint', '~> 0.59.0', require: false
   gem 'haml_lint', '~> 0.36.0', require: false

Gemfile.lock

@@ -455,7 +455,7 @@ GEM
       gitlab-puma (>= 2.7, < 5)
     gitlab-sidekiq-fetcher (0.5.2)
       sidekiq (~> 5)
-    gitlab-styles (5.3.0)
+    gitlab-styles (5.4.0)
       rubocop (~> 0.89.1)
       rubocop-gitlab-security (~> 0.1.0)
       rubocop-performance (~> 1.8.1)
@@ -1366,7 +1366,7 @@ DEPENDENCIES
   gitlab-puma (~> 4.3.3.gitlab.2)
   gitlab-puma_worker_killer (~> 0.1.1.gitlab.1)
   gitlab-sidekiq-fetcher (= 0.5.2)
-  gitlab-styles (~> 5.3.0)
+  gitlab-styles (~> 5.4.0)
   gitlab_chronic_duration (~> 0.10.6.2)
   gitlab_omniauth-ldap (~> 2.1.1)
   gon (~> 6.2)

tooling/overcommit/Gemfile

@@ -4,6 +4,6 @@
 source 'https://rubygems.org'
 
 gem 'overcommit'
-gem 'gitlab-styles', '~> 5.3.0', require: false
+gem 'gitlab-styles', '~> 5.4.0', require: false
 gem 'scss_lint', '~> 0.56.0', require: false
 gem 'haml_lint', '~> 0.34.0', require: false

tooling/overcommit/Gemfile.lock

@@ -11,7 +11,7 @@ GEM
     childprocess (3.0.0)
     concurrent-ruby (1.1.7)
     ffi (1.12.2)
-    gitlab-styles (5.3.0)
+    gitlab-styles (5.4.0)
       rubocop (~> 0.89.1)
       rubocop-gitlab-security (~> 0.1.0)
       rubocop-performance (~> 1.8.1)
@@ -88,7 +88,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  gitlab-styles (~> 5.3.0)
+  gitlab-styles (~> 5.4.0)
   haml_lint (~> 0.34.0)
   overcommit
   scss_lint (~> 0.56.0)