diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/fast_spec_helper.rb | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/fast_spec_helper.rb')
-rw-r--r-- | spec/fast_spec_helper.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb index cbab809cddb..2f0bcd318d9 100644 --- a/spec/fast_spec_helper.rb +++ b/spec/fast_spec_helper.rb @@ -1,5 +1,12 @@ # frozen_string_literal: true +# $" is $LOADED_FEATURES, but RuboCop didn't like it +if $".include?(File.expand_path('spec_helper.rb', __dir__)) + # There's no need to load anything here if spec_helper is already loaded + # because spec_helper is more extensive than fast_spec_helper + return +end + require 'bundler/setup' ENV['GITLAB_ENV'] = 'test' |