diff options
author | Thong Kuah <tkuah@gitlab.com> | 2018-08-16 12:08:38 +0300 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2018-08-31 01:23:57 +0300 |
commit | 99e185cb91a0a1c5df0ed5f545bd83de718e5eb9 (patch) | |
tree | d4071323e6ff49c89944cce885559b72c83ac4a4 | |
parent | b8856d662942f54d7353e69505be08deb9b1d575 (diff) |
Move fixture_path out of support/rspec file which is used by fast_spec_helper, so that fast specs can be run on its own again.
Move `fixture_path` config together with use_transactional_fixtures and
use_instantiated_fixtures. These settings are all added by rspec-rails
https://github.com/rspec/rspec-rails/blob/8c6c9590b94916199950dc8a91a9741d3be30c7c/lib/rspec/rails/configuration.rb#L65-L67
-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 |