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
This commit is contained in:
commit
f9b96bd273
2 changed files with 1 additions and 2 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue