diff options
author | Alexander Pauly <alex.pauly@gmx.de> | 2017-01-30 19:47:54 +0100 |
---|---|---|
committer | Alexander Pauly <alex.pauly@gmx.de> | 2017-01-31 07:36:19 +0100 |
commit | 08ddca51c688d8abc4ba56bd11c03de021caad18 (patch) | |
tree | bdc283a4919cb7b7f17eabe310eba990f5002d33 /activejob/lib/active_job/queue_adapters/test_adapter.rb | |
parent | 341fab88a3605705a4a7c96c43e1f8c17f719607 (diff) | |
download | rails-08ddca51c688d8abc4ba56bd11c03de021caad18.tar.gz rails-08ddca51c688d8abc4ba56bd11c03de021caad18.tar.bz2 rails-08ddca51c688d8abc4ba56bd11c03de021caad18.zip |
Append skipped jobs to enqueued_jobs
Refactored ActiveJob TestAdapter
Updated ActiveJob changelog
Fixed typo in changelog
Fixed formatting issue in changelog
Diffstat (limited to 'activejob/lib/active_job/queue_adapters/test_adapter.rb')
-rw-r--r-- | activejob/lib/active_job/queue_adapters/test_adapter.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/activejob/lib/active_job/queue_adapters/test_adapter.rb b/activejob/lib/active_job/queue_adapters/test_adapter.rb index da042cfebf..ec825f12cd 100644 --- a/activejob/lib/active_job/queue_adapters/test_adapter.rb +++ b/activejob/lib/active_job/queue_adapters/test_adapter.rb @@ -24,15 +24,11 @@ module ActiveJob end def enqueue(job) #:nodoc: - return if filtered?(job) - job_data = job_to_hash(job) enqueue_or_perform(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) end @@ -44,11 +40,11 @@ module ActiveJob end def enqueue_or_perform(perform, job, job_data) - if perform + if !perform || filtered?(job) + enqueued_jobs << job_data + else performed_jobs << job_data Base.execute job.serialize - else - enqueued_jobs << job_data end end |