diff options
| author | Reverite <github@reverite.sh> | 2019-10-05 12:13:22 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-10-05 12:13:22 -0700 |
| commit | 46ada47e09af0da9c776ef83c0ff034c720a83d6 (patch) | |
| tree | 54fd4b1d5fba6d592f328955ef5968608bbe716f /spec/rails_helper.rb | |
| parent | 333b5e25f0a615a9518d402ef10dceb70190a52f (diff) | |
| parent | 3921125e5578fb3871fdcae0e8e8a77179f1ad72 (diff) | |
Merge branch 'glitch' into production
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 |