diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2018-08-09 22:08:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-09 22:08:36 -0400 |
| commit | 924f44371697c5fe1509a749e1187ad2c9257ab9 (patch) | |
| tree | 6510ccc5acb3e7ab3837650ef057abf5cd1b3de5 /activejob/lib/active_job/queue_adapters/test_adapter.rb | |
| parent | 10129fbf57ef851ad56158529081afa05ea1c030 (diff) | |
| parent | 39d87a4b7b34c86c16b2fd9e31d6ec21a5150103 (diff) | |
| download | rails-924f44371697c5fe1509a749e1187ad2c9257ab9.tar.gz rails-924f44371697c5fe1509a749e1187ad2c9257ab9.tar.bz2 rails-924f44371697c5fe1509a749e1187ad2c9257ab9.zip | |
Merge pull request #33568 from mohitnatoo/perform-or-enqueue
perform_or_enqueue instead of enqueue_or_perform
Diffstat (limited to 'activejob/lib/active_job/queue_adapters/test_adapter.rb')
| -rw-r--r-- | activejob/lib/active_job/queue_adapters/test_adapter.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activejob/lib/active_job/queue_adapters/test_adapter.rb b/activejob/lib/active_job/queue_adapters/test_adapter.rb index 885f9ff01c..3aa25425eb 100644 --- a/activejob/lib/active_job/queue_adapters/test_adapter.rb +++ b/activejob/lib/active_job/queue_adapters/test_adapter.rb @@ -29,14 +29,14 @@ module ActiveJob return if filtered?(job) job_data = job_to_hash(job) - enqueue_or_perform(perform_enqueued_jobs, job, job_data) + perform_or_enqueue(perform_enqueued_jobs, job, job_data) end def enqueue_at(job, timestamp) #:nodoc: return if filtered?(job) job_data = job_to_hash(job, at: timestamp) - enqueue_or_perform(perform_enqueued_at_jobs, job, job_data) + perform_or_enqueue(perform_enqueued_at_jobs, job, job_data) end private @@ -44,7 +44,7 @@ module ActiveJob { job: job.class, args: job.serialize.fetch("arguments"), queue: job.queue_name }.merge!(extras) end - def enqueue_or_perform(perform, job, job_data) + def perform_or_enqueue(perform, job, job_data) if perform performed_jobs << job_data Base.execute job.serialize |