diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-09-01 00:19:21 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-09-01 00:19:21 +0000 |
| commit | f9b96bd273c636c41e0160b97ea9182f97339f26 (patch) | |
| tree | 4d0e8f60e0cc2c333cbd0b3c28098df638ec0591 | |
| parent | 0fa2d16795180f7b565aef16ec79fa4cfefeffda (diff) | |
| parent | 99e185cb91a0a1c5df0ed5f545bd83de718e5eb9 (diff) | |
| download | gitlab-ce-f9b96bd273c636c41e0160b97ea9182f97339f26.tar.gz | |
Merge branch '50365_fix_fast_spec_helper' into 'master'
Move fixture_path out of support/rspec file which is used by fast_spec_helper
Closes #50365
See merge request gitlab-org/gitlab-ce!21240
| -rw-r--r-- | spec/spec_helper.rb | 1 | ||||
| -rw-r--r-- | spec/support/rspec.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a15a46a9534..c4bb1c13f2e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -42,6 +42,7 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f } RSpec.configure do |config| config.use_transactional_fixtures = false config.use_instantiated_fixtures = false + config.fixture_path = Rails.root config.verbose_retry = true config.display_try_failure_messages = true diff --git a/spec/support/rspec.rb b/spec/support/rspec.rb index 9b8bcebcb3a..b38c5dfe60b 100644 --- a/spec/support/rspec.rb +++ b/spec/support/rspec.rb @@ -11,6 +11,4 @@ RSpec.configure do |config| config.include StubMetrics config.include StubObjectStorage config.include StubENV - - config.fixture_path = Rails.root if defined?(Rails) end |