diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-15 13:27:04 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-15 13:27:04 +0000 |
| commit | 920becb784f3abe95363807b8848f72e9a2260d2 (patch) | |
| tree | 0eb85fba6e3e2051b621a5359696b288b33bf09e /spec | |
| parent | 2df09a403ba4f97cce034032d0e03cb55a6b65be (diff) | |
| parent | 7186f0de657f510e27e24b6845f99ded158118af (diff) | |
| download | gitlab-ce-920becb784f3abe95363807b8848f72e9a2260d2.tar.gz | |
Merge branch 'backstage/gb/improve-fast-specs-helper' into 'master'
Improve fast specs helper to autoload the library
See merge request gitlab-org/gitlab-ce!18903
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/fast_spec_helper.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb index 978113a08a4..134eb25e4b1 100644 --- a/spec/fast_spec_helper.rb +++ b/spec/fast_spec_helper.rb @@ -3,14 +3,8 @@ require 'bundler/setup' ENV['GITLAB_ENV'] = 'test' ENV['IN_MEMORY_APPLICATION_SETTINGS'] = 'true' -unless Object.respond_to?(:require_dependency) - class Object - alias_method :require_dependency, :require - end -end - -# Defines Settings and Gitlab.config which are at the center of the app require_relative '../config/settings' -require_relative '../lib/gitlab' unless defined?(Gitlab.config) - require_relative 'support/rspec' +require 'active_support/all' + +ActiveSupport::Dependencies.autoload_paths << 'lib' |