diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-01-31 15:45:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-31 15:45:28 -0500 |
| commit | 4f4906b52383468c72aa212c2dab345a3d1b63af (patch) | |
| tree | 75f4e2e583fdd2fd8a94eecd6bbb8f3d2747b56b /activejob/lib/active_job/queue_adapters | |
| parent | 22f4392bb45adc1dab414d547bff8a2745041597 (diff) | |
| parent | 08ddca51c688d8abc4ba56bd11c03de021caad18 (diff) | |
| download | rails-4f4906b52383468c72aa212c2dab345a3d1b63af.tar.gz rails-4f4906b52383468c72aa212c2dab345a3d1b63af.tar.bz2 rails-4f4906b52383468c72aa212c2dab345a3d1b63af.zip | |
Merge pull request #27850 from apauly/feature/active_job_test_helper
Feature/active job test helper
Diffstat (limited to 'activejob/lib/active_job/queue_adapters')
| -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 |