summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2018-10-04 21:40:07 -0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2018-10-04 21:40:07 -0300
commit7501639049a4486da60e0a00869f9f026ba83660 (patch)
tree2d89302569c528e2f02d11686bef58696374d446 /spec
parentf71c497f5da791a35876206255e342a9bb5e49c5 (diff)
downloadgitlab-ce-7501639049a4486da60e0a00869f9f026ba83660.tar.gz
Require spec helpers loaded by other spec helpers first
Diffstat (limited to 'spec')
-rw-r--r--spec/spec_helper.rb5
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 }