diff options
| author | ThibG <thib@sitedethib.com> | 2019-10-05 18:04:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-05 18:04:36 +0200 |
| commit | 3921125e5578fb3871fdcae0e8e8a77179f1ad72 (patch) | |
| tree | 997c8ed2e7a6b8152266edc0c37ea8264c59d1ab /spec/rails_helper.rb | |
| parent | 857c67f31b23b9c496e07eda41755ba449a37f17 (diff) | |
| parent | bc8543d9af0045fe2175f7e2234da9c77dc55023 (diff) | |
Merge pull request #1228 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/rails_helper.rb')
| -rw-r--r-- | spec/rails_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 3a5e7491e..6fbceca53 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -12,7 +12,7 @@ require 'capybara/rspec' Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f } ActiveRecord::Migration.maintain_test_schema! -WebMock.disable_net_connect! +WebMock.disable_net_connect!(allow: Chewy.settings[:host]) Redis.current = Redis::Namespace.new("mastodon_test#{ENV['TEST_ENV_NUMBER']}", redis: Redis.current) Sidekiq::Testing.inline! Sidekiq::Logging.logger = nil |