diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/support/rspec.rb | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/support/rspec.rb')
-rw-r--r-- | spec/support/rspec.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/spec/support/rspec.rb b/spec/support/rspec.rb index 861b57c9efa..32f738faa9b 100644 --- a/spec/support/rspec.rb +++ b/spec/support/rspec.rb @@ -5,6 +5,13 @@ require_relative "helpers/stub_metrics" require_relative "helpers/stub_object_storage" require_relative "helpers/stub_env" require_relative "helpers/fast_rails_root" + +# so we need to load rubocop here due to the rubocop support file loading cop_helper +# which monkey patches class Cop +# if cop helper is loaded before rubocop (where class Cop is defined as class Cop < Base) +# we get a `superclass mismatch for class Cop` error when running a rspec for a locally defined +# rubocop cop - therefore we need rubocop required first since it had an inheritance added to the Cop class +require 'rubocop' require 'rubocop/rspec/support' RSpec.configure do |config| |