aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-08-15 13:06:39 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-08-15 13:06:39 -0300
commit8f1bbf6e82a8e4c33d5558277a14b8d979eccf02 (patch)
tree4c1d9b61d7a0f024d101acb79ef0eb002c0e8190
parent7858a365a9db7e32c652c62c0e7ad19e6ed2c906 (diff)
parente875273ebc4c7b63ca2b8dbb1d837a57f215d91c (diff)
downloadrails-8f1bbf6e82a8e4c33d5558277a14b8d979eccf02.tar.gz
rails-8f1bbf6e82a8e4c33d5558277a14b8d979eccf02.tar.bz2
rails-8f1bbf6e82a8e4c33d5558277a14b8d979eccf02.zip
Merge pull request #21248 from y-yagi/fix_deprecation_warning_in_aj_test
use `average_scheduled_poll_interval` option instead of deprecated `poll_interval`
-rw-r--r--activejob/test/support/integration/adapters/sidekiq.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb
index 4988cdb33f..d9938600f2 100644
--- a/activejob/test/support/integration/adapters/sidekiq.rb
+++ b/activejob/test/support/integration/adapters/sidekiq.rb
@@ -57,7 +57,7 @@ module SidekiqJobsManager
concurrency: 1,
timeout: 1,
})
- Sidekiq.poll_interval = 0.5
+ Sidekiq.average_scheduled_poll_interval = 0.5
Sidekiq::Scheduled.const_set :INITIAL_WAIT, 1
begin
sidekiq.run