lib/active_job/test_helper.rb in activejob-4.2.0.beta4 vs lib/active_job/test_helper.rb in activejob-4.2.0.rc1

@@ -51,11 +51,11 @@
           enqueued_jobs_size = enqueued_jobs.size
           assert_equal number, enqueued_jobs_size, "#{number} jobs expected, but #{enqueued_jobs_size} were enqueued"
         end
       end
 
-      # Assert that no job have been enqueued.
+      # Asserts that no jobs have been enqueued.
       #
       #   def test_jobs
       #     assert_no_enqueued_jobs
       #     HelloJob.perform_later('jeremy')
       #     assert_enqueued_jobs 1
@@ -75,17 +75,25 @@
       def assert_no_enqueued_jobs(&block)
         assert_enqueued_jobs 0, &block
       end
 
       # Asserts that the number of performed jobs matches the given number.
+      # If no block is passed, <tt>perform_enqueued_jobs</tt>
+      # must be called around the job call.
       #
       #   def test_jobs
       #     assert_performed_jobs 0
-      #     HelloJob.perform_later('xavier')
+      #
+      #     perform_enqueued_jobs do
+      #       HelloJob.perform_later('xavier')
+      #     end
       #     assert_performed_jobs 1
-      #     HelloJob.perform_later('yves')
-      #     assert_performed_jobs 2
+      #
+      #     perform_enqueued_jobs do
+      #       HelloJob.perform_later('yves')
+      #       assert_performed_jobs 2
+      #     end
       #   end
       #
       # If a block is passed, that block should cause the specified number of
       # jobs to be performed.
       #
@@ -100,11 +108,11 @@
       #     end
       #   end
       def assert_performed_jobs(number)
         if block_given?
           original_count = performed_jobs.size
-          yield
+          perform_enqueued_jobs { yield }
           new_count = performed_jobs.size
           assert_equal original_count + number, new_count,
                        "#{number} jobs expected, but #{new_count - original_count} were performed"
         else
           performed_jobs_size = performed_jobs.size
@@ -114,12 +122,15 @@
 
       # Asserts that no jobs have been performed.
       #
       #   def test_jobs
       #     assert_no_performed_jobs
-      #     HelloJob.perform_later('matthew')
-      #     assert_performed_jobs 1
+      #
+      #     perform_enqueued_jobs do
+      #       HelloJob.perform_later('matthew')
+      #       assert_performed_jobs 1
+      #     end
       #   end
       #
       # If a block is passed, that block should not cause any job to be performed.
       #
       #   def test_jobs_again
@@ -135,11 +146,11 @@
         assert_performed_jobs 0, &block
       end
 
       # Asserts that the job passed in the block has been enqueued with the given arguments.
       #
-      #   def assert_enqueued_job
+      #   def test_assert_enqueued_with
       #     assert_enqueued_with(job: MyJob, args: [1,2,3], queue: 'low') do
       #       MyJob.perform_later(1,2,3)
       #     end
       #   end
       def assert_enqueued_with(args = {}, &_block)
@@ -164,16 +175,27 @@
       #   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
+        perform_enqueued_jobs { 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 perform_enqueued_jobs
+        @old_perform_enqueued_jobs = queue_adapter.perform_enqueued_jobs
+        @old_perform_enqueued_at_jobs = queue_adapter.perform_enqueued_at_jobs
+        queue_adapter.perform_enqueued_jobs = true
+        queue_adapter.perform_enqueued_at_jobs = true
+        yield
+      ensure
+        queue_adapter.perform_enqueued_jobs = @old_perform_enqueued_jobs
+        queue_adapter.perform_enqueued_at_jobs = @old_perform_enqueued_at_jobs
       end
 
       def queue_adapter
         ActiveJob::Base.queue_adapter
       end