diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-08 12:09:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-08 12:09:42 +0300 |
| commit | f4ea1f8998fd64bcd02280514b91f103f830d5ce (patch) | |
| tree | 14ff4a76b07da90dbaa9c75398b3bd2a79ac85c6 /spec/spec_helper.rb | |
| parent | ae192a2f1410b5f71397a64df76238b9d3b0afbe (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6c9a11587d3..b39153e79fc 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -53,8 +53,10 @@ end require 'rainbow/ext/string' Rainbow.enabled = false -require_relative('../ee/spec/spec_helper') if Gitlab.ee? +# Require JH first because we need override some EE methods with JH methods, +# if we load EE first, we can't find JH modules in prepend_mod method require_relative('../jh/spec/spec_helper') if Gitlab.jh? +require_relative('../ee/spec/spec_helper') if Gitlab.ee? # Requires supporting ruby files with custom matchers and macros, etc, # in spec/support/ and its subdirectories. |