kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #27624 from elfassy/assert_enqueued_jobs_with_queue_level

Browse source 
Specify the queue to be used with assert_enqueued_jobs
This commit is contained in:
Guillermo Iguaran 2017-01-19 20:23:58 -05:00 committed by GitHub
commit 1a752b6f2b
2 changed files with 45 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
activejob/lib/active_job/test_helper.rb
View file

@ -55,7 +55,7 @@ module ActiveJob
# assert_enqueued_jobs 2
# end
#
# If a block is passed, that block should cause the specified number of
# If a block is passed, that block will cause the specified number of
# jobs to be enqueued.
#
# def test_jobs_again
@ -77,14 +77,23 @@ module ActiveJob
# HelloJob.perform_later('jeremy')
# end
# end
def assert_enqueued_jobs(number, only: nil)
#
# The number of times a job is enqueued to a specific queue can also be asserted.
#
# def test_logging_job
# assert_enqueued_jobs 2, queue: 'default' do
# LoggingJob.perform_later
# HelloJob.perform_later('elfassy')
# end
# end
def assert_enqueued_jobs(number, only: nil, queue: nil)
if block_given?
original_count = enqueued_jobs_size(only: only)
original_count = enqueued_jobs_size(only: only, queue: queue)
yield
new_count = enqueued_jobs_size(only: only)
new_count = enqueued_jobs_size(only: only, queue: queue)
assert_equal number, new_count - original_count, "#{number} jobs expected, but #{new_count - original_count} were enqueued"
else
actual_count = enqueued_jobs_size(only: only)
actual_count = enqueued_jobs_size(only: only, queue: queue)
assert_equal number, actual_count, "#{number} jobs expected, but #{actual_count} were enqueued"
end
end
@ -323,11 +332,16 @@ module ActiveJob
performed_jobs.clear
end
def enqueued_jobs_size(only: nil)
if only
enqueued_jobs.count { |job| Array(only).include?(job.fetch(:job)) }
else
enqueued_jobs.count
def enqueued_jobs_size(only: nil, queue: nil)
enqueued_jobs.count do |job|
job_class = job.fetch(:job)
if only
next false unless Array(only).include?(job_class)
end
if queue
next false unless queue.to_s == job.fetch(:queue, job_class.queue_name)
end
true
end
end

21
activejob/test/cases/test_helper_test.rb
View file

@ -110,6 +110,27 @@ class EnqueuedJobsTest < ActiveJob::TestCase
end
end
def test_assert_enqueued_jobs_with_only_and_queue_option
assert_nothing_raised do
assert_enqueued_jobs 1, only: HelloJob, queue: :some_queue do
HelloJob.set(queue: :some_queue).perform_later
HelloJob.set(queue: :other_queue).perform_later
LoggingJob.perform_later
end
end
end
def test_assert_enqueued_jobs_with_queue_option
assert_nothing_raised do
assert_enqueued_jobs 2, queue: :default do
HelloJob.perform_later
LoggingJob.perform_later
HelloJob.set(queue: :other_queue).perform_later
LoggingJob.set(queue: :other_queue).perform_later
end
end
end
def test_assert_enqueued_jobs_with_only_option_and_none_sent
error = assert_raise ActiveSupport::TestCase::Assertion do
assert_enqueued_jobs 1, only: HelloJob do