diff options
Diffstat (limited to 'activejob')
| -rw-r--r-- | activejob/lib/active_job/test_helper.rb | 6 | ||||
| -rw-r--r-- | activejob/test/support/integration/adapters/sidekiq.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb index 74a12884ff..200d82838e 100644 --- a/activejob/lib/active_job/test_helper.rb +++ b/activejob/lib/active_job/test_helper.rb @@ -237,7 +237,7 @@ module ActiveJob serialized_args.all? { |key, value| value == job[key] } end assert matching_job, "No enqueued job found with #{args}" - instanciate_job(matching_job) + instantiate_job(matching_job) ensure queue_adapter.enqueued_jobs = original_enqueued_jobs + enqueued_jobs end @@ -259,7 +259,7 @@ module ActiveJob serialized_args.all? { |key, value| value == job[key] } end assert matching_job, "No performed job found with #{args}" - instanciate_job(matching_job) + instantiate_job(matching_job) ensure queue_adapter.performed_jobs = original_performed_jobs + performed_jobs end @@ -314,7 +314,7 @@ module ActiveJob serialized_args end - def instanciate_job(payload) + def instantiate_job(payload) job = payload[:job].new(*payload[:args]) job.scheduled_at = Time.at(payload[:at]) if payload.key?(:at) job.queue_name = payload[:queue] 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 |