diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-10-05 06:59:41 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-10-05 06:59:41 +0300 |
| commit | 77d56c931af073ffb6583819bb216225456cb231 (patch) | |
| tree | 2d89302569c528e2f02d11686bef58696374d446 | |
| parent | f71c497f5da791a35876206255e342a9bb5e49c5 (diff) | |
| parent | 7501639049a4486da60e0a00869f9f026ba83660 (diff) | |
Merge branch 'spec-helpers-order' into 'master'
Require spec helpers loaded by other spec helpers first
See merge request gitlab-org/gitlab-ce!22127
| -rw-r--r-- | spec/spec_helper.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d1337325973..cd69160be10 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -34,6 +34,11 @@ Rainbow.enabled = false # Requires supporting ruby files with custom matchers and macros, etc, # in spec/support/ and its subdirectories. # Requires helpers, and shared contexts/examples first since they're used in other support files + +# Load these first since they may be required by other helpers +require Rails.root.join("spec/support/helpers/git_helpers.rb") + +# Then the rest Dir[Rails.root.join("spec/support/helpers/*.rb")].each { |f| require f } Dir[Rails.root.join("spec/support/shared_contexts/*.rb")].each { |f| require f } Dir[Rails.root.join("spec/support/shared_examples/*.rb")].each { |f| require f } |