diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
| commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
| tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /spec/rubocop_spec_helper.rb | |
| parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) | |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'spec/rubocop_spec_helper.rb')
| -rw-r--r-- | spec/rubocop_spec_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/rubocop_spec_helper.rb b/spec/rubocop_spec_helper.rb index d57461960f2..9884cdd0272 100644 --- a/spec/rubocop_spec_helper.rb +++ b/spec/rubocop_spec_helper.rb @@ -6,9 +6,9 @@ require 'fast_spec_helper' # To prevent load order issues we need to require `rubocop` first. # See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47008 require 'rubocop' -require 'rubocop/rspec/support' +require 'rubocop/rspec/shared_contexts/default_rspec_language_config_context' -require_relative './support/shared_contexts/rubocop_default_rspec_language_config_context' +require_relative 'rubocop/support_workaround' RSpec.configure do |config| config.define_derived_metadata(file_path: %r{spec/rubocop}) do |metadata| |