From eb4245dd17ba66c0551f3d4ed841b471bcf01b91 Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Tue, 26 Aug 2014 20:08:49 +0000 Subject: [ActiveJob] TestCase --- activejob/lib/active_job/test_helper.rb | 170 ++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) create mode 100644 activejob/lib/active_job/test_helper.rb (limited to 'activejob/lib/active_job/test_helper.rb') diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb new file mode 100644 index 0000000000..d147e56709 --- /dev/null +++ b/activejob/lib/active_job/test_helper.rb @@ -0,0 +1,170 @@ +# encoding: utf-8 +module ActiveJob + # Provides helper methods for testing Active Job + module TestHelper + # Asserts that the number of enqueued jobs matches the given number. + # + # def test_jobs + # assert_enqueued_jobs 0 + # HelloJob.enqueue('david') + # assert_enqueued_jobs 1 + # HelloJob.enqueue('abdelkader') + # assert_enqueued_jobs 2 + # end + # + # If a block is passed, that block should cause the specified number of + # jobs to be enqueued. + # + # def test_jobs_again + # assert_enqueued_jobs 1 do + # HelloJob.enqueue('cristian') + # end + # + # assert_enqueued_jobs 2 do + # HelloJob.enqueue('aaron') + # HelloJob.enqueue('rafael') + # end + # end + def assert_enqueued_jobs(number) + if block_given? + original_count = enqueued_jobs.size + yield + new_count = enqueued_jobs.size + assert_equal original_count + number, new_count, + "#{number} job expected, but #{new_count - original_count} were enqueued" + else + assert_equal number, enqueued_jobs.size + end + end + + # Assert that no job have been enqueued. + # + # def test_jobs + # assert_no_enqueued_jobs + # HelloJob.enqueue('jeremy') + # assert_enqueued_jobs 1 + # end + # + # If a block is passed, that block should not cause any job to be enqueued. + # + # def test_jobs_again + # assert_no_enqueued_jobs do + # # No job should be enqueued from this block + # end + # end + # + # Note: This assertion is simply a shortcut for: + # + # assert_enqueued_jobs 0 + def assert_no_enqueued_jobs(&block) + assert_enqueued_jobs 0, &block + end + + # Asserts that the number of performed jobs matches the given number. + # + # def test_jobs + # assert_performed_jobs 0 + # HelloJob.enqueue('xavier') + # assert_performed_jobs 1 + # HelloJob.enqueue('yves') + # assert_performed_jobs 2 + # end + # + # If a block is passed, that block should cause the specified number of + # jobs to be performed. + # + # def test_jobs_again + # assert_performed_jobs 1 do + # HelloJob.enqueue('robin') + # end + # + # assert_performed_jobs 2 do + # HelloJob.enqueue('carlos') + # HelloJob.enqueue('sean') + # end + # end + def assert_performed_jobs(number) + if block_given? + original_count = self.class.job_class.performed_jobs.size + yield + new_count = performed_jobs.size + assert_equal original_count + number, new_count, + "#{number} job expected, but #{new_count - original_count} were performed" + else + assert_equal number, performed_jobs.size + end + end + + # Assert that no job have been performed. + # + # def test_jobs + # assert_no_performed_jobs + # HelloJob.enqueue('matthew') + # assert_performed_jobs 1 + # end + # + # If a block is passed, that block should not cause any job to be performed. + # + # def test_jobs_again + # assert_no_performed_jobs do + # # No job should be performed from this block + # end + # end + # + # Note: This assertion is simply a shortcut for: + # + # assert_performed_jobs 0 + def assert_no_performed_jobs(&block) + assert_performed_jobs 0, &block + end + + # Assert that a job was enqueued in the block matches the args + # + # def assert_enqueued_job + # assert_enqueued_job(job: MyJob, args: [1,2,3], queue: 'low') do + # MyJob.enqueue(1,2,3) + # end + # end + def assert_enqueued_job(args = {}, &_block) + original_enqueued_jobs = enqueued_jobs + enqueued_jobs.clear + args.assert_valid_keys(:job, :args, :at, :queue) + yield + matching_job = enqueued_jobs.any? do |job| + args.all? { |key, value| value == job[key] } + end + assert matching_job + ensure + ActiveJob::Base.enqueued_jobs = original_enqueued_jobs + enqueued_jobs + end + + # Assert that a job was performed in the block matches the args + # + # def assert_performed_job + # assert_performed_job(job: MyJob, args: [1,2,3], queue: 'high') do + # MyJob.enqueue(1,2,3) + # end + # end + def assert_performed_job(args = {}, &_block) + original_performed_jobs = performed_jobs + performed_jobs.clear + args.assert_valid_keys(:job, :args, :at, :queue) + yield + matching_job = performed_jobs.any? do |job| + args.all? { |key, value| value == job[key] } + end + assert matching_job, "No performed job found with #{args}" + ensure + ActiveJob::Base.performed_jobs = original_performed_jobs + performed_jobs + end + + private + def enqueued_jobs + ActiveJob::Base.enqueued_jobs + end + + def performed_jobs + ActiveJob::Base.performed_jobs + end + end +end -- cgit v1.2.3 From fccf3d0b6304a7b8dacad05b63f24cdf41e652df Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Fri, 29 Aug 2014 20:11:17 +0000 Subject: [ActiveJob] TestCase --- activejob/lib/active_job/test_helper.rb | 327 +++++++++++++++++--------------- 1 file changed, 175 insertions(+), 152 deletions(-) (limited to 'activejob/lib/active_job/test_helper.rb') diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb index d147e56709..2323ca13db 100644 --- a/activejob/lib/active_job/test_helper.rb +++ b/activejob/lib/active_job/test_helper.rb @@ -2,169 +2,192 @@ module ActiveJob # Provides helper methods for testing Active Job module TestHelper - # Asserts that the number of enqueued jobs matches the given number. - # - # def test_jobs - # assert_enqueued_jobs 0 - # HelloJob.enqueue('david') - # assert_enqueued_jobs 1 - # HelloJob.enqueue('abdelkader') - # assert_enqueued_jobs 2 - # end - # - # If a block is passed, that block should cause the specified number of - # jobs to be enqueued. - # - # def test_jobs_again - # assert_enqueued_jobs 1 do - # HelloJob.enqueue('cristian') - # end - # - # assert_enqueued_jobs 2 do - # HelloJob.enqueue('aaron') - # HelloJob.enqueue('rafael') - # end - # end - def assert_enqueued_jobs(number) - if block_given? - original_count = enqueued_jobs.size - yield - new_count = enqueued_jobs.size - assert_equal original_count + number, new_count, - "#{number} job expected, but #{new_count - original_count} were enqueued" - else - assert_equal number, enqueued_jobs.size - end - end + extend ActiveSupport::Concern + include ActiveSupport::Testing::ConstantLookup - # Assert that no job have been enqueued. - # - # def test_jobs - # assert_no_enqueued_jobs - # HelloJob.enqueue('jeremy') - # assert_enqueued_jobs 1 - # end - # - # If a block is passed, that block should not cause any job to be enqueued. - # - # def test_jobs_again - # assert_no_enqueued_jobs do - # # No job should be enqueued from this block - # end - # end - # - # Note: This assertion is simply a shortcut for: - # - # assert_enqueued_jobs 0 - def assert_no_enqueued_jobs(&block) - assert_enqueued_jobs 0, &block - end + included do + class_attribute :_job_class + setup :initialize_queue_test_adapter - # Asserts that the number of performed jobs matches the given number. - # - # def test_jobs - # assert_performed_jobs 0 - # HelloJob.enqueue('xavier') - # assert_performed_jobs 1 - # HelloJob.enqueue('yves') - # assert_performed_jobs 2 - # end - # - # If a block is passed, that block should cause the specified number of - # jobs to be performed. - # - # def test_jobs_again - # assert_performed_jobs 1 do - # HelloJob.enqueue('robin') - # end - # - # assert_performed_jobs 2 do - # HelloJob.enqueue('carlos') - # HelloJob.enqueue('sean') - # end - # end - def assert_performed_jobs(number) - if block_given? - original_count = self.class.job_class.performed_jobs.size - yield - new_count = performed_jobs.size - assert_equal original_count + number, new_count, - "#{number} job expected, but #{new_count - original_count} were performed" - else - assert_equal number, performed_jobs.size + # Asserts that the number of enqueued jobs matches the given number. + # + # def test_jobs + # assert_enqueued_jobs 0 + # HelloJob.enqueue('david') + # assert_enqueued_jobs 1 + # HelloJob.enqueue('abdelkader') + # assert_enqueued_jobs 2 + # end + # + # If a block is passed, that block should cause the specified number of + # jobs to be enqueued. + # + # def test_jobs_again + # assert_enqueued_jobs 1 do + # HelloJob.enqueue('cristian') + # end + # + # assert_enqueued_jobs 2 do + # HelloJob.enqueue('aaron') + # HelloJob.enqueue('rafael') + # end + # end + def assert_enqueued_jobs(number) + if block_given? + original_count = enqueued_jobs.size + yield + new_count = enqueued_jobs.size + assert_equal original_count + number, new_count, + "#{number} jobs expected, but #{new_count - original_count} were enqueued" + else + assert_equal number, enqueued_jobs.size + end end - end - # Assert that no job have been performed. - # - # def test_jobs - # assert_no_performed_jobs - # HelloJob.enqueue('matthew') - # assert_performed_jobs 1 - # end - # - # If a block is passed, that block should not cause any job to be performed. - # - # def test_jobs_again - # assert_no_performed_jobs do - # # No job should be performed from this block - # end - # end - # - # Note: This assertion is simply a shortcut for: - # - # assert_performed_jobs 0 - def assert_no_performed_jobs(&block) - assert_performed_jobs 0, &block - end + # Assert that no job have been enqueued. + # + # def test_jobs + # assert_no_enqueued_jobs + # HelloJob.enqueue('jeremy') + # assert_enqueued_jobs 1 + # end + # + # If a block is passed, that block should not cause any job to be enqueued. + # + # def test_jobs_again + # assert_no_enqueued_jobs do + # # No job should be enqueued from this block + # end + # end + # + # Note: This assertion is simply a shortcut for: + # + # assert_enqueued_jobs 0 + def assert_no_enqueued_jobs(&block) + assert_enqueued_jobs 0, &block + end - # Assert that a job was enqueued in the block matches the args - # - # def assert_enqueued_job - # assert_enqueued_job(job: MyJob, args: [1,2,3], queue: 'low') do - # MyJob.enqueue(1,2,3) - # end - # end - def assert_enqueued_job(args = {}, &_block) - original_enqueued_jobs = enqueued_jobs - enqueued_jobs.clear - args.assert_valid_keys(:job, :args, :at, :queue) - yield - matching_job = enqueued_jobs.any? do |job| - args.all? { |key, value| value == job[key] } + # Asserts that the number of performed jobs matches the given number. + # + # def test_jobs + # assert_performed_jobs 0 + # HelloJob.enqueue('xavier') + # assert_performed_jobs 1 + # HelloJob.enqueue('yves') + # assert_performed_jobs 2 + # end + # + # If a block is passed, that block should cause the specified number of + # jobs to be performed. + # + # def test_jobs_again + # assert_performed_jobs 1 do + # HelloJob.enqueue('robin') + # end + # + # assert_performed_jobs 2 do + # HelloJob.enqueue('carlos') + # HelloJob.enqueue('sean') + # end + # end + def assert_performed_jobs(number) + if block_given? + original_count = performed_jobs.size + yield + new_count = performed_jobs.size + assert_equal original_count + number, new_count, + "#{number} jobs expected, but #{new_count - original_count} were performed" + else + assert_equal number, performed_jobs.size + end end - assert matching_job - ensure - ActiveJob::Base.enqueued_jobs = original_enqueued_jobs + enqueued_jobs - end - # Assert that a job was performed in the block matches the args - # - # def assert_performed_job - # assert_performed_job(job: MyJob, args: [1,2,3], queue: 'high') do - # MyJob.enqueue(1,2,3) - # end - # end - def assert_performed_job(args = {}, &_block) - original_performed_jobs = performed_jobs - performed_jobs.clear - args.assert_valid_keys(:job, :args, :at, :queue) - yield - matching_job = performed_jobs.any? do |job| - args.all? { |key, value| value == job[key] } + # Asserts that no jobs have been performed. + # + # def test_jobs + # assert_no_performed_jobs + # HelloJob.enqueue('matthew') + # assert_performed_jobs 1 + # end + # + # If a block is passed, that block should not cause any job to be performed. + # + # def test_jobs_again + # assert_no_performed_jobs do + # # No job should be performed from this block + # end + # end + # + # Note: This assertion is simply a shortcut for: + # + # assert_performed_jobs 0 + def assert_no_performed_jobs(&block) + assert_performed_jobs 0, &block end - assert matching_job, "No performed job found with #{args}" - ensure - ActiveJob::Base.performed_jobs = original_performed_jobs + performed_jobs - end - private - def enqueued_jobs - ActiveJob::Base.enqueued_jobs + # Asserts that the job passed in the block has been enqueued with the given arguments. + # + # def assert_enqueued_job + # assert_enqueued_with(job: MyJob, args: [1,2,3], queue: 'low') do + # MyJob.enqueue(1,2,3) + # end + # end + def assert_enqueued_with(args = {}, &_block) + original_enqueued_jobs = enqueued_jobs.dup + clear_enqueued_jobs + args.assert_valid_keys(:job, :args, :at, :queue) + yield + matching_job = enqueued_jobs.any? do |job| + args.all? { |key, value| value == job[key] } + end + assert matching_job + ensure + queue_adapter.enqueued_jobs = original_enqueued_jobs + enqueued_jobs end - def performed_jobs - ActiveJob::Base.performed_jobs + # Asserts that the job passed in the block has been performed with the given arguments. + # + # def test_assert_performed_with + # assert_performed_with(job: MyJob, args: [1,2,3], queue: 'high') do + # MyJob.enqueue(1,2,3) + # end + # end + def assert_performed_with(args = {}, &_block) + original_performed_jobs = performed_jobs.dup + clear_performed_jobs + args.assert_valid_keys(:job, :args, :at, :queue) + yield + matching_job = performed_jobs.any? do |job| + args.all? { |key, value| value == job[key] } + end + assert matching_job, "No performed job found with #{args}" + ensure + queue_adapter.performed_jobs = original_performed_jobs + performed_jobs + end + + + def queue_adapter + ActiveJob::Base.queue_adapter end + + delegate :enqueued_jobs, :enqueued_jobs=, + :performed_jobs, :performed_jobs=, + to: :queue_adapter + + private + def initialize_queue_test_adapter + ActiveJob::Base.queue_adapter = :test + clear_enqueued_jobs + clear_performed_jobs + end + + def clear_enqueued_jobs + enqueued_jobs.clear + end + + def clear_performed_jobs + performed_jobs.clear + end + end end end -- cgit v1.2.3 From d7add5352e7c8b31850431bb93acb56d93c5dc64 Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Tue, 2 Sep 2014 14:06:19 +0000 Subject: [ActiveJob] TestCase (Will squash before merge) --- activejob/lib/active_job/test_helper.rb | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'activejob/lib/active_job/test_helper.rb') diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb index 2323ca13db..767619097c 100644 --- a/activejob/lib/active_job/test_helper.rb +++ b/activejob/lib/active_job/test_helper.rb @@ -1,13 +1,21 @@ -# encoding: utf-8 module ActiveJob # Provides helper methods for testing Active Job module TestHelper extend ActiveSupport::Concern - include ActiveSupport::Testing::ConstantLookup included do - class_attribute :_job_class - setup :initialize_queue_test_adapter + def before_setup + @old_queue_adapter = queue_adapter + ActiveJob::Base.queue_adapter = :test + clear_enqueued_jobs + clear_performed_jobs + super + end + + def after_teardown + super + ActiveJob::Base.queue_adapter = @old_queue_adapter + end # Asserts that the number of enqueued jobs matches the given number. # @@ -40,7 +48,8 @@ module ActiveJob assert_equal original_count + number, new_count, "#{number} jobs expected, but #{new_count - original_count} were enqueued" else - assert_equal number, enqueued_jobs.size + enqueued_jobs_size = enqueued_jobs.size + assert_equal number, enqueued_jobs_size, "#{number} jobs expected, but #{enqueued_jobs_size} were enqueued" end end @@ -98,7 +107,8 @@ module ActiveJob assert_equal original_count + number, new_count, "#{number} jobs expected, but #{new_count - original_count} were performed" else - assert_equal number, performed_jobs.size + performed_jobs_size = performed_jobs.size + assert_equal number, performed_jobs_size, "#{number} jobs expected, but #{performed_jobs_size} were performed" end end @@ -165,7 +175,6 @@ module ActiveJob queue_adapter.performed_jobs = original_performed_jobs + performed_jobs end - def queue_adapter ActiveJob::Base.queue_adapter end @@ -175,12 +184,6 @@ module ActiveJob to: :queue_adapter private - def initialize_queue_test_adapter - ActiveJob::Base.queue_adapter = :test - clear_enqueued_jobs - clear_performed_jobs - end - def clear_enqueued_jobs enqueued_jobs.clear end -- cgit v1.2.3 From fbe116a2485b6db3566d3166adc2ce80525cbfbf Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Fri, 5 Sep 2014 06:35:19 +0000 Subject: correct rdoc [ci skip] --- activejob/lib/active_job/test_helper.rb | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'activejob/lib/active_job/test_helper.rb') diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb index 767619097c..fa0576669e 100644 --- a/activejob/lib/active_job/test_helper.rb +++ b/activejob/lib/active_job/test_helper.rb @@ -21,9 +21,9 @@ module ActiveJob # # def test_jobs # assert_enqueued_jobs 0 - # HelloJob.enqueue('david') + # HelloJob.perform_later('david') # assert_enqueued_jobs 1 - # HelloJob.enqueue('abdelkader') + # HelloJob.perform_later('abdelkader') # assert_enqueued_jobs 2 # end # @@ -32,12 +32,12 @@ module ActiveJob # # def test_jobs_again # assert_enqueued_jobs 1 do - # HelloJob.enqueue('cristian') + # HelloJob.perform_later('cristian') # end # # assert_enqueued_jobs 2 do - # HelloJob.enqueue('aaron') - # HelloJob.enqueue('rafael') + # HelloJob.perform_later('aaron') + # HelloJob.perform_later('rafael') # end # end def assert_enqueued_jobs(number) @@ -57,7 +57,7 @@ module ActiveJob # # def test_jobs # assert_no_enqueued_jobs - # HelloJob.enqueue('jeremy') + # HelloJob.perform_later('jeremy') # assert_enqueued_jobs 1 # end # @@ -80,9 +80,9 @@ module ActiveJob # # def test_jobs # assert_performed_jobs 0 - # HelloJob.enqueue('xavier') + # HelloJob.perform_later('xavier') # assert_performed_jobs 1 - # HelloJob.enqueue('yves') + # HelloJob.perform_later('yves') # assert_performed_jobs 2 # end # @@ -91,12 +91,12 @@ module ActiveJob # # def test_jobs_again # assert_performed_jobs 1 do - # HelloJob.enqueue('robin') + # HelloJob.perform_later('robin') # end # # assert_performed_jobs 2 do - # HelloJob.enqueue('carlos') - # HelloJob.enqueue('sean') + # HelloJob.perform_later('carlos') + # HelloJob.perform_later('sean') # end # end def assert_performed_jobs(number) @@ -116,7 +116,7 @@ module ActiveJob # # def test_jobs # assert_no_performed_jobs - # HelloJob.enqueue('matthew') + # HelloJob.perform_later('matthew') # assert_performed_jobs 1 # end # @@ -139,7 +139,7 @@ module ActiveJob # # def assert_enqueued_job # assert_enqueued_with(job: MyJob, args: [1,2,3], queue: 'low') do - # MyJob.enqueue(1,2,3) + # MyJob.perform_later(1,2,3) # end # end def assert_enqueued_with(args = {}, &_block) @@ -159,7 +159,7 @@ module ActiveJob # # def test_assert_performed_with # assert_performed_with(job: MyJob, args: [1,2,3], queue: 'high') do - # MyJob.enqueue(1,2,3) + # MyJob.perform_later(1,2,3) # end # end def assert_performed_with(args = {}, &_block) -- cgit v1.2.3